添加所有遥控控制

README.md

@@ -6,9 +6,9 @@
 | ---------- | ------------------------------ |
 | 产品类型   | 220V单通道智能通断器 |
 | 项目负责人 | 徐少祥                           |
-| 硬件版本   | V1.2                           |
+| 硬件版本   | V1.4                           |
-| 固件版本   | V1.0                           |
+| 固件版本   | V1.1                          |
-| 创建日期   | 2026-06-05                    |
+| 创建日期   | 2026-06-25                    |
 
 ---
 
@@ -163,4 +163,4 @@ abc
 
 | 日期       | 作者 | 内容     |
 | ---------- | ---- | -------- |
-| 2026-06-05 | 徐少祥 | 创建项目 |
+| 2026-06-25 | 徐少祥 | 创建项目 |

project/example/ble/ble_peripheral/app/src/Mode.c

@@ -28,6 +28,15 @@ void chx_gpio_init(void)
 		GPIO_InitCfg.Pin = RELAY_CH2_PIN;         // 设置通道2引脚
 		xc_gpio_init(&GPIO_InitCfg);          // 初始化GPIO
 		
+		
+		if(flash_ch1_state)
+	{
+		xc_gpio_write_pin(GPIO_5,GPIO_PIN_SET);
+	}
+	else 
+	{
+		xc_gpio_write_pin(GPIO_5,GPIO_PIN_RESET);
+	}
 }
 	
 

project/example/ble/ble_peripheral/app/src/Rf433.c

@@ -10,7 +10,7 @@
 
 
 //用bit表示通道
-#define CH_GPIO2  (1 << 0)  // bit0 = GPIO2
+
 #define CH_GPIO5  (1 << 1)  // bit1 = GPIO5
 
 
@@ -368,17 +368,46 @@ void _433_fun(void)
    if(Key_TypeDef.KEY_STATE_Click==1||KEY_STATE_re==1) return;
 	 set_click();		//设置单击长按
 	
-		if(res_data==0x03)
+		uint8_t ch_mask = adress_ch_flag[adress_index_ture];
-    {
+	
-			uint8_t ch_mask = adress_ch_flag[adress_index_ture];
+	switch(res_data)
-       
+	{
+		case 0x03:						//如果是3键遥控或者是正方形白色遥		       
         if(ch_mask & CH_GPIO5){
             xc_gpio_toggle_pin(GPIO_5);	
             flash_ch1_state=xc_gpio_read_pin(GPIO_5);
         }
        
-       
+      
-    }
+				break;
+				
+				
+		case 0x04:						//如果是黑色长方形遥控或者椭圆遥控关闭按键
+		
+					
+					if(ch_mask & CH_GPIO5)
+					{
+							xc_gpio_write_pin(GPIO_5,GPIO_PIN_RESET);	
+							flash_ch1_state=xc_gpio_read_pin(GPIO_5);
+					}
+					
+					break;
+					
+		case 0x02:						//如果是黑色长方形遥控或者椭圆遥控打开按键
+		
+					
+					if(ch_mask & CH_GPIO5)
+					{
+							xc_gpio_write_pin(GPIO_5,GPIO_PIN_SET);	
+							flash_ch1_state=xc_gpio_read_pin(GPIO_5);
+					}
+					
+					break;
+				
+					
+					default:
+        break;
+	}
 }
 
 

project/example/ble/ble_peripheral/app/src/arch_main.c

@@ -464,14 +464,8 @@ int main(void)
 	
 	
 	
-	if(flash_ch1_state)
+	
-	{
+
-		xc_gpio_write_pin(GPIO_5,GPIO_PIN_SET);
-	}
-	else 
-	{
-		xc_gpio_write_pin(GPIO_5,GPIO_PIN_RESET);
-	}
 
 
 	//startTimer(&timer1,1);

project/example/ble/ble_peripheral/app/src/switch_s.c

