移植完功能测试版本

YC11xxSDK_v3565_20210412/Librarier/sc_user/u_app_handler.c

@@ -7,6 +7,8 @@
 #include "u_effect_color.h"
 #include "u_effect_rhythm.h"
 #include "user_driver.h"
+#include "LH_TaskManager.h"
+
 
 uint32_t 	m_clr_play_buff[APP_MODE_CLR_MAX_NUM] 		= {0x00};
 
@@ -184,7 +186,7 @@ void light_mode_set(uint8_t *app_mode)
 			light_mode_blink_cfg(&g_light_info, &base_clr[clr_ind], 1, 5, g_light_para.speed, g_light_para.bright);
 
 		}
-			break;
+		break;
 		case LIGHT_APP_MODE_RHYTHM_APP:
 		case LIGHT_APP_MODE_RHYTHM_MUSIC:
 		{
@@ -229,8 +231,10 @@ void reply_app_encode(uint8_t cmd, uint8_t *data, uint8_t len)  //
 #endif
 	u_ble_data_send(send, len + 5);
 }
-
-
+int PrintfOut(void)
+{
+  U_UART_PRINTF("\r\nTimer is\r\n");
+}
 //app下发数据的处理函数
 void decode_app_cmd(uint8_t cmd, uint8_t *data, uint8_t len)
 {
@@ -419,7 +423,7 @@ void decode_app_cmd(uint8_t cmd, uint8_t *data, uint8_t len)
 			reply_app_encode(cmd, &reply_state, 1);
 		}
 		break;
-		case 0x35:   //读取闹钟的状态
+		case 0x35:   //读取闹钟的状态 
 		{
 			uint8_t reply_len = 0, alarm_st[24] = {0x00};
 			time_alarm_state_query(alarm_st, &reply_len);
@@ -446,6 +450,12 @@ void decode_app_cmd(uint8_t cmd, uint8_t *data, uint8_t len)
 			light_info_save();
 		break;
 		
+		case 0xFE:
+			
+			U_UART_PRINTF("\r\nTimer_Start\r\n");
+			UserTimerTask_Create(PrintfOut,2000);
+		break;
+		
 	}
 	light_info_save_set();//设置保存标志位
 }

YC11xxSDK_v3565_20210412/Librarier/sc_user/u_effect_rhythm.c

@@ -27,7 +27,7 @@ void rhythm_timer_cd(void)
 	switch (g_light_para.rhythm_mode)
 	{	
 		case RHYTHM_MODE_JUMP_7:
-		case RHYTHM_MODE_JUMP_3:
+		case RHYTHM_MODE_JUMP_3://ÌøԾģʽ
 		{
 			rhythm_pvt = g_light_para.rhythm_sensit + VOT_JUMP_VPT;
 			if (adc_vol > rhythm_pvt)
@@ -48,7 +48,7 @@ void rhythm_timer_cd(void)
 			light_rhythm_mode_jump_timer_cb(&g_normal_rhythm);	
 		}
 			break;
-		case RHYTHM_MODE_GRADUAL_7:
+		case RHYTHM_MODE_GRADUAL_7://½¥±äµÄ
 		{
 			rhythm_pvt = 30;	//g_light_para.rhythm_sensit + 10;
 			if (adc_vol > rhythm_pvt)

YC11xxSDK_v3565_20210412/Librarier/sc_user/u_light_ctrl.c

@@ -528,7 +528,8 @@ static uint32_t flash_offset_addr_set(uint32_t data_size)
 /********************************* flash_save **********************************/
 #include "user_driver.h"
 
-#define BT_LIGHT_FLASH_ADDR		(0x7f000)
+//#define BT_LIGHT_FLASH_ADDR		(0x7f000)
+#define BT_LIGHT_FLASH_ADDR		(0x3f000) //оƬ×îºóÒ»´ÎÉÈÇø
 static uint8_t m_flash_save_flg = 0;
 
 void light_info_save_set(void)

YC11xxSDK_v3565_20210412/Librarier/user/LH_TaskManager.c

@@ -143,7 +143,10 @@ char UserTimerTask_Create(int (*_Fun)(void),int time)
 	 for(i=0;i<TaskNumber;i++)    //  寻找当前函数是否已经创建定时器
 	 {
 		  if(LH_UserTsak[i]._Fun == _Fun)  
-       return 0;  //  已经创建，直接退出
+			{
+					LH_UserTsak[i].Task_Time=time;//重复创建赋值新的定时时间
+					return 0;  //  已经创建，直接退出
+			}
 	 } 
 	 for(i=0;i<TaskNumber;i++)          
 	 {  

YC11xxSDK_v3565_20210412/ModuleDemo/Bluetooth-BLE-TEST/User/main.c

@@ -20,6 +20,8 @@
 #include "user_driver.h"
 #include "u_main.h"
 #include "u_ble.h"
+#define OTA_BLE_WRITE_HANDLE 0x0011
+#define OTA_BLE_NOTIFY_HANDLE 0x000e
 
 #define LED_GPIO	28
 #define adv_len 30
@@ -152,6 +154,10 @@ void Bt_BleCallBack(uint8_t len,uint8_t *dataPtr)
 		case ATT_WRITE_COMMAND:	
 			switch(handle)
 			{
+				case OTA_BLE_WRITE_HANDLE:
+				MyPrintf("RX_OTA\r\n");	
+				MyPrintf("OTA_Val:%s\r\n",dataPtr+3);
+				break;
 				case 0x001c:
 				{
 					/*app通过ble发的数据串口打印出来*/
@@ -206,7 +212,7 @@ void Bt_Reset()
 	uint8_t addr[6]  = {0xAC,0x02,0x88,0x11,0x43,0Xac};
 	uint8_t name[] = {"Light Life"};
 	Bt_Renew_Le_AdvData(advD,22);
- 	Bt_SetLeMac(addr);									//设置蓝牙地址
+ 	Bt_SetLeMac(addr);									//设置蓝牙地址 
 	Bt_Re_LeAdvName(name,sizeof(name));
 	Bt_Re_LeDeivcename(name,sizeof(name));			
 	Lpm_Set_Conn_Interval(0x1a0);
@@ -226,6 +232,10 @@ int user_task2(void)
 {
 	return 50;
 }
+int test1()
+{
+  MyPrintf("\r\ntest1\r\n");
+}
 
 int main(void)
 {
@@ -258,7 +268,8 @@ int main(void)
 	TaskManager_Init();
 	UserTask_Create(1,user_task1,1);
 	UserTask_Create(2,user_task2,1);
-	//WDT_Enable();//开启看门狗
+  UserTimerTask_Create(test1,1000);
+	//WDT_Enable();//开启看门狗 
 	//light_set_color(0xff00);
 	while(1)
 	{