|
@@ -88,13 +88,13 @@ RTC_FAST_ATTR Person_t person[5]=
|
|
|
|
|
|
|
|
|
|
|
|
-void reset_default(bool is_dis)
|
|
|
+void reset_default(bool is_dis,uint8_t power_status)
|
|
|
{
|
|
|
|
|
|
extern Machine_info_t default_info;
|
|
|
Machine_info_t tmp ;
|
|
|
memcpy(&tmp,&default_info,sizeof(Machine_info_t));
|
|
|
- tmp.power_status = 1;
|
|
|
+ tmp.power_status = power_status;
|
|
|
esp_read_mac((uint8_t *)tmp.mac_addr, ESP_MAC_WIFI_STA);
|
|
|
memcpy(&tmp.cid,&Machine_info.cid,20);
|
|
|
tmp.batt_precent = Machine_info.batt_precent;
|
|
@@ -112,13 +112,6 @@ void reset_default(bool is_dis)
|
|
|
|
|
|
|
|
|
|
|
|
-#if 0
|
|
|
-void insertNode_head(ListNode *head, ListNode *P);
|
|
|
-void removeNode_byNumber(ListNode *head,uint16_t number);
|
|
|
-ListNode *getListNode_byNumber(ListNode *head,uint16_t number);
|
|
|
-ListNode *newListNode(uint16_t number,uint8_t type,char* name);
|
|
|
-#endif
|
|
|
-
|
|
|
/*
|
|
|
* 使用 vTaskList() 前需使能:
|
|
|
* Enable FreeRTOS trace facility
|
|
@@ -1674,7 +1667,7 @@ static void hardware_ungwpair_func(const LORA_DATA_T* buf)
|
|
|
dymatic_change_device_id(0x00000001);
|
|
|
dymatic_change_dst_device_id(0xFFFFFFFF);
|
|
|
//切换信道
|
|
|
- reset_default(true);
|
|
|
+ reset_default(true,1);
|
|
|
vTaskDelay(300 / portTICK_PERIOD_MS);
|
|
|
Machine_info.lora_new_channel = LORA_CHANENL;
|
|
|
// dymatic_change_chanel(Machine_info.lora_factory_channel); //切换信道
|
|
@@ -1837,7 +1830,7 @@ void business_logic_func(const LORA_DATA_T* buf,uint8_t cmd_index,int msg)
|
|
|
break;
|
|
|
|
|
|
case PROTOCOL_HARDWARE_GWPAIRED: //配网 暂时单独发送ack
|
|
|
- reset_default(false);
|
|
|
+ reset_default(false,1);
|
|
|
hardware_gwpair_func(buf);
|
|
|
Paint_leftScreen_main_quick(&Machine_info);
|
|
|
Paint_rightScreen_main_quick(&Machine_info);
|