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

Reducing the amount of memory used

Browse Source
This commit is contained in:
Alexey Zholtikov
2024-06-09 15:58:00 +03:00
parent f1ca12a98a
commit dca73b14ed
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
main/zh_espnow_led.c
View File

@ -491,7 +491,6 @@ void zh_send_led_status_message(const led_config_t *led_config)
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)
{ {
led_config_t *led_config = arg; led_config_t *led_config = arg;
zh_espnow_data_t data = {0};
switch (event_id) switch (event_id)
{ {
#ifdef CONFIG_NETWORK_TYPE_DIRECT #ifdef CONFIG_NETWORK_TYPE_DIRECT
@ -509,14 +508,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 (led_config->gateway_is_available == false) if (led_config->gateway_is_available == false)
{ {
@ -546,57 +545,57 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
} }
break; break;
case ZHPT_SET: case ZHPT_SET:
led_config->status.status = data.payload_data.status_message.led_status_message.status; led_config->status.status = data->payload_data.status_message.led_status_message.status;
zh_gpio_set_level(led_config); zh_gpio_set_level(led_config);
zh_save_status(led_config); zh_save_status(led_config);
zh_send_led_status_message(led_config); zh_send_led_status_message(led_config);
break; break;
case ZHPT_BRIGHTNESS: case ZHPT_BRIGHTNESS:
led_config->status.brightness = data.payload_data.status_message.led_status_message.brightness; led_config->status.brightness = data->payload_data.status_message.led_status_message.brightness;
zh_gpio_set_level(led_config); zh_gpio_set_level(led_config);
zh_save_status(led_config); zh_save_status(led_config);
zh_send_led_status_message(led_config); zh_send_led_status_message(led_config);
break; break;
case ZHPT_TEMPERATURE: case ZHPT_TEMPERATURE:
led_config->status.temperature = data.payload_data.status_message.led_status_message.temperature; led_config->status.temperature = data->payload_data.status_message.led_status_message.temperature;
zh_gpio_set_level(led_config); zh_gpio_set_level(led_config);
zh_save_status(led_config); zh_save_status(led_config);
zh_send_led_status_message(led_config); zh_send_led_status_message(led_config);
break; break;
case ZHPT_RGB: case ZHPT_RGB:
led_config->status.red = data.payload_data.status_message.led_status_message.red; led_config->status.red = data->payload_data.status_message.led_status_message.red;
led_config->status.green = data.payload_data.status_message.led_status_message.green; led_config->status.green = data->payload_data.status_message.led_status_message.green;
led_config->status.blue = data.payload_data.status_message.led_status_message.blue; led_config->status.blue = data->payload_data.status_message.led_status_message.blue;
zh_gpio_set_level(led_config); zh_gpio_set_level(led_config);
zh_save_status(led_config); zh_save_status(led_config);
zh_send_led_status_message(led_config); zh_send_led_status_message(led_config);
break; break;
case ZHPT_HARDWARE: case ZHPT_HARDWARE:
led_config->hardware_config.led_type = data.payload_data.config_message.led_hardware_config_message.led_type; led_config->hardware_config.led_type = data->payload_data.config_message.led_hardware_config_message.led_type;
led_config->hardware_config.first_white_pin = data.payload_data.config_message.led_hardware_config_message.first_white_pin; led_config->hardware_config.first_white_pin = data->payload_data.config_message.led_hardware_config_message.first_white_pin;
led_config->hardware_config.second_white_pin = data.payload_data.config_message.led_hardware_config_message.second_white_pin; led_config->hardware_config.second_white_pin = data->payload_data.config_message.led_hardware_config_message.second_white_pin;
led_config->hardware_config.red_pin = data.payload_data.config_message.led_hardware_config_message.red_pin; led_config->hardware_config.red_pin = data->payload_data.config_message.led_hardware_config_message.red_pin;
led_config->hardware_config.green_pin = data.payload_data.config_message.led_hardware_config_message.green_pin; led_config->hardware_config.green_pin = data->payload_data.config_message.led_hardware_config_message.green_pin;
led_config->hardware_config.blue_pin = data.payload_data.config_message.led_hardware_config_message.blue_pin; led_config->hardware_config.blue_pin = data->payload_data.config_message.led_hardware_config_message.blue_pin;
zh_save_config(led_config); zh_save_config(led_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();
led_config->update_partition = esp_ota_get_next_update_partition(NULL); led_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, led_config->update_partition->subtype - ESP_PARTITION_SUBTYPE_APP_OTA_0 + 1); sprintf(app_name, "%s.app%d", app_info->project_name, led_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(led_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(led_config->gateway_mac, (uint8_t *)data, sizeof(zh_espnow_data_t));
break; break;
case ZHPT_UPDATE_BEGIN: case ZHPT_UPDATE_BEGIN:
#ifdef CONFIG_IDF_TARGET_ESP8266 #ifdef CONFIG_IDF_TARGET_ESP8266
@ -605,19 +604,19 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
esp_ota_begin(led_config->update_partition, OTA_SIZE_UNKNOWN, (esp_ota_handle_t *)&led_config->update_handle); esp_ota_begin(led_config->update_partition, OTA_SIZE_UNKNOWN, (esp_ota_handle_t *)&led_config->update_handle);
#endif #endif
led_config->ota_message_part_number = 1; led_config->ota_message_part_number = 1;
data.device_type = ZHDT_LED; data->device_type = ZHDT_LED;
data.payload_type = ZHPT_UPDATE_PROGRESS; data->payload_type = ZHPT_UPDATE_PROGRESS;
zh_send_message(led_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(led_config->gateway_mac, (uint8_t *)data, sizeof(zh_espnow_data_t));
break; break;
case ZHPT_UPDATE_PROGRESS: case ZHPT_UPDATE_PROGRESS:
if (led_config->ota_message_part_number == data.payload_data.ota_message.espnow_ota_message.part) if (led_config->ota_message_part_number == data->payload_data.ota_message.espnow_ota_message.part)
{ {
++led_config->ota_message_part_number; ++led_config->ota_message_part_number;
esp_ota_write(led_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(led_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_LED; data->device_type = ZHDT_LED;
data.payload_type = ZHPT_UPDATE_PROGRESS; data->payload_type = ZHPT_UPDATE_PROGRESS;
zh_send_message(led_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(led_config->gateway_mac, (uint8_t *)data, sizeof(zh_espnow_data_t));
break; break;
case ZHPT_UPDATE_ERROR: case ZHPT_UPDATE_ERROR:
esp_ota_end(led_config->update_handle); esp_ota_end(led_config->update_handle);
@ -625,15 +624,15 @@ 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(led_config->update_handle) != ESP_OK) if (esp_ota_end(led_config->update_handle) != ESP_OK)
{ {
data.device_type = ZHDT_LED; data->device_type = ZHDT_LED;
data.payload_type = ZHPT_UPDATE_FAIL; data->payload_type = ZHPT_UPDATE_FAIL;
zh_send_message(led_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(led_config->gateway_mac, (uint8_t *)data, sizeof(zh_espnow_data_t));
break; break;
} }
esp_ota_set_boot_partition(led_config->update_partition); esp_ota_set_boot_partition(led_config->update_partition);
data.device_type = ZHDT_LED; data->device_type = ZHDT_LED;
data.payload_type = ZHPT_UPDATE_SUCCESS; data->payload_type = ZHPT_UPDATE_SUCCESS;
zh_send_message(led_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t)); zh_send_message(led_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();
break; break;