1，根据V2.0版本需求，更新固件功能

Code/海顿-多合一新风面板/APP/AllToOneThernmostatPannel.uvopt

@@ -140,38 +140,6 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>65</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>5624</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\Users\11730\SimplicityStudio\v4_workspace\KKAll-In-OneThermostatPanelMG21V1\z3s_thermostatallinonemg21sdk665v2\Code\娴烽】-澶氬悎涓€鏂伴闈㈡澘\Library\StdDriver\src\retarget.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\AllToOneThermostatPannel\../Library/StdDriver/src/retarget.c\65</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>1218</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>4294</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\Users\11730\SimplicityStudio\v4_workspace\KKAll-In-OneThermostatPanelMG21V1\z3s_thermostatallinonemg21sdk665v2\Code\娴烽】-澶氬悎涓€鏂伴闈㈡澘\APP\User\src\display_common.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\AllToOneThermostatPannel\User/src/display_common.c\1218</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
           <LineNumber>303</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>232</Address>
@@ -186,43 +154,43 @@
           <Expression>\\AllToOneThermostatPannel\../Library/StdDriver/src/retarget.c\303</Expression>
         </Bp>
         <Bp>
-          <Number>3</Number>
+          <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>110</LineNumber>
+          <LineNumber>537</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>26502</Address>
+          <Address>8968</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\Users\11730\SimplicityStudio\v4_workspace\KKAll-In-OneThermostatPanelMG21V1\z3s_thermostatallinonemg21sdk665v2\Code\娴烽】-澶氬悎涓€鏂伴闈㈡澘\APP\User\src\mfg_factort.c</Filename>
+          <Filename>D:\Users\11730\SimplicityStudio\v4_workspace\KKAll-In-OneThermostatPanelMG21V1\z3s_thermostatallinonemg21sdk665v2\Code\娴烽】-澶氬悎涓€鏂伴闈㈡澘\APP\User\src\Key.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\AllToOneThermostatPannel\User/src/mfg_factort.c\110</Expression>
+          <Expression>\\AllToOneThermostatPannel\User/src/Key.c\537</Expression>
         </Bp>
         <Bp>
-          <Number>4</Number>
+          <Number>2</Number>
           <Type>0</Type>
-          <LineNumber>53</LineNumber>
+          <LineNumber>2136</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>24644</Address>
+          <Address>25068</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>D:\Users\11730\SimplicityStudio\v4_workspace\KKAll-In-OneThermostatPanelMG21V1\z3s_thermostatallinonemg21sdk665v2\Code\娴烽】-澶氬悎涓€鏂伴闈㈡澘\APP\main.c</Filename>
+          <Filename>D:\Users\11730\SimplicityStudio\v4_workspace\KKAll-In-OneThermostatPanelMG21V1\z3s_thermostatallinonemg21sdk665v2\Code\娴烽】-澶氬悎涓€鏂伴闈㈡澘\APP\User\src\control_comm.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\AllToOneThermostatPannel\main.c\53</Expression>
+          <Expression>\\AllToOneThermostatPannel\User/src/control_comm.c\2136</Expression>
         </Bp>
       </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
           <WinNumber>1</WinNumber>
-          <ItemText>temp1</ItemText>
+          <ItemText>count</ItemText>
         </Ww>
         <Ww>
           <count>1</count>

Code/海顿-多合一新风面板/APP/Nu_Link_Driver.ini

 [Version]
 Nu_LinkVersion=V5.14
 [Process]
-ProcessID=0x0000e77c
-ProcessCreationTime_L=0xcec60db7
-ProcessCreationTime_H=0x01d6d90f
+ProcessID=0x00003c14
+ProcessCreationTime_L=0x58827bbd
+ProcessCreationTime_H=0x01d7122a
 NuLinkID=0x18101887
 NuLinkID0=0x18101887
 NuLinkIDs_Count=0x00000001

Code/海顿-多合一新风面板/APP/User/inc/Key.h

@@ -53,7 +53,6 @@ typedef struct
 }Filter_Wash_Calc;
 typedef struct KEY_OPERATE
 {
-			u8      operate_delay_off_status;	//延时关机操作期间标志位判断
 			u8      operate_delay_off_display_flag;
 volatile 	u32 	operate_delay_off_ms;    
 volatile 	u32  	operate_delay_off_s;  
@@ -72,16 +71,19 @@ volatile 	u32		operate_delay_off_h;
 }KEY_OPERATE;
 typedef void (*KeyProcessCallback)(u8 key_id,u8 KeyPressEvent);
 
