更新版本V1.0.4 修改短路保护电压，修改不带mic遥控器为灰底白色的

YC11xx_SmartLight/Librarier/sc_user/u_global.h

@@ -14,8 +14,8 @@
 //typedef unsigned char u8;
 //typedef unsigned short u16;
 //#define u32 (unsigned int);
-#define firmware_version "YC1166_V1.0.3"						//	미숭경굶뵀
-#define firmware_is_mic		0													//角뤠連넣mic
+#define firmware_version "YC1166_V1.0.4"						//	미숭경굶뵀
+#define firmware_is_mic		1													//角뤠連넣mic
 
 // Firmware Revision
 #define U_DIS_FW_REV_STR      	    ("0220")

YC11xx_SmartLight/Librarier/sc_user/u_light_ctrl.c

@@ -396,7 +396,8 @@ void ir_decode(const uint8_t *ir_code)
 	
 	if(g_light_para.mic == 0)
 	{	
-		if (ir_code[0] == RC_USER_CODE_0 && ir_code[1] == RC_USER_CODE_1 )
+//		if (ir_code[0] == RC_USER_CODE_0 && ir_code[1] == RC_USER_CODE_1 ) //支持24键 蓝色底色遥控器
+		if (ir_code[0] == RC_USER_CODE_0 && ir_code[1] == RC_USER_CODE_2 )//支持24键 灰色底色遥控器
 		{
 			if (ir_code[2] == (~ir_code[3] & 0xff))
 			{

YC11xx_SmartLight/Librarier/sc_user/u_light_ctrl.h

@@ -3,42 +3,74 @@
 #include "u_global.h"
 #include "u_main.h"
 
-enum _rc_code
+//enum _rc_code//原来不带麦蓝面贴用的 24 个按键
+//{
+//	RC_CODE_UP			  	= 0x90,
+//	RC_CODE_DOWN		  	= 0xB8,
+//	RC_CODE_OFF			  	= 0xF8,
+//	RC_CODE_ON			  	= 0xB0,
+//	
+//	RC_CODE_W			    	= 0xA8,
+//	RC_CODE_FLASH		  	= 0xB2,
+//	RC_CODE_STROBE			= 0x00,
+//	RC_CODE_FADE		  	= 0x58,
+//	RC_CODE_SMOOTH			= 0x30,
+//	
+//	RC_CODE_COLOR_R			= 0x98,	
+//	RC_CODE_COLOR_G			= 0xD8,			
+//	RC_CODE_COLOR_B			= 0x88,		
+//				
+//	RC_CODE_COLOR_1			= 0xE8,			
+//	RC_CODE_COLOR_2			= 0x48,		
+//	RC_CODE_COLOR_3			= 0x68,
+//	
+//	RC_CODE_COLOR_4			= 0x02,		
+//	RC_CODE_COLOR_5			= 0x32,			
+//	RC_CODE_COLOR_6			= 0x20,
+//	
+//	RC_CODE_COLOR_7			= 0x50,			
+//	RC_CODE_COLOR_8			= 0x78,			
+//	RC_CODE_COLOR_9			= 0x70,
+//	
+//	RC_CODE_COLOR_10		= 0x38,		
+//	RC_CODE_COLOR_11		= 0x28,		
+//	RC_CODE_COLOR_12		= 0xF0,
+//};
+
+enum _rc_code// 
 {
-	RC_CODE_UP			  	= 0x90,
-	RC_CODE_DOWN		  	= 0xB8,
-	RC_CODE_OFF			  	= 0xF8,
-	RC_CODE_ON			  	= 0xB0,
+	RC_CODE_UP			  	= 0x00,
+	RC_CODE_DOWN		  	= 0x80,
+	RC_CODE_OFF			  	= 0x40,
+	RC_CODE_ON			  	= 0xC0,
 	
-	RC_CODE_W			    = 0xA8,
-	RC_CODE_FLASH		  	= 0xB2,
-	RC_CODE_STROBE			= 0x00,
-	RC_CODE_FADE		  	= 0x58,
-	RC_CODE_SMOOTH			= 0x30,
+	RC_CODE_W			    	= 0xE0,
+	RC_CODE_FLASH		  	= 0xD0,
+	RC_CODE_STROBE			= 0xF0,
+	RC_CODE_FADE		  	= 0xC8,
+	RC_CODE_SMOOTH			= 0xE8,
 	
-	RC_CODE_COLOR_R			= 0x98,	
-	RC_CODE_COLOR_G			= 0xD8,			
-	RC_CODE_COLOR_B			= 0x88,		
+	RC_CODE_COLOR_R			= 0x20,	
+	RC_CODE_COLOR_G			= 0xA0,			
+	RC_CODE_COLOR_B			= 0x60,		
 				
-	RC_CODE_COLOR_1			= 0xE8,			
-	RC_CODE_COLOR_2			= 0x48,		
-	RC_CODE_COLOR_3			= 0x68,
+	RC_CODE_COLOR_1			= 0x10,			//对应的是遥控器12个其他颜色值
+	RC_CODE_COLOR_2			= 0x90,		
+	RC_CODE_COLOR_3			= 0x50,
 	
-	RC_CODE_COLOR_4			= 0x02,		
-	RC_CODE_COLOR_5			= 0x32,			
-	RC_CODE_COLOR_6			= 0x20,
+	RC_CODE_COLOR_4			= 0x30,		
+	RC_CODE_COLOR_5			= 0xB0,			
+	RC_CODE_COLOR_6			= 0x70,
 	
-	RC_CODE_COLOR_7			= 0x50,			
-	RC_CODE_COLOR_8			= 0x78,			
-	RC_CODE_COLOR_9			= 0x70,
+	RC_CODE_COLOR_7			= 0x08,			
+	RC_CODE_COLOR_8			= 0x88,			
+	RC_CODE_COLOR_9			= 0x48,
 	
-	RC_CODE_COLOR_10		= 0x38,		
-	RC_CODE_COLOR_11		= 0x28,		
-	RC_CODE_COLOR_12		= 0xF0,
+	RC_CODE_COLOR_10		= 0x28,		
+	RC_CODE_COLOR_11		= 0xA8,		
+	RC_CODE_COLOR_12		= 0x68,
 };
-
-
-enum _rc_code_20
+enum _rc_code_20 
 {
 	RC_CODE_UP_20				  = 0x00,
 	RC_CODE_DOWN_20			      = 0x80,

YC11xx_SmartLight/Librarier/sc_user/u_power.c

@@ -8,7 +8,8 @@
 #define POWER_DET_CHN		(0x02)
 #define POWER_DET_PORT		(0x32)
 //#define POWER_ADC_ERR_PVT	(11000) // 短路时的电压对应值 低于10.5V  这里单位为mV
-#define POWER_ADC_ERR_PVT	(9700) 
+//#define POWER_ADC_ERR_PVT	(9700) 	//试产阶段的阈值电压
+#define POWER_ADC_ERR_PVT	(10300)				//	最后批量版本使用的阈值电压
 
 #define ADC_CHECK         (1)
 
@@ -20,7 +21,7 @@ static void power_check_cb(void)
   uint32_t adc_val=0;
 	
 	adc_temp_mean += ADC_GetVoltage(ADC_CHANNEL_5); //读取adc数据
-	//U_UART_PRINTF("ad=%d\n", adc_temp_mean);
+	//U_UART_PRINTF("ad=%d\n", adc_temp_mean); 
 	++det_cnt;
 	if (det_cnt >= 3)
 	{

YC11xx_SmartLight/ModuleDemo/SmartLight_Prj/Prj/MDK/Objects/output/版本更新记录.txt

@@ -13,4 +13,10 @@ V1.0.3更新说明：
 2021/10/15
 ==========
 1.增加app读取固件版本号，设备运行时间功能
-2.修改固件mac地址为原来官方代码的值
+2.修改固件mac地址为原来官方代码的值
+
+V1.0.4更新说明：
+2021/10/20
+==========
+1.修改不带mic版本为灰色底色的遥控器
+2.修改了短路保护阈值为10.3V

YC11xx_SmartLight/ModuleDemo/SmartLight_Prj/User/main.c

@@ -239,7 +239,7 @@ tIPCHandleCb gTIPCHandleCb[IPC_TYPE_NUM]=
 void Bt_Reset()
 {
 	uint8_t advD[22] = {0x02,0x01,0x06,0x05,0x03,0x12,0x18,0x0f,0x18,0x03,0x19,0x80,0x01,0x08,0x09,0x31,0x31,0x58,0x58,0x42,0x4c,0x45};
-//	uint8_t addr[6]  = {0xF1,0x02,0x88,0x11,0x43,0XF1};
+	//uint8_t addr[6]  = {0xF3,0xF2,0xF1,0xF0,0x06,0x06};
 	uint8_t addr[6]  = {0xac,0x02,0x88,0x11,0x43,0Xac};//官方代码mac地址
 	uint8_t name[] = {"Smart Light"};//Light Life
 	Bt_Renew_Le_AdvData(advD,22);