OTA_rev_status_bin_ok

OBJ/obj_debug_efm/LT7689.build_log.htm

@@ -27,8 +27,17 @@ Project File Date:  04/29/2025
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'D:\keil5Mdk\Keil5_MDK\ARM\ARMCC\Bin'
 Build target 'LT7689'
+compiling main.c...
+User\main.c(264): warning:  #550-D: variable "clear_idle_flag"  was set but never used
+  				uint8_t clear_idle_flag;
+User\main.c(66): warning:  #177-D: function "Printf_Version"  was declared but never referenced
+  static void Printf_Version(void)
+User\main.c: 2 warnings, 0 errors
+linking...
+Program Size: Code=16236 RO-data=368 RW-data=264 ZI-data=52608  
+FromELF: creating hex file...
 After Build - User command #1: fromelf.exe --bin -o ./OBJ/bin/MCU_Code.bin  ./OBJ/obj_debug_efm/LT7689.axf
-".\OBJ\obj_debug_efm\LT7689.axf" - 0 Error(s), 0 Warning(s).
+".\OBJ\obj_debug_efm\LT7689.axf" - 0 Error(s), 2 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -41,7 +50,7 @@ Package Vendor: ARM
   D:\keil5Mdk\Keil5_MDK\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM4\Include
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

OBJ/obj_debug_efm/LT7689_LT7689.dep

@@ -1,6 +1,6 @@
 Dependencies for Project 'LT7689', Target 'LT7689': (DO NOT MODIFY !)
 CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
-F (.\User\main.c)(0x68396A7B)(--c99 --gnu -c --cpu Cortex-M4.fp.sp -D__MICROLIB --li -g -O0 --apcs=interwork --split_sections -I .\ccore\common -I .\ccore -I .\Function -I .\Function_drv -I .\Levetoplib -I .\MCU_drv\drv\inc -I .\MCU_drv\drv\src -I .\MCU_drv\lib -I .\QRCODE -I .\User -I .\MCU_drv\drv\src\usb

-ID:\keil5Mdk\Keil5_MDK\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM4\Include

-D__UVISION_VERSION="534" -DARMCM4_FP -DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__CC_ARM

-o .\obj\obj_debug_efm\main.o --omf_browse .\obj\obj_debug_efm\main.crf --depend .\obj\obj_debug_efm\main.d)
+F (.\User\main.c)(0x683EB559)(--c99 --gnu -c --cpu Cortex-M4.fp.sp -D__MICROLIB --li -g -O0 --apcs=interwork --split_sections -I .\ccore\common -I .\ccore -I .\Function -I .\Function_drv -I .\Levetoplib -I .\MCU_drv\drv\inc -I .\MCU_drv\drv\src -I .\MCU_drv\lib -I .\QRCODE -I .\User -I .\MCU_drv\drv\src\usb

-ID:\keil5Mdk\Keil5_MDK\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM4\Include

-D__UVISION_VERSION="534" -DARMCM4_FP -DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__CC_ARM

-o .\obj\obj_debug_efm\main.o --omf_browse .\obj\obj_debug_efm\main.crf --depend .\obj\obj_debug_efm\main.d)
 I (D:\keil5Mdk\Keil5_MDK\ARM\ARMCC\include\stdio.h)(0x5E8E3CC2)
 I (.\ccore\common\sys.h)(0x67B2F52B)
 I (.\ccore\LT7689_C.h)(0x67B2F52B)
@@ -56,7 +56,7 @@ I (.\MCU_drv\drv\inc\wdt_reg.h)(0x67B2F52B)
 I (.\MCU_drv\drv\inc\usb_drv.h)(0x67B2F52B)
 I (.\MCU_drv\drv\inc\usb_reg.h)(0x67B2F52B)
 I (User\UI_H.h)(0x681072CC)
-I (User\OTA_H.h)(0x68395D97)
+I (User\OTA_H.h)(0x683E6AF5)
 I (User\meg.h)(0x681072DA)
 I (User\CRC.h)(0x62FCA25A)
 I (User\cpm_drv.h)(0x5DF1B6F4)
@@ -71,7 +71,7 @@ I (.\MCU_drv\drv\inc\reset_drv.h)(0x67B2F52B)
 I (.\MCU_drv\drv\inc\reset_reg.h)(0x67B2F52B)
 F (.\User\module_select.h)(0x67CFA11F)()
 F (.\User\UI_H.h)(0x681072CC)()
-F (.\User\OTA_H.h)(0x68395D97)()
+F (.\User\OTA_H.h)(0x683E6AF5)()
 F (.\User\meg.h)(0x681072DA)()
 F (.\User\cpm_drv.h)(0x5DF1B6F4)()
 F (.\User\Updata.h)(0x680F2D55)()