-
+#define  IsKeyID12356(keyid)      	( (keyid == 1)  ||(keyid == 2)  || (keyid == 3)  ||(keyid == 5) || (keyid == 6)  )   
+#define  IsKeyID1356(keyid)      	( (keyid == 1)  ||(keyid == 3)  || (keyid == 5)  ||(keyid == 6)  )   
+#define  IsKeyID123(keyid)      	( (keyid == 1)  ||(keyid == 2)  || (keyid == 3)  )  
 
 #define  Low      0
 #define  High     1
 #define  NULL     0
 
 
-#define AntiShakeTime  		6     //30ms =    6*5ms 按键防止抖动时间
-#define PressLongTime  		800  //  4s  = 800*5ms 按键长按时间
-#define Press10sLongTime  	2000  //  10s = 2000*5ms 退出老化
+#define AntiShakeTime  			6     //30ms =    6*5ms 按键防止抖动时间
+#define Press0_5sLongTime  		100  //  0.5s  = 100*5ms 按键长按时间
+#define PressLongTime  			800  //  4s  = 800*5ms 按键长按时间
+#define Press10sLongTime  		2000  //  10s = 2000*5ms 退出老化
 
 #define SyskeyScanTimer     5 //5ms
 #define KeyEventBufferNum  30
@@ -178,6 +180,8 @@ A = 	0	B = 	1	C = 	1
 #define Key_Rotary    0x02
 
 #define NoButtonEvent              0x00
+#define Button0_5sLongEvent        0x60
+#define Button0_5sLongUpEvent      0x70
 #define ButtonShortEvent           0x80
 #define ButtonLongEvent            0x90
 #define ButtonLongUpEvent          0xa0
@@ -217,6 +221,12 @@ typedef struct key_init
     /* 有效电平 */
     u8 Valid_Level;
 	
