Skip to content

Commit

Permalink
console feature for indicator_ha
Browse files Browse the repository at this point in the history
  • Loading branch information
@Love4yzp
Love4yzp committed Oct 9, 2023
1 parent 459fb0b commit 87a2536
Show file tree
Hide file tree
Showing 12 changed files with 826 additions and 274 deletions.
4 changes: 0 additions & 4 deletions examples/indicator_ha/main/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@
extern "C" {
#endif


ESP_EVENT_DECLARE_BASE(VIEW_EVENT_BASE);

extern esp_event_loop_handle_t view_event_handle;



#ifdef __cplusplus
}
#endif
Expand Down
215 changes: 107 additions & 108 deletions examples/indicator_ha/main/ha_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,118 +3,117 @@
#ifndef HA_CONFIG_H
#define HA_CONFIG_H


#ifdef __cplusplus
extern "C" {
#endif

#define CONFIG_BROKER_URL "mqtt://homeassistant.local"

#define CONFIG_HA_SENSOR_ENTITY_NUM 6
#define CONFIG_HA_SWITCH_ENTITY_NUM 8

//topic
#define CONFIG_TOPIC_SENSOR_DATA "indicator/sensor"
#define CONFIG_TOPIC_SENSOR_DATA_QOS 0


#define CONFIG_TOPIC_SWITCH_STATE "indicator/switch/state"
#define CONFIG_TOPIC_SWITCH_SET "indicator/switch/set"
#define CONFIG_TOPIC_SWITCH_QOS 1


//buildin sensor
#define CONFIG_SENSOR_BUILDIN_CO2_VALUE_KEY "co2"
#define CONFIG_SENSOR_BUILDIN_TVOC_VALUE_KEY "tvoc"
#define CONFIG_SENSOR_BUILDIN_TEMP_VALUE_KEY "temp"
#define CONFIG_SENSOR_BUILDIN_HUMIDITY_VALUE_KEY "humidity"
#define CONFIG_SENSOR_BUILDIN_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

//sensor1
#define CONFIG_SENSOR1_VALUE_KEY "temp"
#define CONFIG_SENSOR1_UI_UNIT "°C"
#define CONFIG_SENSOR1_UI_NAME "Temp"
#define CONFIG_SENSOR1_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

//sensor2
#define CONFIG_SENSOR2_VALUE_KEY "humidity"
#define CONFIG_SENSOR2_UI_UNIT "%"
#define CONFIG_SENSOR2_UI_NAME "Humidity"
#define CONFIG_SENSOR2_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

//sensor3
#define CONFIG_SENSOR3_VALUE_KEY "tvoc"
#define CONFIG_SENSOR3_UI_UNIT ""
#define CONFIG_SENSOR3_UI_NAME "tVOC"
#define CONFIG_SENSOR3_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

//sensor4
#define CONFIG_SENSOR4_VALUE_KEY "co2"
#define CONFIG_SENSOR4_UI_UNIT "ppm"
#define CONFIG_SENSOR4_UI_NAME "CO2"
#define CONFIG_SENSOR4_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

//sensor5
#define CONFIG_SENSOR5_VALUE_KEY "temp"
#define CONFIG_SENSOR5_UI_UNIT "°C"
#define CONFIG_SENSOR5_UI_NAME "Temp"
#define CONFIG_SENSOR5_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

//sensor6
#define CONFIG_SENSOR6_VALUE_KEY "humidity"
#define CONFIG_SENSOR6_UI_UNIT "%"
#define CONFIG_SENSOR6_UI_NAME "Humidity"
#define CONFIG_SENSOR6_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA


//switch1
#define CONFIG_SWITCH1_VALUE_KEY "switch1"
#define CONFIG_SWITCH1_UI_NAME "Switch1"
#define CONFIG_SWITCH1_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH1_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

//switch2
#define CONFIG_SWITCH2_VALUE_KEY "switch2"
#define CONFIG_SWITCH2_UI_NAME "Switch2"
#define CONFIG_SWITCH2_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH2_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

//switch3
#define CONFIG_SWITCH3_VALUE_KEY "switch3"
#define CONFIG_SWITCH3_UI_NAME "Switch3"
#define CONFIG_SWITCH3_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH3_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

//switch4
#define CONFIG_SWITCH4_VALUE_KEY "switch4"
#define CONFIG_SWITCH4_UI_NAME "Switch4"
#define CONFIG_SWITCH4_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH4_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

//switch5
#define CONFIG_SWITCH5_VALUE_KEY "switch5"
#define CONFIG_SWITCH5_UI_NAME "Switch5"
#define CONFIG_SWITCH5_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH5_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

//switch6
#define CONFIG_SWITCH6_VALUE_KEY "switch6"
#define CONFIG_SWITCH6_UI_NAME "Switch6"
#define CONFIG_SWITCH6_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH6_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

//switch7
#define CONFIG_SWITCH7_VALUE_KEY "switch7"
#define CONFIG_SWITCH7_UI_NAME "Switch7"
#define CONFIG_SWITCH7_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH7_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

//switch8
#define CONFIG_SWITCH8_VALUE_KEY "switch8"
#define CONFIG_SWITCH8_UI_NAME "Switch8"
#define CONFIG_SWITCH8_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH8_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

#define CONFIG_BROKER_URL "mqtt://homeassistant.local" /* domain */
// #define CONFIG_BROKER_URL "mqtt://192.168.1.102" /* IP */
#define CONFIG_MQTT_CLIENT_ID "indicator-id"
#define CONFIG_MQTT_USERNAME "indicator-usr"
#define CONFIG_MQTT_PASSWORD "indicator-password"

#define CONFIG_HA_SENSOR_ENTITY_NUM 6
#define CONFIG_HA_SWITCH_ENTITY_NUM 8

// topic
#define CONFIG_TOPIC_SENSOR_DATA "indicator/sensor"
#define CONFIG_TOPIC_SENSOR_DATA_QOS 0

#define CONFIG_TOPIC_SWITCH_STATE "indicator/switch/state"
#define CONFIG_TOPIC_SWITCH_SET "indicator/switch/set"
#define CONFIG_TOPIC_SWITCH_QOS 1

// buildin sensor
#define CONFIG_SENSOR_BUILDIN_CO2_VALUE_KEY "co2"
#define CONFIG_SENSOR_BUILDIN_TVOC_VALUE_KEY "tvoc"
#define CONFIG_SENSOR_BUILDIN_TEMP_VALUE_KEY "temp"
#define CONFIG_SENSOR_BUILDIN_HUMIDITY_VALUE_KEY "humidity"
#define CONFIG_SENSOR_BUILDIN_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

// sensor1
#define CONFIG_SENSOR1_VALUE_KEY "temp"
#define CONFIG_SENSOR1_UI_UNIT "°C"
#define CONFIG_SENSOR1_UI_NAME "Temp"
#define CONFIG_SENSOR1_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

// sensor2
#define CONFIG_SENSOR2_VALUE_KEY "humidity"
#define CONFIG_SENSOR2_UI_UNIT "%"
#define CONFIG_SENSOR2_UI_NAME "Humidity"
#define CONFIG_SENSOR2_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

// sensor3
#define CONFIG_SENSOR3_VALUE_KEY "tvoc"
#define CONFIG_SENSOR3_UI_UNIT ""
#define CONFIG_SENSOR3_UI_NAME "tVOC"
#define CONFIG_SENSOR3_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

// sensor4
#define CONFIG_SENSOR4_VALUE_KEY "co2"
#define CONFIG_SENSOR4_UI_UNIT "ppm"
#define CONFIG_SENSOR4_UI_NAME "CO2"
#define CONFIG_SENSOR4_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

// sensor5
#define CONFIG_SENSOR5_VALUE_KEY "temp"
#define CONFIG_SENSOR5_UI_UNIT "°C"
#define CONFIG_SENSOR5_UI_NAME "Temp"
#define CONFIG_SENSOR5_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

// sensor6
#define CONFIG_SENSOR6_VALUE_KEY "humidity"
#define CONFIG_SENSOR6_UI_UNIT "%"
#define CONFIG_SENSOR6_UI_NAME "Humidity"
#define CONFIG_SENSOR6_TOPIC_DATA CONFIG_TOPIC_SENSOR_DATA

// switch1
#define CONFIG_SWITCH1_VALUE_KEY "switch1"
#define CONFIG_SWITCH1_UI_NAME "Switch1"
#define CONFIG_SWITCH1_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH1_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

// switch2
#define CONFIG_SWITCH2_VALUE_KEY "switch2"
#define CONFIG_SWITCH2_UI_NAME "Switch2"
#define CONFIG_SWITCH2_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH2_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

// switch3
#define CONFIG_SWITCH3_VALUE_KEY "switch3"
#define CONFIG_SWITCH3_UI_NAME "Switch3"
#define CONFIG_SWITCH3_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH3_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

// switch4
#define CONFIG_SWITCH4_VALUE_KEY "switch4"
#define CONFIG_SWITCH4_UI_NAME "Switch4"
#define CONFIG_SWITCH4_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH4_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

// switch5
#define CONFIG_SWITCH5_VALUE_KEY "switch5"
#define CONFIG_SWITCH5_UI_NAME "Switch5"
#define CONFIG_SWITCH5_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH5_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

// switch6
#define CONFIG_SWITCH6_VALUE_KEY "switch6"
#define CONFIG_SWITCH6_UI_NAME "Switch6"
#define CONFIG_SWITCH6_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH6_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

// switch7
#define CONFIG_SWITCH7_VALUE_KEY "switch7"
#define CONFIG_SWITCH7_UI_NAME "Switch7"
#define CONFIG_SWITCH7_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH7_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

// switch8
#define CONFIG_SWITCH8_VALUE_KEY "switch8"
#define CONFIG_SWITCH8_UI_NAME "Switch8"
#define CONFIG_SWITCH8_TOPIC_STATE CONFIG_TOPIC_SWITCH_STATE
#define CONFIG_SWITCH8_TOPIC_SET CONFIG_TOPIC_SWITCH_SET

#ifdef __cplusplus
}
Expand Down
3 changes: 1 addition & 2 deletions examples/indicator_ha/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ static const char *TAG = "app_main";
ESP_EVENT_DEFINE_BASE(VIEW_EVENT_BASE);
esp_event_loop_handle_t view_event_handle;


void app_main(void)
{
ESP_LOGI("", SENSECAP, VERSION, __DATE__, __TIME__);
Expand All @@ -55,7 +54,7 @@ void app_main(void)
indicator_model_init();
indicator_controller_init();

static char buffer[128]; /* Make sure buffer is enough for `sprintf` */
// static char buffer[128]; /* Make sure buffer is enough for `sprintf` */
while (1) {
// sprintf(buffer, " Biggest / Free / Total\n"
// "\t DRAM : [%8d / %8d / %8d]\n"
Expand Down
Loading

0 comments on commit 87a2536

Please sign in to comment.