alexey.zholtikov/zh_gateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

Version 1.0.5

Browse Source 
Added support some sensors.
Fixed bug with WiFi initial configuration.
Updated sensor hardware config message processing.
Added led hardware config message processing.
Updated components.
Minor main code refactoring.
This commit is contained in:
Alexey Zholtikov 2024-06-26 09:08:51 +03:00
parent 0254b5ebe7
commit 52a2cac8a8
8 changed files with 242 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/zh_config

@ -1 +1 @@
Subproject commit ec60c4d5596150a139e7237c7a685e5b2d2df8fb
Subproject commit c568d84e56eca3b2d74c56dddafb97c9449a8adc

2
components/zh_espnow

@ -1 +1 @@
Subproject commit 10a5837c8fffd027d2d6a0709644f69a0bc85be1
Subproject commit 742c807c416d9f80c0571f8daea85d275e8d4c93

2
components/zh_network

@ -1 +1 @@
Subproject commit 76281e85be8bd7570c5a0d5d49626242c0c798c3
Subproject commit 783b44fbca0ed467a868b4420f191c6d9f6caea5

2
components/zh_vector

@ -1 +1 @@
Subproject commit 899c3feed8df95f937c4f802ba880adf5e6140da
Subproject commit 53cdc7687388840c04470fb35e84e83b27175ae5

222
main/zh_gateway.c
View File