@@ -304,8 +304,8 @@ I (User\ffconf.h)(0x63E610EE)
 I (User\SPI_SD.h)(0x681072D7)
 I (User\diskio.h)(0x6367B56C)
 I (User\CRC.h)(0x62FCA25A)
-F (.\User\ota.c)(0x68395D8D)(--c99 --gnu -c --cpu Cortex-M4.fp.sp -D__MICROLIB --li -g -O0 --apcs=interwork --split_sections -I .\ccore\common -I .\ccore -I .\Function -I .\Function_drv -I .\Levetoplib -I .\MCU_drv\drv\inc -I .\MCU_drv\drv\src -I .\MCU_drv\lib -I .\QRCODE -I .\User -I .\MCU_drv\drv\src\usb

-ID:\keil5Mdk\Keil5_MDK\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM4\Include

-D__UVISION_VERSION="534" -DARMCM4_FP -DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__CC_ARM

-o .\obj\obj_debug_efm\ota.o --omf_browse .\obj\obj_debug_efm\ota.crf --depend .\obj\obj_debug_efm\ota.d)
-I (User\OTA_H.h)(0x68395D97)
+F (.\User\ota.c)(0x683E6AC2)(--c99 --gnu -c --cpu Cortex-M4.fp.sp -D__MICROLIB --li -g -O0 --apcs=interwork --split_sections -I .\ccore\common -I .\ccore -I .\Function -I .\Function_drv -I .\Levetoplib -I .\MCU_drv\drv\inc -I .\MCU_drv\drv\src -I .\MCU_drv\lib -I .\QRCODE -I .\User -I .\MCU_drv\drv\src\usb

-ID:\keil5Mdk\Keil5_MDK\Packs\ARM\CMSIS\5.7.0\Device\ARM\ARMCM4\Include

-D__UVISION_VERSION="534" -DARMCM4_FP -DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__CC_ARM

-o .\obj\obj_debug_efm\ota.o --omf_browse .\obj\obj_debug_efm\ota.crf --depend .\obj\obj_debug_efm\ota.d)
+I (User\OTA_H.h)(0x683E6AF5)
 I (.\MCU_drv\drv\inc\eflash_drv.h)(0x67B2F52B)
 I (.\ccore\common\type.h)(0x67B2F52B)
 I (.\ccore\LT7689_C.h)(0x67B2F52B)

User/OTA_H.h

