diff --git a/main/zh_espnow_sensor.c b/main/zh_espnow_sensor.c
index f74b6d6..0315292 100644
--- a/main/zh_espnow_sensor.c
+++ b/main/zh_espnow_sensor.c
@@ -418,7 +418,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)
 {
     sensor_config_t *sensor_config = arg;
-    zh_espnow_data_t data = {0};
     switch (event_id)
     {
 #ifdef CONFIG_NETWORK_TYPE_DIRECT
@@ -436,14 +435,14 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
             goto ZH_NETWORK_EVENT_HANDLER_EXIT;
         }
 #endif
-        memcpy(&data, recv_data->data, recv_data->data_len);
-        switch (data.device_type)
+        zh_espnow_data_t *data = (zh_espnow_data_t *)recv_data->data;
+        switch (data->device_type)
         {
         case ZHDT_GATEWAY:
-            switch (data.payload_type)
+            switch (data->payload_type)
             {
             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 (sensor_config->gateway_is_available == false)
                     {
@@ -472,30 +471,30 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
                 }
                 break;
             case ZHPT_HARDWARE:
-                sensor_config->hardware_config.sensor_type = data.payload_data.config_message.sensor_hardware_config_message.sensor_type;
-                sensor_config->hardware_config.sensor_pin_1 = data.payload_data.config_message.sensor_hardware_config_message.sensor_pin_1;
-                sensor_config->hardware_config.sensor_pin_2 = data.payload_data.config_message.sensor_hardware_config_message.sensor_pin_2;
-                sensor_config->hardware_config.power_pin = data.payload_data.config_message.sensor_hardware_config_message.power_pin;
-                sensor_config->hardware_config.measurement_frequency = data.payload_data.config_message.sensor_hardware_config_message.measurement_frequency;
-                sensor_config->hardware_config.battery_power = data.payload_data.config_message.sensor_hardware_config_message.battery_power;
+                sensor_config->hardware_config.sensor_type = data->payload_data.config_message.sensor_hardware_config_message.sensor_type;
+                sensor_config->hardware_config.sensor_pin_1 = data->payload_data.config_message.sensor_hardware_config_message.sensor_pin_1;
+                sensor_config->hardware_config.sensor_pin_2 = data->payload_data.config_message.sensor_hardware_config_message.sensor_pin_2;
+                sensor_config->hardware_config.power_pin = data->payload_data.config_message.sensor_hardware_config_message.power_pin;
+                sensor_config->hardware_config.measurement_frequency = data->payload_data.config_message.sensor_hardware_config_message.measurement_frequency;
+                sensor_config->hardware_config.battery_power = data->payload_data.config_message.sensor_hardware_config_message.battery_power;
                 zh_save_config(sensor_config);
                 esp_restart();
                 break;
             case ZHPT_UPDATE:;
                 const esp_app_desc_t *app_info = get_app_description();
                 sensor_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
                 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);
                 sprintf(app_name, "%s.app%d", app_info->project_name, sensor_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);
 #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
-                data.device_type = ZHDT_SENSOR;
-                data.payload_type = ZHPT_UPDATE;
+                data->device_type = ZHDT_SENSOR;
+                data->payload_type = ZHPT_UPDATE;
                 zh_send_message(sensor_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
                 break;
             case ZHPT_UPDATE_BEGIN:
@@ -505,18 +504,18 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
                 esp_ota_begin(sensor_config->update_partition, OTA_SIZE_UNKNOWN, (esp_ota_handle_t *)&sensor_config->update_handle);
 #endif
                 sensor_config->ota_message_part_number = 1;
-                data.device_type = ZHDT_SENSOR;
-                data.payload_type = ZHPT_UPDATE_PROGRESS;
+                data->device_type = ZHDT_SENSOR;
+                data->payload_type = ZHPT_UPDATE_PROGRESS;
                 zh_send_message(sensor_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
                 break;
             case ZHPT_UPDATE_PROGRESS:
-                if (sensor_config->ota_message_part_number == data.payload_data.ota_message.espnow_ota_message.part)
+                if (sensor_config->ota_message_part_number == data->payload_data.ota_message.espnow_ota_message.part)
                 {
                     ++sensor_config->ota_message_part_number;
-                    esp_ota_write(sensor_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(sensor_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_SENSOR;
-                data.payload_type = ZHPT_UPDATE_PROGRESS;
+                data->device_type = ZHDT_SENSOR;
+                data->payload_type = ZHPT_UPDATE_PROGRESS;
                 zh_send_message(sensor_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
                 break;
             case ZHPT_UPDATE_ERROR:
@@ -525,14 +524,14 @@ void zh_espnow_event_handler(void *arg, esp_event_base_t event_base, int32_t eve
             case ZHPT_UPDATE_END:
                 if (esp_ota_end(sensor_config->update_handle) != ESP_OK)
                 {
-                    data.device_type = ZHDT_SENSOR;
-                    data.payload_type = ZHPT_UPDATE_FAIL;
+                    data->device_type = ZHDT_SENSOR;
+                    data->payload_type = ZHPT_UPDATE_FAIL;
                     zh_send_message(sensor_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
                     break;
                 }
                 esp_ota_set_boot_partition(sensor_config->update_partition);
-                data.device_type = ZHDT_SENSOR;
-                data.payload_type = ZHPT_UPDATE_SUCCESS;
+                data->device_type = ZHDT_SENSOR;
+                data->payload_type = ZHPT_UPDATE_SUCCESS;
                 zh_send_message(sensor_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
                 vTaskDelay(1000 / portTICK_PERIOD_MS);
                 esp_restart();