@@ -22,6 +22,8 @@ static volatile uint16_t s2_debounce_cnt = 0;
 
 
 
+
+
 #define DEBOUNCE_MS    2  		//消抖时间40ms
 
 //uint16_t switch1_debounce = 0;		
@@ -34,6 +36,8 @@ uint8_t s1_first_press_flag = 0; 	//S2首次按下标志
 uint8_t s2_first_press_flag = 0; 	//S2首次按下标志
 
 
+uint8_t S1_first_on_state=0;		//上电时开关的状态
+
 
 void switch_init(void)
 {
@@ -51,13 +55,28 @@ void switch_init(void)
 		
 		xc_gpio_it_config(GPIO_1,FAIL_EDGE_INT);
 		NVIC_EnableIRQ(GPIO_IRQn);
+		
+		
+			if(xc_gpio_read_pin(SWITCH_S1_PIN)==0)
+			{
+				S1_first_on_state=1;
+			}
+			else
+			{
+				S1_first_on_state=0;
+			}
 }
 
 
 void trigger_check_process(void)
 {
   
-	
+	if(S1_first_on_state==1)
+	{
+		S1_first_on_state=0;
+		s1_first_press_flag=1;
+		s1_state=DB_PRESSED;
+	}
 	
 	 switch(s1_state)
 	 {
@@ -162,10 +181,12 @@ void trigger_check_process(void)
 				trig1_wait = 0;
 				s1_first_press_flag=1;
 				xc_gpio_write_pin(GPIO_5,GPIO_PIN_SET);	
-		
+			
+				flash_ch1_state=xc_gpio_read_pin(GPIO_5);
+			set_TaskComps_timer(6,1000);
 		}
 	
-		else if(trig1_timeout == 0 && (trig1_cnt > 1 && trig1_cnt < 5))
+		else if(trig1_timeout == 0 && (trig1_cnt > 1 && trig1_cnt < TRIGGER_CONTINUE_CNT))
 		{
 			//	printf("乱按 trig1_cnt   %d\r\n",trig1_cnt);
 			trig1_cnt = 0;
@@ -198,6 +219,9 @@ void trigger_check_process(void)
 			s1_first_press_flag=0;			
 			xc_gpio_write_pin(GPIO_5,GPIO_PIN_RESET);
 			
+			flash_ch1_state=xc_gpio_read_pin(GPIO_5);
+			set_TaskComps_timer(6,1000);
+			
 			
 		}
 		

project/example/ble/ble_peripheral/app/src/switch_s.h

@@ -25,6 +25,7 @@ typedef enum {
 } debounce_state_t;
 
 extern uint8_t rf433_sw_flag;
+extern uint8_t S1_first_on_state;
 
 void trigger_check_process(void);
 

project/example/ble/ble_peripheral/app/src/uart.c

@@ -119,6 +119,8 @@ void scan_uart(uint8_t *arr)
 									{
 										case 0x01:
 											xc_gpio_toggle_pin(GPIO_5);	
+										 flash_ch1_state=xc_gpio_read_pin(GPIO_5);
+										set_TaskComps_timer(6,1000);
 										break;
 										
 								

project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.build_log.htm

@@ -21,7 +21,7 @@ Target DLL:      UL2CM3.DLL V1.160.3.0
 Dialog DLL:      TARMCM1.DLL V1.13.0.0
  
 <h2>Project:</h2>
-D:\2026_4_13\hpw421_通道对码\project\example\ble\ble_peripheral\mdk\ble_peripheral.uvprojx
+D:\2026_4_13\hpw兼容所有遥控\hpw421_通道对码\project\example\ble\ble_peripheral\mdk\ble_peripheral.uvprojx
 Project File Date:  05/07/2026
 
 <h2>Output:</h2>
@@ -55,7 +55,7 @@ compiling arch_main.c...
   #define  Brightness_L      0x0D
 ..\app\src\key.h(148): warning:  #1-D: last line of file ends without a newline
   #endif /* __KEY_H__ */
-..\app\src\switch_s.h(32): warning:  #1-D: last line of file ends without a newline
+..\app\src\switch_s.h(33): warning:  #1-D: last line of file ends without a newline
   #endif
 ..\app\src\arch_main.c(163): warning:  #223-D: function "xc_fmc_spi_init_oprt" declared implicitly
       xc_fmc_spi_init_oprt();
@@ -79,7 +79,7 @@ alse == xc_unique_identification_read(co_default_bdaddr.addr)) {
 DT_CLK_32K_RESET_MODE0_2048MS;
 ..\app\src\arch_main.c(463): warning:  #223-D: function "switch_init" declared implicitly
   	switch_init();
-..\app\src\arch_main.c(480): warning:  #223-D: function "TaskProcess" declared implicitly
+..\app\src\arch_main.c(474): warning:  #223-D: function "TaskProcess" declared implicitly
        TaskProcess();
 ..\app\src\arch_main.c: 21 warnings, 0 errors
 compiling app_sec.c...
@@ -154,7 +154,6 @@ compiling xc_drv_spi.c...
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.h(237): warning:  #47-D: incompatible redefinition of macro "FMC_IDLE_STATUS"  (declared at line 78 of "..\..\..\..\..\component\ble\modules\flash\xc6xxx_fmc_spi.h")
   #define FMC_IDLE_STATUS                ((uint32_t)0x01 << 31)
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_spi.c: 3 warnings, 0 errors
-compiling ringbuffer.c...
 compiling xc_drv_fmc_spi.c...
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.h(230): warning:  #47-D: incompatible redefinition of macro "CUR_PAGE_NUM"  (declared at line 115 of "..\..\..\..\..\component\ble\modules\flash\xc6xxx_fmc_spi.h")
   #define CUR_PAGE_NUM(addr)             (addr / FLASH_PAGE_SIZE)
@@ -163,20 +162,19 @@ compiling xc_drv_fmc_spi.c...
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.h(237): warning:  #47-D: incompatible redefinition of macro "FMC_IDLE_STATUS"  (declared at line 78 of "..\..\..\..\..\component\ble\modules\flash\xc6xxx_fmc_spi.h")
   #define FMC_IDLE_STATUS                ((uint32_t)0x01 << 31)
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.c: 3 warnings, 0 errors
+compiling ringbuffer.c...
 compiling usr_server.c...
 ..\app\src\usr_server.c(137): warning:  #223-D: function "ble_callback" declared implicitly
   			ble_callback(co_buf_data(p_data)[0],co_buf_data(p_data)[1],co_buf_data(p_data)[2],co_buf_data(p_data)[3]);
 ..\app\src\usr_server.c: 1 warning, 0 errors
 compiling xc_drv_pwm.c...
-compiling xc_drv_gpio.c...
 compiling xc_drv_clock.c...
+compiling xc_drv_gpio.c...
+compiling xc_drv_timer.c...
 compiling xc_drv_pwr.c...
 compiling xc_drv_uart.c...
-compiling xc_drv_timer.c...
 compiling xc_drv_wdt.c...
 compiling xc_drv_systick.c...
-compiling xc_drv_pga.c...
-compiling xc_drv_calib.c...
 compiling xc_drv_fmc_spi.c...
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.h(230): warning:  #47-D: incompatible redefinition of macro "CUR_PAGE_NUM"  (declared at line 115 of "..\..\..\..\..\component\ble\modules\flash\xc6xxx_fmc_spi.h")
   #define CUR_PAGE_NUM(addr)             (addr / FLASH_PAGE_SIZE)
@@ -185,7 +183,9 @@ compiling xc_drv_fmc_spi.c...
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.h(237): warning:  #47-D: incompatible redefinition of macro "FMC_IDLE_STATUS"  (declared at line 78 of "..\..\..\..\..\component\ble\modules\flash\xc6xxx_fmc_spi.h")
   #define FMC_IDLE_STATUS                ((uint32_t)0x01 << 31)
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.c: 3 warnings, 0 errors
+compiling xc_drv_calib.c...
 compiling xc_drv_adc.c...
+compiling xc_drv_pga.c...
 compiling xc_gatt_client_api.c...
 ..\..\..\..\..\component\ble\ip\ble\api\xc_gatt_client_api.c(121): warning:  #223-D: function "gatt_cli_mtu_exch" declared implicitly
       return gatt_cli_mtu_exch(conidx, user_lid);
@@ -228,11 +228,11 @@ compiling timer.c...
   #define  Brightness_H      0x08  
 ..\app\src\RF433.h(101): warning:  #47-D: incompatible redefinition of macro "Brightness_L"  (declared at line 85)
   #define  Brightness_L      0x0D
-..\app\src\switch_s.h(32): warning:  #1-D: last line of file ends without a newline
+..\app\src\switch_s.h(33): warning:  #1-D: last line of file ends without a newline
   #endif
 ..\app\src\timer.c: 9 warnings, 0 errors
-compiling xc_gap_api.c...
 compiling xc_gatt_server_api.c...
+compiling xc_gap_api.c...
 compiling uart.c...
 compiling uart.c...
 ..\app\src\RF433.h(83): warning:  #47-D: incompatible redefinition of macro "Brightness_H"  (declared at line 64)
@@ -255,7 +255,7 @@ compiling uart.c...
   }
 ..\app\src\uart.c(96): warning:  #177-D: variable "uart_handle"  was declared but never referenced
           uint8_t uart_handle = UART0_IDX;
-..\app\src\uart.c(188): warning:  #1-D: last line of file ends without a newline
+..\app\src\uart.c(190): warning:  #1-D: last line of file ends without a newline
          
 ..\app\src\uart.c: 11 warnings, 0 errors
 compiling timeslice.c...
@@ -277,40 +277,10 @@ compiling timeslice.c...
   #define  Brightness_L      0x0D
 ..\app\src\key.h(148): warning:  #1-D: last line of file ends without a newline
   #endif /* __KEY_H__ */
-..\app\src\switch_s.h(32): warning:  #1-D: last line of file ends without a newline
+..\app\src\switch_s.h(33): warning:  #1-D: last line of file ends without a newline
   #endif
 ..\app\src\timeslice.c: 10 warnings, 0 errors
 compiling PWM.c...
-compiling Rf433.c...
-..\app\src\RF433.h(83): warning:  #47-D: incompatible redefinition of macro "Brightness_H"  (declared at line 64)
-  #define  Brightness_H               0xF4  
-..\app\src\RF433.h(85): warning:  #47-D: incompatible redefinition of macro "Brightness_L"  (declared at line 62)
-  #define  Brightness_L               0xF5  
-..\app\src\RF433.h(91): warning:  #47-D: incompatible redefinition of macro "ON"  (declared at line 75)
-  #define  ON  				       0X02 //寮€鍏?
-..\app\src\RF433.h(93): warning:  #47-D: incompatible redefinition of macro "OFF"  (declared at line 77)
-  #define  OFF      				 0X04  //涓冨僵
-..\app\src\RF433.h(95): warning:  #47-D: incompatible redefinition of macro "Mode_add"  (declared at line 79)
-  #define  Mode_add          0X06  //
-..\app\src\RF433.h(97): warning:  #47-D: incompatible redefinition of macro "Mode_dow"  (declared at line 81)
-  #define  Mode_dow          0X0E  
-..\app\src\RF433.h(99): warning:  #47-D: incompatible redefinition of macro "Brightness_H"  (declared at line 83)
-  #define  Brightness_H      0x08  
-..\app\src\RF433.h(101): warning:  #47-D: incompatible redefinition of macro "Brightness_L"  (declared at line 85)
-  #define  Brightness_L      0x0D
-..\app\src\key.h(148): warning:  #1-D: last line of file ends without a newline
-  #endif /* __KEY_H__ */
-..\app\src\switch_s.h(32): warning:  #1-D: last line of file ends without a newline
-  #endif
-..\app\src\Rf433.c(467): warning:  #223-D: function "set_TaskComps_timer" declared implicitly
-  							 set_TaskComps_timer(6,1000);
-..\app\src\Rf433.c(489): warning:  #223-D: function "set_TaskComps_timer" declared implicitly
-  					set_TaskComps_timer(6,1000);
-..\app\src\Rf433.c(29): warning:  #177-D: variable "POWER_flag"  was declared but never referenced
-  static uint8_t POWER_flag;
-..\app\src\Rf433.c(85): warning:  #177-D: variable "ssse"  was declared but never referenced
-  static uint8_t ssse=0;
-..\app\src\Rf433.c: 14 warnings, 0 errors
 compiling fmc_spi.c...
 ..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver\xc_drv_fmc_spi.h(230): warning:  #47-D: incompatible redefinition of macro "CUR_PAGE_NUM"  (declared at line 115 of "..\..\..\..\..\component\ble\modules\flash\xc6xxx_fmc_spi.h")
   #define CUR_PAGE_NUM(addr)             (addr / FLASH_PAGE_SIZE)
@@ -338,6 +308,36 @@ compiling fmc_spi.c...
   			xc_fmc_spi_flash_read_page(0x1E000,&r_data, 
 LASH_PAGE_SIZE);
 ..\app\src\fmc_spi.c: 12 warnings, 0 errors
+compiling Rf433.c...
+..\app\src\RF433.h(83): warning:  #47-D: incompatible redefinition of macro "Brightness_H"  (declared at line 64)
+  #define  Brightness_H               0xF4  
+..\app\src\RF433.h(85): warning:  #47-D: incompatible redefinition of macro "Brightness_L"  (declared at line 62)
+  #define  Brightness_L               0xF5  
+..\app\src\RF433.h(91): warning:  #47-D: incompatible redefinition of macro "ON"  (declared at line 75)
+  #define  ON  				       0X02 //寮€鍏?
+..\app\src\RF433.h(93): warning:  #47-D: incompatible redefinition of macro "OFF"  (declared at line 77)
+  #define  OFF      				 0X04  //涓冨僵
+..\app\src\RF433.h(95): warning:  #47-D: incompatible redefinition of macro "Mode_add"  (declared at line 79)
+  #define  Mode_add          0X06  //
+..\app\src\RF433.h(97): warning:  #47-D: incompatible redefinition of macro "Mode_dow"  (declared at line 81)
+  #define  Mode_dow          0X0E  
+..\app\src\RF433.h(99): warning:  #47-D: incompatible redefinition of macro "Brightness_H"  (declared at line 83)
+  #define  Brightness_H      0x08  
+..\app\src\RF433.h(101): warning:  #47-D: incompatible redefinition of macro "Brightness_L"  (declared at line 85)
+  #define  Brightness_L      0x0D
+..\app\src\key.h(148): warning:  #1-D: last line of file ends without a newline
+  #endif /* __KEY_H__ */
+..\app\src\switch_s.h(33): warning:  #1-D: last line of file ends without a newline
+  #endif
+..\app\src\Rf433.c(496): warning:  #223-D: function "set_TaskComps_timer" declared implicitly
+  							 set_TaskComps_timer(6,1000);
+..\app\src\Rf433.c(518): warning:  #223-D: function "set_TaskComps_timer" declared implicitly
+  					set_TaskComps_timer(6,1000);
+..\app\src\Rf433.c(29): warning:  #177-D: variable "POWER_flag"  was declared but never referenced
+  static uint8_t POWER_flag;
+..\app\src\Rf433.c(85): warning:  #177-D: variable "ssse"  was declared but never referenced
+  static uint8_t ssse=0;
+..\app\src\Rf433.c: 14 warnings, 0 errors
 compiling rgblight.c...
 compiling key.c...
 ..\app\src\key.h(148): warning:  #1-D: last line of file ends without a newline
@@ -346,7 +346,7 @@ compiling key.c...
   }
 ..\app\src\key.c: 2 warnings, 0 errors
 compiling switch_s.c...
