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

Reducing the amount of memory used

Browse Source
This commit is contained in:
Alexey Zholtikov
2024-06-06 14:40:47 +03:00
parent 09baf9769e
commit f5fad3c58d
1 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
main/zh_espnow_switch.c
View File

@ -524,7 +524,6 @@ void zh_send_sensor_status_message_task(void *pvParameter)
void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
{ {
switch_config_t *switch_config = arg; switch_config_t *switch_config = arg;
zh_espnow_data_t data = {0};
switch (event_id) switch (event_id)
{ {
#ifdef CONFIG_NETWORK_TYPE_DIRECT #ifdef CONFIG_NETWORK_TYPE_DIRECT
@ -542,14 +541,14 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
goto ZH_NETWORK_EVENT_HANDLER_EXIT; goto ZH_NETWORK_EVENT_HANDLER_EXIT;
} }
#endif #endif
memcpy(&data, recv_data->data, recv_data->data_len); zh_espnow_data_t *data = (zh_espnow_data_t *)recv_data->data;
switch (data.device_type) switch (data->device_type)
{ {
case ZHDT_GATEWAY: case ZHDT_GATEWAY:
switch (data.payload_type) switch (data->payload_type)
{ {
case ZHPT_KEEP_ALIVE: case ZHPT_KEEP_ALIVE:
if (data.payload_data.keep_alive_message.online_status == ZH_ONLINE) if (data->payload_data.keep_alive_message.online_status == ZH_ONLINE)
{ {
if (switch_config->gateway_is_available == false) if (switch_config->gateway_is_available == false)
{ {
@ -590,40 +589,40 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
} }
break; break;
case ZHPT_SET: case ZHPT_SET:
switch_config->status.status = data.payload_data.status_message.switch_status_message.status; switch_config->status.status = data->payload_data.status_message.switch_status_message.status;
zh_gpio_set_level(switch_config); zh_gpio_set_level(switch_config);
zh_save_status(switch_config); zh_save_status(switch_config);
zh_send_switch_status_message(switch_config); zh_send_switch_status_message(switch_config);
break; break;
case ZHPT_HARDWARE: case ZHPT_HARDWARE:
switch_config->hardware_config.relay_pin = data.payload_data.config_message.switch_hardware_config_message.relay_pin; switch_config->hardware_config.relay_pin = data->payload_data.config_message.switch_hardware_config_message.relay_pin;
switch_config->hardware_config.relay_on_level = data.payload_data.config_message.switch_hardware_config_message.relay_on_level; switch_config->hardware_config.relay_on_level = data->payload_data.config_message.switch_hardware_config_message.relay_on_level;
switch_config->hardware_config.led_pin = data.payload_data.config_message.switch_hardware_config_message.led_pin; switch_config->hardware_config.led_pin = data->payload_data.config_message.switch_hardware_config_message.led_pin;
switch_config->hardware_config.led_on_level = data.payload_data.config_message.switch_hardware_config_message.led_on_level; switch_config->hardware_config.led_on_level = data->payload_data.config_message.switch_hardware_config_message.led_on_level;
switch_config->hardware_config.int_button_pin = data.payload_data.config_message.switch_hardware_config_message.int_button_pin; switch_config->hardware_config.int_button_pin = data->payload_data.config_message.switch_hardware_config_message.int_button_pin;
switch_config->hardware_config.int_button_on_level = data.payload_data.config_message.switch_hardware_config_message.int_button_on_level; switch_config->hardware_config.int_button_on_level = data->payload_data.config_message.switch_hardware_config_message.int_button_on_level;
switch_config->hardware_config.ext_button_pin = data.payload_data.config_message.switch_hardware_config_message.ext_button_pin; switch_config->hardware_config.ext_button_pin = data->payload_data.config_message.switch_hardware_config_message.ext_button_pin;
switch_config->hardware_config.ext_button_on_level = data.payload_data.config_message.switch_hardware_config_message.ext_button_on_level; switch_config->hardware_config.ext_button_on_level = data->payload_data.config_message.switch_hardware_config_message.ext_button_on_level;
switch_config->hardware_config.sensor_pin = data.payload_data.config_message.switch_hardware_config_message.sensor_pin; switch_config->hardware_config.sensor_pin = data->payload_data.config_message.switch_hardware_config_message.sensor_pin;
switch_config->hardware_config.sensor_type = data.payload_data.config_message.switch_hardware_config_message.sensor_type; switch_config->hardware_config.sensor_type = data->payload_data.config_message.switch_hardware_config_message.sensor_type;
zh_save_config(switch_config); zh_save_config(switch_config);
esp_restart(); esp_restart();
break; break;
case ZHPT_UPDATE:; case ZHPT_UPDATE:;
const esp_app_desc_t *app_info = get_app_description(); const esp_app_desc_t *app_info = get_app_description();
switch_config->update_partition = esp_ota_get_next_update_partition(NULL); switch_config->update_partition = esp_ota_get_next_update_partition(NULL);
strcpy(data.payload_data.ota_message.espnow_ota_data.app_version, app_info->version); strcpy(data->payload_data.ota_message.espnow_ota_data.app_version, app_info->version);
#ifdef CONFIG_IDF_TARGET_ESP8266 #ifdef CONFIG_IDF_TARGET_ESP8266
char *app_name = (char *)heap_caps_malloc(strlen(app_info->project_name) + 6, MALLOC_CAP_8BIT); char *app_name = (char *)heap_caps_malloc(strlen(app_info->project_name) + 6, MALLOC_CAP_8BIT);
memset(app_name, 0, strlen(app_info->project_name) + 6); memset(app_name, 0, strlen(app_info->project_name) + 6);
sprintf(app_name, "%s.app%d", app_info->project_name, switch_config->update_partition->subtype - ESP_PARTITION_SUBTYPE_APP_OTA_0 + 1); sprintf(app_name, "%s.app%d", app_info->project_name, switch_config->update_partition->subtype - ESP_PARTITION_SUBTYPE_APP_OTA_0 + 1);
strcpy(data.payload_data.ota_message.espnow_ota_data.app_name, app_name); strcpy(data->payload_data.ota_message.espnow_ota_data.app_name, app_name);
heap_caps_free(app_name); heap_caps_free(app_name);
#else #else
strcpy(data.payload_data.ota_message.espnow_ota_data.app_name, app_info->project_name); strcpy(data->payload_data.ota_message.espnow_ota_data.app_name, app_info->project_name);
#endif #endif
data.device_type = ZHDT_SWITCH; data->device_type = ZHDT_SWITCH;
data.payload_type = ZHPT_UPDATE; data->payload_type = ZHPT_UPDATE;
zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
break; break;
case ZHPT_UPDATE_BEGIN: case ZHPT_UPDATE_BEGIN:
@ -633,18 +632,18 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
esp_ota_begin(switch_config->update_partition, OTA_SIZE_UNKNOWN, (esp_ota_handle_t *)&switch_config->update_handle); esp_ota_begin(switch_config->update_partition, OTA_SIZE_UNKNOWN, (esp_ota_handle_t *)&switch_config->update_handle);
#endif #endif
switch_config->ota_message_part_number = 1; switch_config->ota_message_part_number = 1;
data.device_type = ZHDT_SWITCH; data->device_type = ZHDT_SWITCH;
data.payload_type = ZHPT_UPDATE_PROGRESS; data->payload_type = ZHPT_UPDATE_PROGRESS;
zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
break; break;
case ZHPT_UPDATE_PROGRESS: case ZHPT_UPDATE_PROGRESS:
if (switch_config->ota_message_part_number == data.payload_data.ota_message.espnow_ota_message.part) if (switch_config->ota_message_part_number == data->payload_data.ota_message.espnow_ota_message.part)
{ {
++switch_config->ota_message_part_number; ++switch_config->ota_message_part_number;
esp_ota_write(switch_config->update_handle, (const void *)data.payload_data.ota_message.espnow_ota_message.data, data.payload_data.ota_message.espnow_ota_message.data_len); esp_ota_write(switch_config->update_handle, (const void *)data->payload_data.ota_message.espnow_ota_message.data, data->payload_data.ota_message.espnow_ota_message.data_len);
} }
data.device_type = ZHDT_SWITCH; data->device_type = ZHDT_SWITCH;
data.payload_type = ZHPT_UPDATE_PROGRESS; data->payload_type = ZHPT_UPDATE_PROGRESS;
zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
break; break;
case ZHPT_UPDATE_ERROR: case ZHPT_UPDATE_ERROR:
@ -653,14 +652,14 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
case ZHPT_UPDATE_END: case ZHPT_UPDATE_END:
if (esp_ota_end(switch_config->update_handle) != ESP_OK) if (esp_ota_end(switch_config->update_handle) != ESP_OK)
{ {
data.device_type = ZHDT_SWITCH; data->device_type = ZHDT_SWITCH;
data.payload_type = ZHPT_UPDATE_FAIL; data->payload_type = ZHPT_UPDATE_FAIL;
zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
break; break;
} }
esp_ota_set_boot_partition(switch_config->update_partition); esp_ota_set_boot_partition(switch_config->update_partition);
data.device_type = ZHDT_SWITCH; data->device_type = ZHDT_SWITCH;
data.payload_type = ZHPT_UPDATE_SUCCESS; data->payload_type = ZHPT_UPDATE_SUCCESS;
zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
vTaskDelay(1000 / portTICK_PERIOD_MS); vTaskDelay(1000 / portTICK_PERIOD_MS);
esp_restart(); esp_restart();