@@ -44,6 +44,7 @@ extern unsigned char send_meg_wifi(unsigned char * send_buf,unsigned char length
 extern unsigned char ota_analysis(unsigned char * rev_wifi_buf,unsigned short len);
 extern unsigned char inf_wifi_ota_start(unsigned char * inf_wifi_buf,unsigned char pkg_seq);
 extern unsigned char inf_wifi_data_check_error(unsigned char * inf_wifi_buf,unsigned char pkg_seq);
+extern unsigned char inf_wifi_finish(unsigned char * inf_wifi_buf ,unsigned char pkg_seq);
 #endif
 
 

User/main.c

@@ -357,7 +357,7 @@ int main(void)
 	Sys_Init();
 	Enable_Interrupts;
 
-	SCI1_Init(g_ips_clk,921600 ,0);	//115200 921600
+	SCI1_Init(g_ips_clk,115200 ,0);	//115200 921600
 //	SCI2_Init(g_ips_clk, 115200,0);	
 	SCI3_Init(g_ips_clk,38400 ,0);
 	/********************升级*******************/
@@ -1132,11 +1132,11 @@ printf(" date = %s,time = %s    \r\n", (char *)__DATE__, (char *)__TIME__);
 		
 
 				
-				for(unsigned char i = 0 ; i < mes_length; i++)
-				{
-						printf(" %x",wifi_buf[i]);
-				}
-				printf("\r\n");
+//				for(unsigned char i = 0 ; i < mes_length; i++)
+//				{
+//						printf(" %x",wifi_buf[i]);
+//				}
+//				printf("\r\n");
 	//实现算法
 		
 		// 收到wifi-ota通知
@@ -1190,18 +1190,34 @@ printf(" date = %s,time = %s    \r\n", (char *)__DATE__, (char *)__TIME__);
 //					updata_seq = wifi_buf[9] || (wifi_buf[8]<<8);
 //					printf("1***%d %d\r\n",updata_seq,ota_seq);
 					printf("***%d %d\r\n",ota_seq,256*wifi_buf[8]+wifi_buf[9]);
-					if(ota_seq==(256*wifi_buf[8]+wifi_buf[9]))
+					if(ota_seq==(256*wifi_buf[8]+wifi_buf[9])) //wifi_buf[10] bin长度
 					{
-							printf("bin:");
-							for(unsigned char i = 0 ; i < wifi_buf[10]; i++)
-							{
-									printf(" %x",wifi_buf[i+11]);
-							}
-							printf("\r\n");
+//							printf("%d bin:",wifi_buf[10]);
+//							for(unsigned char i = 0 ; i < wifi_buf[10]; i++)
+//							{
+//									printf(" %x",wifi_buf[i+11]);
+//							}
+//							printf("\r\n");
+							
 							
-							ota_seq++;
 							
+							//计算升级包信息  1.bin地址 2.bin长度 wifi_buf[10]bin长度 3.写入flash地址
+							
+							unsigned char * ota_buf_address = &wifi_buf[11];
+							unsigned int ota_offset = wifi_buf[10];
+							unsigned int ota_flash_addr = ota_address;
+							printf("len:%d addr:%x\r\n",ota_offset,ota_flash_addr);
+							//写 flash
+							ota_lt7689(ota_buf_address,ota_offset,ota_flash_addr);
+							ota_address +=ota_offset;
+							
+							
+							
+							
+							ota_seq++;
+							printf("---write\r\n");
 				 }
+					//重复 相同序号的升级包
 				 else 
 				 {
 						printf("***repeat!\r\n");
@@ -1249,7 +1265,15 @@ printf(" date = %s,time = %s    \r\n", (char *)__DATE__, (char *)__TIME__);
 			
 	// mcu inform wifi 
 			
+			//封装 固件升级成功消息
+			send_length =inf_wifi_finish( inf_wifi_buf , pkg_seq);
+			inf_wifi_buf_length = 0;
+			//发送消息给wifi
+			send_meg_wifi(inf_wifi_buf,send_length);
 			
+			// 跳转APP
+				printf("turn to APP!\r\n");
+				APP(APP_ADDR);
 			
 		}
 		//wifi 请求失败

User/ota.c

@@ -432,7 +432,7 @@ void SCI3_IRQHandler(void)
 								wifi_buf[mes_length++] = ch;
 //								printf("%d %d\r\n",mes_length,datalength + 6);
 							
-							 if(mes_length == datalength + 6) //
+							 if(mes_length >= datalength + 6) // ==修改
 								 rev_status = 9;
 //								printf("datalength=%d\r\n",datalength);
 					}
@@ -567,7 +567,7 @@ unsigned char ota_analysis(unsigned char * rev_wifi_buf,unsigned short len)
 	return 0;
 }
 
-// 通知WIFI 数据包校验错误
+// mcu通知WIFI 数据包校验错误
 unsigned char inf_wifi_data_check_error(unsigned char * inf_wifi_buf,unsigned char pkg_seq)
 {
 		//封装协议
@@ -591,7 +591,7 @@ unsigned char inf_wifi_data_check_error(unsigned char * inf_wifi_buf,unsigned ch
 }
 
 
-//通知WiFi固件校验错误 
+//mcu通知WiFi固件校验错误 
 unsigned char inf_wifi_bin_check_error(unsigned char * inf_wifi_buf,unsigned char pkg_seq)
 {
 		//封装协议
@@ -617,7 +617,7 @@ unsigned char inf_wifi_bin_check_error(unsigned char * inf_wifi_buf,unsigned cha
 	
 
 }
-//通知WIFI OTA 完成
+//mcu通知WIFI OTA 完成
 unsigned char inf_wifi_ota_suc(unsigned char * inf_wifi_buf,unsigned char pkg_seq)
 {
 	
@@ -642,7 +642,7 @@ unsigned char inf_wifi_ota_suc(unsigned char * inf_wifi_buf,unsigned char pkg_se
 }
 
 
-//通知 WIFI 开始发送固件内容
+//mcu通知 WIFI 开始发送固件内容
 unsigned char inf_wifi_ota_start(unsigned char * inf_wifi_buf,unsigned char pkg_seq)
 {
 
@@ -724,6 +724,27 @@ unsigned char send_meg_wifi(unsigned char * send_buf,unsigned char length)
 		return 0 ;
 }
 
+//MCU 通知 WIFI 固件升级完成
+
+unsigned char inf_wifi_finish(unsigned char * inf_wifi_buf ,unsigned char pkg_seq)
+{
+		inf_wifi_buf[inf_wifi_buf_length++] = 0xA5;
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x5A;
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x01;
+	//		pkg_seq++;
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x01;
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x21;
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x02;
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x02;
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x01;
+	
+		inf_wifi_buf[inf_wifi_buf_length++] = 0x27;
+	
+	
+	return inf_wifi_buf_length;
+}
+
+
 
 
 #endif