+	 /* 支持的按键事件总数 */
+	u8 Key_Support_Event_Num[3];
+	
+	/* 支持的按键事件列表 */
+	u8 Key_Support_Event_List[3][5];
+	
 } KeyConfigInit_t;
 typedef struct 
 {

Code/海顿-多合一新风面板/APP/User/inc/control_comm.h

@@ -262,7 +262,6 @@ void  Send_Device_Data(u8 channel_id,u16 opcode ,u8 *arg,u8 len);
 static void network_state_machine(TP_uc8 recv_network_state);
 void state_change_report(TP_u16 opcode, TP_u8 channel);
 void Setup_Task_Start(void);
-u8 Get_Channel_Id(u8 device_type);
 void delay_operate_calibrate_temper_Task_Start(void);
 void operate_calibrate_temper_delay_2s_off_Task_Start(void);
 void operate_calibrate_temper_delay_2s_off_Task_Stop(void);
@@ -275,10 +274,11 @@ u8 IsLcdEnterScreenSave(void);
 void ChildLockLedFlash(void);
 void  zero_check_init(void);
 void delay_operate_calibrate_temper_Task_Stop(void);
-void delay_operate_delay_off_Task_Start(void);
-void delay_operate_delay_off_Task_Stop(void);
 void Reset_DelayOFF_timer(u8 device_type);
 void task_exit_aging_test_start(void);
+void Delay_Report_Status(void);
+void Delay_Report_Time_Decrease_Count(u8 time);
+void Start_Delay_Report_Event(u8 channel);
 
 #define  Network_Control(join_or_leave)    Send_Device_Data(0,_OPCODE_SET_NET_STATE,&join_or_leave,1)
 #define  proximity_triagger_report_zigbee()    do{	uint8_t res = 1;  \

Code/海顿-多合一新风面板/APP/User/inc/display_common.h

@@ -99,7 +99,6 @@ typedef struct Display_Data
 	u8    		zigbee_Version;                    //zigbee版本
 	u8          binding_device;					  //0 未绑定  1，绑定空调，2，地暖，3，绑定新风
 	u8          recv_lcd_off;					  //接受到控制息屏的指令后
-	u8			is_dispaly_cur_temp;
 	u8			zigbee_mac[8];
 	OLED_AIR_DSD  Air_Device;
 	OLED_FLOOR_HEATING_DSD  FLOOR_Device;
@@ -127,7 +126,7 @@ typedef struct{
 	u8   enter_config_mode;
 	u8   config_page;
 	u8   config_page1_func_value;
-	u8   config_page2_value;
+	u16   config_page2_value;
 	u8   support_function_len;
 	u8   support_function_list[6];       //1,风机盘管管制设置 2,温度校准 3,是否显示当前房间温度设置,4, 超时进入屏保时间设置 10 恢复出厂设置
 	volatile u32  config_time_ms;
@@ -136,8 +135,8 @@ typedef struct{
 }Local_Config_Operation;
 typedef enum  {
 	LOCAL_FUNC_FAN_PANEL_SETTING 			= 1,
-	LOCAL_FUNC_CALIBRATE_TEMPER  			= 2,
-	LOCAL_FUNC_IS_DISPLAY_CURRENT_TEMPER  	= 3,
+	LOCAL_FUNC_IS_DISPLAY_CURRENT_TEMPER  	= 2,
+	LOCAL_FUNC_CALIBRATE_TEMPER  			= 3,
 	LOCAL_FUNC_SCREEN_SAVING_TIME  			= 4,
 	LOCAL_FUNC_NOT_DISTURB  				= 5,
 	LOCAL_FUNC_FILTER_TIME  				= 10,
@@ -153,7 +152,7 @@ extern  Key_Operation_Status  gKey_Press_Info;
 
 void Display_poweroff_time(u8 display_time);
 extern void  display_error(u8 error_value);
-void Operate_Led_Button(u8 device_type,u8 on_off);
+void Operate_Led_Button(u8 device_type,u8 Type);
 void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len);
 void display_current_page(void);
 u16 GetNetScanTime( void );
@@ -162,7 +161,7 @@ u8  kNetIndicatorIsBlinking(void);
 void kNetIndicatorOptTrigger(uint8_t id, uint32_t duration_on_ms, uint32_t duration_off_ms, uint32_t times, u8 start, u8 end );
 void kLedModuleActionDetectCallback(void );
 
-void  display_set_temp(u8 display_mode,s16 temp_value,u8 ararm_f);
+void  Display_Set_Temper(s16 temp_value);
 void  display_system_mode(u8 heat,u8 dry,u8 cold ,u8 air,u8 sleep,u8 manufture,u8 Auto,u8 Roll);
 void  display_wind_speed(u8 wind_speed,u8 support_type);
 void  display_wind_direct(u8 low,u8 mediu,u8 high);
@@ -174,6 +173,7 @@ void Detect_Human_Dispaly(void);
 u8 System_Mode_Trans(u8 device_type,u8 is_support_sleep);
 void Fan_Button_Handler(void);
 void delay_confirm_fan_speed(void);								//提前打断延时,
+u8   Get_LED_OnOff_Status(u8 id);
 void Control_LED_ON_OFF(u8 onoff_bits);
 u8 Key_Operate_Config_Operation(u8 keyid,u8 keyEvent);
 u8 IsLocalConfigMode(void);
@@ -182,14 +182,16 @@ void Display_Up_Contend(u8 device_type);
 void Setup_Mode_Handle (void);
 void Display_Current_Temper(s16 temper);
 void Reset_Flash_Time_10s(void);
-
+void Display_Middle_Contend(u8 device_type);
+void Fan_speed_and_direct_control(u8 windspeed_onoff,u8 winddirect_onoff);
+void Auto_Led_Display(u8 screen_page);
 
 #define Operation_LED(X) 	 		Operate_Led_Button(Oled_Display_Info.screen_page,X)
 #define  Reload_Save_Time()   		do{ sBacklight.blacklight_flag 		= 1;\
 										sBacklight.time_blacklight_ms 	= 0;\
 										sBacklight.time_blacklight_s 	= 0;\
 										LCD_CONTROL(1);	\
-										Operation_LED(1);}while(0);
+										Auto_Led_Display(Oled_Display_Info.screen_page);}while(0);
 
 										
 										

Code/海顿-多合一新风面板/APP/User/src/mfg_factort.c

@@ -195,7 +195,7 @@ u8 Usart_recive_deal(TP_uc8 *data, TP_uc8 len )
 		{
 			BL55072A_Clear();									//息屏
 			LCD_CONTROL(0);		
-			Operate_Led_Button(Oled_Display_Info.device_type,0);	
+			Operate_Led_Button(Oled_Display_Info.device_type,4);	
 			arg_data[0] = 0;
 			arg_data[1] = 0;
 			Oled_Display_Info.recv_lcd_off = 0x85;