Skip to content

Commit 87a2536

Browse files
Love4yzpLove4yzp
committed
console feature for indicator_ha
1 parent 459fb0b commit 87a2536

12 files changed

Lines changed: 826 additions & 274 deletions

File tree

‎examples/indicator_ha/main/config.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@
2121
extern "C" {
2222
#endif
2323

24-
2524
ESP_EVENT_DECLARE_BASE(VIEW_EVENT_BASE);
26-
2725
extern esp_event_loop_handle_t view_event_handle;
2826

29-
30-
3127
#ifdef __cplusplus
3228
}
3329
#endif

‎examples/indicator_ha/main/ha_config.h‎

Lines changed: 107 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -3,118 +3,117 @@
33
#ifndef HA_CONFIG_H
44
#define HA_CONFIG_H
55

6-
76
#ifdef __cplusplus
87
extern "C" {
98
#endif
109

11-
#define CONFIG_BROKER_URL "mqtt://homeassistant.local"
12-
13-
#define CONFIG_HA_SENSOR_ENTITY_NUM 6
14-
#define CONFIG_HA_SWITCH_ENTITY_NUM 8
15-
16-
//topic
17-
#define CONFIG_TOPIC_SENSOR_DATA "indicator/sensor"
18-
#define CONFIG_TOPIC_SENSOR_DATA_QOS 0
19-
20-
21-
#define CONFIG_TOPIC_SWITCH_STATE "indicator/switch/state"
22-
#define CONFIG_TOPIC_SWITCH_SET "indicator/switch/set"
23-
#define CONFIG_TOPIC_SWITCH_QOS 1
24-
25-
26-
//buildin sensor
27-
#define CONFIG_SENSOR_BUILDIN_CO2_VALUE_KEY "co2"
28-
#define CONFIG_SENSOR_BUILDIN_TVOC_VALUE_KEY "tvoc"
29-
#define CONFIG_SENSOR_BUILDIN_TEMP_VALUE_KEY "temp"
30-
#define CONFIG_SENSOR_BUILDIN_HUMIDITY_VALUE_KEY "humidity"
31-
#define CONFIG_SENSOR_BUILDIN_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
32-
33-
//sensor1
34-
#define CONFIG_SENSOR1_VALUE_KEY "temp"
35-
#define CONFIG_SENSOR1_UI_UNIT "°C"
36-
#define CONFIG_SENSOR1_UI_NAME "Temp"
37-
#define CONFIG_SENSOR1_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
38-
39-
//sensor2
40-
#define CONFIG_SENSOR2_VALUE_KEY "humidity"
41-
#define CONFIG_SENSOR2_UI_UNIT "%"
42-
#define CONFIG_SENSOR2_UI_NAME "Humidity"
43-
#define CONFIG_SENSOR2_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
44-
45-
//sensor3
46-
#define CONFIG_SENSOR3_VALUE_KEY "tvoc"
47-
#define CONFIG_SENSOR3_UI_UNIT ""
48-
#define CONFIG_SENSOR3_UI_NAME "tVOC"
49-
#define CONFIG_SENSOR3_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
50-
51-
//sensor4
52-
#define CONFIG_SENSOR4_VALUE_KEY "co2"
53-
#define CONFIG_SENSOR4_UI_UNIT "ppm"
54-
#define CONFIG_SENSOR4_UI_NAME "CO2"
55-
#define CONFIG_SENSOR4_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
56-
57-
//sensor5
58-
#define CONFIG_SENSOR5_VALUE_KEY "temp"
59-
#define CONFIG_SENSOR5_UI_UNIT "°C"
60-
#define CONFIG_SENSOR5_UI_NAME "Temp"
61-
#define CONFIG_SENSOR5_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
62-
63-
//sensor6
64-
#define CONFIG_SENSOR6_VALUE_KEY "humidity"
65-
#define CONFIG_SENSOR6_UI_UNIT "%"
66-
#define CONFIG_SENSOR6_UI_NAME "Humidity"
67-
#define CONFIG_SENSOR6_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
68-
69-
70-
//switch1
71-
#define CONFIG_SWITCH1_VALUE_KEY "switch1"
72-
#define CONFIG_SWITCH1_UI_NAME "Switch1"
73-
#define CONFIG_SWITCH1_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
74-
#define CONFIG_SWITCH1_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
75-
76-
//switch2
77-
#define CONFIG_SWITCH2_VALUE_KEY "switch2"
78-
#define CONFIG_SWITCH2_UI_NAME "Switch2"
79-
#define CONFIG_SWITCH2_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
80-
#define CONFIG_SWITCH2_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
81-
82-
//switch3
83-
#define CONFIG_SWITCH3_VALUE_KEY "switch3"
84-
#define CONFIG_SWITCH3_UI_NAME "Switch3"
85-
#define CONFIG_SWITCH3_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
86-
#define CONFIG_SWITCH3_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
87-
88-
//switch4
89-
#define CONFIG_SWITCH4_VALUE_KEY "switch4"
90-
#define CONFIG_SWITCH4_UI_NAME "Switch4"
91-
#define CONFIG_SWITCH4_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
92-
#define CONFIG_SWITCH4_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
93-
94-
//switch5
95-
#define CONFIG_SWITCH5_VALUE_KEY "switch5"
96-
#define CONFIG_SWITCH5_UI_NAME "Switch5"
97-
#define CONFIG_SWITCH5_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
98-
#define CONFIG_SWITCH5_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
99-
100-
//switch6
101-
#define CONFIG_SWITCH6_VALUE_KEY "switch6"
102-
#define CONFIG_SWITCH6_UI_NAME "Switch6"
103-
#define CONFIG_SWITCH6_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
104-
#define CONFIG_SWITCH6_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
105-
106-
//switch7
107-
#define CONFIG_SWITCH7_VALUE_KEY "switch7"
108-
#define CONFIG_SWITCH7_UI_NAME "Switch7"
109-
#define CONFIG_SWITCH7_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
110-
#define CONFIG_SWITCH7_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
111-
112-
//switch8
113-
#define CONFIG_SWITCH8_VALUE_KEY "switch8"
114-
#define CONFIG_SWITCH8_UI_NAME "Switch8"
115-
#define CONFIG_SWITCH8_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
116-
#define CONFIG_SWITCH8_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
117-
10+
#define CONFIG_BROKER_URL "mqtt://homeassistant.local" /* domain */
11+
// #define CONFIG_BROKER_URL "mqtt://192.168.1.102" /* IP */
12+
#define CONFIG_MQTT_CLIENT_ID "indicator-id"
13+
#define CONFIG_MQTT_USERNAME "indicator-usr"
14+
#define CONFIG_MQTT_PASSWORD "indicator-password"
15+
16+
#define CONFIG_HA_SENSOR_ENTITY_NUM 6
17+
#define CONFIG_HA_SWITCH_ENTITY_NUM 8
18+
19+
// topic
20+
#define CONFIG_TOPIC_SENSOR_DATA "indicator/sensor"
21+
#define CONFIG_TOPIC_SENSOR_DATA_QOS 0
22+
23+
#define CONFIG_TOPIC_SWITCH_STATE "indicator/switch/state"
24+
#define CONFIG_TOPIC_SWITCH_SET "indicator/switch/set"
25+
#define CONFIG_TOPIC_SWITCH_QOS 1
26+
27+
// buildin sensor
28+
#define CONFIG_SENSOR_BUILDIN_CO2_VALUE_KEY "co2"
29+
#define CONFIG_SENSOR_BUILDIN_TVOC_VALUE_KEY "tvoc"
30+
#define CONFIG_SENSOR_BUILDIN_TEMP_VALUE_KEY "temp"
31+
#define CONFIG_SENSOR_BUILDIN_HUMIDITY_VALUE_KEY "humidity"
32+
#define CONFIG_SENSOR_BUILDIN_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
33+
34+
// sensor1
35+
#define CONFIG_SENSOR1_VALUE_KEY "temp"
36+
#define CONFIG_SENSOR1_UI_UNIT "°C"
37+
#define CONFIG_SENSOR1_UI_NAME "Temp"
38+
#define CONFIG_SENSOR1_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
39+
40+
// sensor2
41+
#define CONFIG_SENSOR2_VALUE_KEY "humidity"
42+
#define CONFIG_SENSOR2_UI_UNIT "%"
43+
#define CONFIG_SENSOR2_UI_NAME "Humidity"
44+
#define CONFIG_SENSOR2_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
45+
46+
// sensor3
47+
#define CONFIG_SENSOR3_VALUE_KEY "tvoc"
48+
#define CONFIG_SENSOR3_UI_UNIT ""
49+
#define CONFIG_SENSOR3_UI_NAME "tVOC"
50+
#define CONFIG_SENSOR3_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
51+
52+
// sensor4
53+
#define CONFIG_SENSOR4_VALUE_KEY "co2"
54+
#define CONFIG_SENSOR4_UI_UNIT "ppm"
55+
#define CONFIG_SENSOR4_UI_NAME "CO2"
56+
#define CONFIG_SENSOR4_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
57+
58+
// sensor5
59+
#define CONFIG_SENSOR5_VALUE_KEY "temp"
60+
#define CONFIG_SENSOR5_UI_UNIT "°C"
61+
#define CONFIG_SENSOR5_UI_NAME "Temp"
62+
#define CONFIG_SENSOR5_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
63+
64+
// sensor6
65+
#define CONFIG_SENSOR6_VALUE_KEY "humidity"
66+
#define CONFIG_SENSOR6_UI_UNIT "%"
67+
#define CONFIG_SENSOR6_UI_NAME "Humidity"
68+
#define CONFIG_SENSOR6_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA
69+
70+
// switch1
71+
#define CONFIG_SWITCH1_VALUE_KEY "switch1"
72+
#define CONFIG_SWITCH1_UI_NAME "Switch1"
73+
#define CONFIG_SWITCH1_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
74+
#define CONFIG_SWITCH1_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
75+
76+
// switch2
77+
#define CONFIG_SWITCH2_VALUE_KEY "switch2"
78+
#define CONFIG_SWITCH2_UI_NAME "Switch2"
79+
#define CONFIG_SWITCH2_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
80+
#define CONFIG_SWITCH2_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
81+
82+
// switch3
83+
#define CONFIG_SWITCH3_VALUE_KEY "switch3"
84+
#define CONFIG_SWITCH3_UI_NAME "Switch3"
85+
#define CONFIG_SWITCH3_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
86+
#define CONFIG_SWITCH3_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
87+
88+
// switch4
89+
#define CONFIG_SWITCH4_VALUE_KEY "switch4"
90+
#define CONFIG_SWITCH4_UI_NAME "Switch4"
91+
#define CONFIG_SWITCH4_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
92+
#define CONFIG_SWITCH4_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
93+
94+
// switch5
95+
#define CONFIG_SWITCH5_VALUE_KEY "switch5"
96+
#define CONFIG_SWITCH5_UI_NAME "Switch5"
97+
#define CONFIG_SWITCH5_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
98+
#define CONFIG_SWITCH5_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
99+
100+
// switch6
101+
#define CONFIG_SWITCH6_VALUE_KEY "switch6"
102+
#define CONFIG_SWITCH6_UI_NAME "Switch6"
103+
#define CONFIG_SWITCH6_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
104+
#define CONFIG_SWITCH6_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
105+
106+
// switch7
107+
#define CONFIG_SWITCH7_VALUE_KEY "switch7"
108+
#define CONFIG_SWITCH7_UI_NAME "Switch7"
109+
#define CONFIG_SWITCH7_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
110+
#define CONFIG_SWITCH7_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
111+
112+
// switch8
113+
#define CONFIG_SWITCH8_VALUE_KEY "switch8"
114+
#define CONFIG_SWITCH8_UI_NAME "Switch8"
115+
#define CONFIG_SWITCH8_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
116+
#define CONFIG_SWITCH8_TOPIC_SET CONFIG_TOPIC_SWITCH_SET
118117

119118
#ifdef __cplusplus
120119
}

‎examples/indicator_ha/main/main.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ static const char *TAG = "app_main";
2828
ESP_EVENT_DEFINE_BASE(VIEW_EVENT_BASE);
2929
esp_event_loop_handle_t view_event_handle;
3030

31-
3231
void app_main(void)
3332
{
3433
ESP_LOGI("", SENSECAP, VERSION, __DATE__, __TIME__);
@@ -55,7 +54,7 @@ void app_main(void)
5554
indicator_model_init();
5655
indicator_controller_init();
5756

58-
static char buffer[128]; /* Make sure buffer is enough for `sprintf` */
57+
// static char buffer[128]; /* Make sure buffer is enough for `sprintf` */
5958
while (1) {
6059
// sprintf(buffer, " Biggest / Free / Total\n"
6160
// "\t DRAM : [%8d / %8d / %8d]\n"

0 commit comments

Comments
 (0)