-..\app\src\switch_s.h(32): warning:  #1-D: last line of file ends without a newline
+..\app\src\switch_s.h(33): warning:  #1-D: last line of file ends without a newline
   #endif
 ..\app\src\RF433.h(83): warning:  #47-D: incompatible redefinition of macro "Brightness_H"  (declared at line 64)
   #define  Brightness_H               0xF4  
@@ -364,7 +364,11 @@ compiling switch_s.c...
   #define  Brightness_H      0x08  
 ..\app\src\RF433.h(101): warning:  #47-D: incompatible redefinition of macro "Brightness_L"  (declared at line 85)
   #define  Brightness_L      0x0D
-..\app\src\switch_s.c: 9 warnings, 0 errors
+..\app\src\switch_s.c(186): warning:  #223-D: function "set_TaskComps_timer" declared implicitly
+  			set_TaskComps_timer(6,1000);
+..\app\src\switch_s.c(223): warning:  #223-D: function "set_TaskComps_timer" declared implicitly
+  			set_TaskComps_timer(6,1000);
+..\app\src\switch_s.c: 11 warnings, 0 errors
 compiling Mode.c...
 ..\app\src\RF433.h(83): warning:  #47-D: incompatible redefinition of macro "Brightness_H"  (declared at line 64)
   #define  Brightness_H               0xF4  