@ -46,8 +46,8 @@ void app_main(void)
wifi_init_config_t wifi_init_sta_config = WIFI_INIT_CONFIG_DEFAULT();
esp_wifi_init(&wifi_init_sta_config);
wifi_config_t wifi_config = {0};
memcpy(wifi_config.sta.ssid, gateway_config->software_config.ssid_name, 6);
memcpy(wifi_config.sta.password, gateway_config->software_config.ssid_password, 10);
memcpy(wifi_config.sta.ssid, gateway_config->software_config.ssid_name, strlen(gateway_config->software_config.ssid_name));
memcpy(wifi_config.sta.password, gateway_config->software_config.ssid_password, strlen(gateway_config->software_config.ssid_password));
esp_wifi_set_mode(WIFI_MODE_APSTA);
esp_wifi_set_protocol(WIFI_IF_AP, WIFI_PROTOCOL_11B);
esp_wifi_set_config(WIFI_IF_STA, &wifi_config);
@ -331,11 +331,13 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
zh_espnow_switch_send_mqtt_json_hardware_config_message(data, recv_data->mac_addr, gateway_config);
break;
case ZHDT_LED:
zh_espnow_led_send_mqtt_json_hardware_config_message(data, recv_data->mac_addr, gateway_config);
break;
case ZHDT_SENSOR:
zh_espnow_sensor_send_mqtt_json_hardware_config_message(data, recv_data->mac_addr, gateway_config);
break;
case ZHDT_BINARY_SENSOR:
zh_espnow_binary_sensor_send_mqtt_json_hardware_config_message(data, recv_data->mac_addr, gateway_config);
break;
default:
break;
@ -508,6 +510,12 @@ void zh_mqtt_event_handler(void *arg, esp_event_base_t event_base, int32_t event
}
else if (strncmp(incoming_payload, "restart", strlen(incoming_payload) + 1) == 0)
{
zh_espnow_data_t data = {0};
data.device_type = ZHDT_GATEWAY;
data.payload_type = ZHPT_KEEP_ALIVE;
data.payload_data.keep_alive_message.online_status = ZH_OFFLINE;
zh_send_message(NULL, (uint8_t *)&data, sizeof(zh_espnow_data_t));
vTaskDelay(1000 / portTICK_PERIOD_MS);
esp_restart();
}
else
@ -679,6 +687,46 @@ void zh_mqtt_event_handler(void *arg, esp_event_base_t event_base, int32_t event
data.payload_type = ZHPT_RGB;
zh_send_message(incoming_data_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
break;
case ZHPT_HARDWARE:
char *extracted_hardware_data = strtok(incoming_payload, ","); // Extract led type value.
if (extracted_hardware_data == NULL)
{
break;
}
data.payload_data.config_message.led_hardware_config_message.led_type = zh_led_type_check(atoi(extracted_hardware_data));
extracted_hardware_data = strtok(NULL, ","); // Extract first white gpio number value.
if (extracted_hardware_data == NULL)
{
break;
}
data.payload_data.config_message.led_hardware_config_message.first_white_pin = zh_gpio_number_check(atoi(extracted_hardware_data));
extracted_hardware_data = strtok(NULL, ","); // Extract second white gpio number value.
if (extracted_hardware_data == NULL)
{
break;
}
data.payload_data.config_message.led_hardware_config_message.second_white_pin = zh_gpio_number_check(atoi(extracted_hardware_data));
extracted_hardware_data = strtok(NULL, ","); // Extract red gpio number value.
if (extracted_hardware_data == NULL)
{
break;
}
data.payload_data.config_message.led_hardware_config_message.red_pin = zh_gpio_number_check(atoi(extracted_hardware_data));
extracted_hardware_data = strtok(NULL, ","); // Extract green gpio number value.
if (extracted_hardware_data == NULL)
{
break;
}
data.payload_data.config_message.led_hardware_config_message.green_pin = zh_gpio_number_check(atoi(extracted_hardware_data));
extracted_hardware_data = strtok(NULL, ","); // Extract blue gpio number value.
if (extracted_hardware_data == NULL)
{
break;
}
data.payload_data.config_message.led_hardware_config_message.blue_pin = zh_gpio_number_check(atoi(extracted_hardware_data));
data.payload_type = ZHPT_HARDWARE;
zh_send_message(incoming_data_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
break;
default:
break;
}
@ -840,6 +888,11 @@ void zh_self_ota_update_task(void *pvParameter)
esp_http_client_cleanup(https_client);
esp_mqtt_client_publish(gateway_config->mqtt_client, topic, "update_success", 0, 2, true);
heap_caps_free(topic);
zh_espnow_data_t data = {0};
data.device_type = ZHDT_GATEWAY;
data.payload_type = ZHPT_KEEP_ALIVE;
data.payload_data.keep_alive_message.online_status = ZH_OFFLINE;
zh_send_message(NULL, (uint8_t *)&data, sizeof(zh_espnow_data_t));
vTaskDelay(1000 / portTICK_PERIOD_MS);
esp_restart();
}
@ -993,6 +1046,11 @@ uint8_t zh_sensor_type_check(int type)
return (type > HAST_NONE && type < HAST_MAX) ? type : HAST_NONE;
}
uint8_t zh_led_type_check(int type)
{
return (type > HALT_NONE && type < HALT_MAX) ? type : HALT_NONE;
}
uint16_t zh_uint16_value_check(int value)
{
return (value >= 0 && value <= 65536) ? value : 60;
@ -1365,6 +1423,108 @@ void zh_espnow_led_send_mqtt_json_config_message(const zh_espnow_data_t *device_
heap_caps_free(topic);
}
void zh_espnow_led_send_mqtt_json_hardware_config_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config)
{
char *first_white_pin = (char *)heap_caps_malloc(4, MALLOC_CAP_8BIT);
memset(first_white_pin, 0, 4);
char *second_white_pin = (char *)heap_caps_malloc(4, MALLOC_CAP_8BIT);
memset(second_white_pin, 0, 4);
char *red_pin = (char *)heap_caps_malloc(4, MALLOC_CAP_8BIT);
memset(red_pin, 0, 4);
char *green_pin = (char *)heap_caps_malloc(4, MALLOC_CAP_8BIT);
memset(green_pin, 0, 4);
char *blue_pin = (char *)heap_caps_malloc(4, MALLOC_CAP_8BIT);
memset(blue_pin, 0, 4);
zh_json_t json = {0};
char buffer[512] = {0};
zh_json_init(&json);
if (device_data->payload_data.config_message.led_hardware_config_message.first_white_pin == ZH_NOT_USED && device_data->payload_data.config_message.led_hardware_config_message.red_pin == ZH_NOT_USED)
{
zh_json_add(&json, "Led type", "Not used");
}
else
{
switch (device_data->payload_data.config_message.led_hardware_config_message.led_type)
{
case HALT_W:
zh_json_add(&json, "Led type", "W");
break;
case HALT_WW:
zh_json_add(&json, "Led type", "WW");
break;
case HALT_RGB:
zh_json_add(&json, "Led type", "RGB");
break;
case HALT_RGBW:
zh_json_add(&json, "Led type", "RGBW");
break;
case HALT_RGBWW:
zh_json_add(&json, "Led type", "RGBWW");
break;
default:
zh_json_add(&json, "Led type", "Not used");
break;
}
}
if (device_data->payload_data.config_message.led_hardware_config_message.first_white_pin == ZH_NOT_USED)
{
zh_json_add(&json, "First white GPIO number", "Not used");
}
else
{
sprintf(first_white_pin, "%d", device_data->payload_data.config_message.led_hardware_config_message.first_white_pin);
zh_json_add(&json, "First white GPIO number", first_white_pin);
}
if (device_data->payload_data.config_message.led_hardware_config_message.second_white_pin == ZH_NOT_USED)
{
zh_json_add(&json, "Second white GPIO number", "Not used");
}
else
{
sprintf(second_white_pin, "%d", device_data->payload_data.config_message.led_hardware_config_message.second_white_pin);
zh_json_add(&json, "Second white GPIO number", second_white_pin);
}
if (device_data->payload_data.config_message.led_hardware_config_message.red_pin == ZH_NOT_USED)
{
zh_json_add(&json, "Red GPIO number", "Not used");
}
else
{
sprintf(red_pin, "%d", device_data->payload_data.config_message.led_hardware_config_message.red_pin);
zh_json_add(&json, "Red GPIO number", red_pin);
}
if (device_data->payload_data.config_message.led_hardware_config_message.green_pin == ZH_NOT_USED)
{
zh_json_add(&json, "Green GPIO number", "Not used");
}
else
{
sprintf(green_pin, "%d", device_data->payload_data.config_message.led_hardware_config_message.green_pin);
zh_json_add(&json, "Green GPIO number", green_pin);
}
if (device_data->payload_data.config_message.led_hardware_config_message.blue_pin == ZH_NOT_USED)
{
zh_json_add(&json, "Blue GPIO number", "Not used");
}
else
{
sprintf(blue_pin, "%d", device_data->payload_data.config_message.led_hardware_config_message.blue_pin);
zh_json_add(&json, "Blue GPIO number", blue_pin);
}
zh_json_create(&json, buffer);
zh_json_free(&json);
char *topic = (char *)heap_caps_malloc(strlen(gateway_config->software_config.mqtt_topic_prefix) + strlen(zh_get_device_type_value_name(device_data->device_type)) + 27, MALLOC_CAP_8BIT);
memset(topic, 0, strlen(gateway_config->software_config.mqtt_topic_prefix) + strlen(zh_get_device_type_value_name(device_data->device_type)) + 27);
sprintf(topic, "%s/%s/" MAC_STR "/config", gateway_config->software_config.mqtt_topic_prefix, zh_get_device_type_value_name(device_data->device_type), MAC2STR(device_mac));
esp_mqtt_client_publish(gateway_config->mqtt_client, topic, buffer, 0, 2, true);
heap_caps_free(first_white_pin);
heap_caps_free(second_white_pin);
heap_caps_free(red_pin);
heap_caps_free(green_pin);
heap_caps_free(blue_pin);
heap_caps_free(topic);
}
void zh_espnow_led_send_mqtt_json_status_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config)
{
char *brightness = (char *)heap_caps_malloc(4, MALLOC_CAP_8BIT);
@ -1468,17 +1628,11 @@ void zh_espnow_sensor_send_mqtt_json_hardware_config_message(const zh_espnow_dat
if (device_data->payload_data.config_message.sensor_hardware_config_message.sensor_pin_1 == ZH_NOT_USED)
{
zh_json_add(&json, "Sensor type", "Not used");
}
else
{
zh_json_add(&json, "Sensor type", zh_get_sensor_type_value_name(device_data->payload_data.config_message.sensor_hardware_config_message.sensor_type));
}
if (device_data->payload_data.config_message.sensor_hardware_config_message.sensor_pin_1 == ZH_NOT_USED)
{
zh_json_add(&json, "Sensor GPIO number 1", "Not used");
}
else
{
zh_json_add(&json, "Sensor type", zh_get_sensor_type_value_name(device_data->payload_data.config_message.sensor_hardware_config_message.sensor_type));
sprintf(sensor_pin_1, "%d", device_data->payload_data.config_message.sensor_hardware_config_message.sensor_pin_1);
zh_json_add(&json, "Sensor GPIO number 1", sensor_pin_1);
}
@ -1525,30 +1679,64 @@ void zh_espnow_sensor_send_mqtt_json_hardware_config_message(const zh_espnow_dat
void zh_espnow_sensor_send_mqtt_json_status_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config)
{
char *voltage = (char *)heap_caps_malloc(317, MALLOC_CAP_8BIT);
memset(voltage, 0, 317);
char *temperature = (char *)heap_caps_malloc(317, MALLOC_CAP_8BIT);
memset(temperature, 0, 317);
char *humidity = (char *)heap_caps_malloc(317, MALLOC_CAP_8BIT);
memset(humidity, 0, 317);
char *atmospheric_pressure = (char *)heap_caps_malloc(317, MALLOC_CAP_8BIT);
memset(atmospheric_pressure, 0, 317);
char *aqi = (char *)heap_caps_malloc(317, MALLOC_CAP_8BIT);
memset(aqi, 0, 317);
char *illuminance = (char *)heap_caps_malloc(317, MALLOC_CAP_8BIT);
memset(illuminance, 0, 317);
zh_json_t json = {0};
char buffer[512] = {0};
zh_json_init(&json);
sprintf(voltage, "%f", device_data->payload_data.status_message.sensor_status_message.voltage);
zh_json_add(&json, "voltage", voltage);
switch (device_data->payload_data.status_message.sensor_status_message.sensor_type)
{
case HAST_DS18B20:
sprintf(temperature, "%f", device_data->payload_data.status_message.sensor_status_message.temperature);
zh_json_add(&json, "temperature", temperature);
break;
case HAST_DHT11:
case HAST_DHT11: // Deprecated. Will be removed soon.
case HAST_DHT22: // Deprecated. Will be removed soon.
case HAST_DHT:
sprintf(temperature, "%f", device_data->payload_data.status_message.sensor_status_message.temperature);
sprintf(humidity, "%f", device_data->payload_data.status_message.sensor_status_message.humidity);
zh_json_add(&json, "temperature", temperature);
sprintf(humidity, "%f", device_data->payload_data.status_message.sensor_status_message.humidity);
zh_json_add(&json, "humidity", humidity);
break;
case HAST_DHT22:
case HAST_BH1750:
sprintf(temperature, "%f", device_data->payload_data.status_message.sensor_status_message.illuminance);
zh_json_add(&json, "illuminance", illuminance);
break;
case HAST_BMP280:
sprintf(temperature, "%f", device_data->payload_data.status_message.sensor_status_message.temperature);
sprintf(humidity, "%f", device_data->payload_data.status_message.sensor_status_message.humidity);
zh_json_add(&json, "temperature", temperature);
sprintf(atmospheric_pressure, "%f", device_data->payload_data.status_message.sensor_status_message.atmospheric_pressure);
zh_json_add(&json, "atmospheric_pressure", atmospheric_pressure);
break;
case HAST_BME280:
sprintf(temperature, "%f", device_data->payload_data.status_message.sensor_status_message.temperature);
zh_json_add(&json, "temperature", temperature);
sprintf(humidity, "%f", device_data->payload_data.status_message.sensor_status_message.humidity);
zh_json_add(&json, "humidity", humidity);
sprintf(atmospheric_pressure, "%f", device_data->payload_data.status_message.sensor_status_message.atmospheric_pressure);
zh_json_add(&json, "atmospheric_pressure", atmospheric_pressure);
break;
case HAST_BME680:
sprintf(temperature, "%f", device_data->payload_data.status_message.sensor_status_message.temperature);
zh_json_add(&json, "temperature", temperature);
sprintf(humidity, "%f", device_data->payload_data.status_message.sensor_status_message.humidity);
zh_json_add(&json, "humidity", humidity);
sprintf(atmospheric_pressure, "%f", device_data->payload_data.status_message.sensor_status_message.atmospheric_pressure);
zh_json_add(&json, "atmospheric_pressure", atmospheric_pressure);
sprintf(aqi, "%f", device_data->payload_data.status_message.sensor_status_message.aqi);
zh_json_add(&json, "aqi", aqi);
break;
default:
break;
@ -1559,8 +1747,12 @@ void zh_espnow_sensor_send_mqtt_json_status_message(const zh_espnow_data_t *devi
memset(topic, 0, strlen(gateway_config->software_config.mqtt_topic_prefix) + strlen(zh_get_device_type_value_name(device_data->device_type)) + 31);
sprintf(topic, "%s/%s/" MAC_STR "/state", gateway_config->software_config.mqtt_topic_prefix, zh_get_device_type_value_name(device_data->device_type), MAC2STR(device_mac));
esp_mqtt_client_publish(gateway_config->mqtt_client, topic, buffer, 0, 2, true);
heap_caps_free(voltage);
heap_caps_free(temperature);
heap_caps_free(humidity);
heap_caps_free(atmospheric_pressure);
heap_caps_free(aqi);
heap_caps_free(illuminance);
heap_caps_free(topic);
}
@ -1631,6 +1823,10 @@ void zh_espnow_binary_sensor_send_mqtt_json_config_message(const zh_espnow_data_
heap_caps_free(topic);
}
void zh_espnow_binary_sensor_send_mqtt_json_hardware_config_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config)
{
}
void zh_espnow_binary_sensor_send_mqtt_json_status_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config)
{
zh_json_t json = {0};

27
main/zh_gateway.h
View File

@ -211,6 +211,15 @@ bool zh_bool_value_check(const int value);
*/
uint8_t zh_sensor_type_check(const int type);
/**
* @brief Function for checking the correctness of the led type value.
*
* @param type Value for check.
*
* @return Led type value or 0 if error
*/
uint8_t zh_led_type_check(const int type);
/**
* @brief Function for checking the correctness of the uint16_t variable value.
*
@ -295,6 +304,15 @@ void zh_espnow_switch_send_mqtt_json_status_message(const zh_espnow_data_t *devi
*/
void zh_espnow_led_send_mqtt_json_config_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config);
/**
* @brief Function for converting to JSON and sending to the MQTT broker the hardware configuration message received from a zh_espnow_led node.
*
* @param[in] device_data Pointer to structure for data exchange between ESP-NOW devices.
* @param[in] device_mac Pointer to ESP-NOW node MAC address.
* @param[in] gateway_config Pointer to the structure of data exchange between tasks, functions and event handlers.
*/
void zh_espnow_led_send_mqtt_json_hardware_config_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config);
/**
* @brief Function for converting to JSON and sending to the MQTT broker the status message received from a zh_espnow_led node.
*
@ -340,6 +358,15 @@ void zh_espnow_sensor_send_mqtt_json_status_message(const zh_espnow_data_t *devi
*/
void zh_espnow_binary_sensor_send_mqtt_json_config_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config);
/**
* @brief Function for converting to JSON and sending to the MQTT broker the hardware configuration message received from a zh_espnow_binary_sensor node.
*
* @param[in] device_data Pointer to structure for data exchange between ESP-NOW devices.
* @param[in] device_mac Pointer to ESP-NOW node MAC address.
* @param[in] gateway_config Pointer to the structure of data exchange between tasks, functions and event handlers.
*/
void zh_espnow_binary_sensor_send_mqtt_json_hardware_config_message(const zh_espnow_data_t *device_data, const uint8_t *device_mac, const gateway_config_t *gateway_config);
/**
* @brief Function for converting to JSON and sending to the MQTT broker the status message received from a zh_espnow_binary_sensor node.
*

2
sdkconfig.defaults
View File

@ -18,7 +18,7 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
CONFIG_LOG_DEFAULT_LEVEL_NONE=y
CONFIG_LOG_DEFAULT_LEVEL=0
CONFIG_LWIP_LOCAL_HOSTNAME="gateway"
CONFIG_LWIP_LOCAL_HOSTNAME="ESP-NOW Gateway"
CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED=y

2
version.txt
View File

@ -1 +1 @@
1.0.4
1.0.5