@@ -386,18 +390,18 @@ compiling Mode.c...
 linking...
 .\Objects\Xinc_ble_sdk.axf: Warning: L6304W: Duplicate input file .\objects\xc_drv_fmc_spi_1.o ignored.
 .\Objects\Xinc_ble_sdk.axf: Warning: L6304W: Duplicate input file .\objects\xc_drv_spi_1.o ignored.
-Program Size: Code=24308 RO-data=1396 RW-data=2560 ZI-data=3700  
+Program Size: Code=24424 RO-data=1396 RW-data=2560 ZI-data=3700  
 Finished: 0 information, 2 warning and 0 error messages.
 FromELF: creating hex file...
 After Build - User command #1: fromelf --bin --output=app.bin .\Objects\Xinc_ble_sdk.axf
 After Build - User command #2: .\output_tool\ge_ota_scan.bat
-Size of file: 25860 bytes.
+Size of file: 25976 bytes.
-all_size=25860
+all_size=25976
 dual_xip
 Addr:13000
-            Size:0x6504
+            Size:0x6578
             BAddr:0x40000
-            Acheck:0x27f13ba0
+            Acheck:0xe535e0a0
             SoftVer:0x10
             RomVer:0x20
             LoadAddr:0x11013000
@@ -426,7 +430,7 @@ updata file success !
 已复制         1 个文件。
 系统找不到指定的路径。
 已复制         0 个文件。
-".\Objects\Xinc_ble_sdk.axf" - 0 Error(s), 142 Warning(s).
+".\Objects\Xinc_ble_sdk.axf" - 0 Error(s), 144 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -440,7 +444,7 @@ Package Vendor: ARM
   D:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.1\Device\ARM\ARMCM0\Include
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:13
+Build Time Elapsed:  00:00:15
 </pre>
 </body>
 </html>

project/example/ble/ble_peripheral/mdk/fb.txt

@@ -1,4 +1,4 @@
-;#<FEEDBACK># ARM Linker, 5060528: Last Updated: Sat Jun 06 16:36:01 2026
+;#<FEEDBACK># ARM Linker, 5060528: Last Updated: Sat Jun 13 11:04:47 2026
 ;VERSION 0.2
 ;FILE aes.o
 __asm___5_aes_c____REV16 <= USED 0