Index: updata_app/Boot/prj/MDK/YC3121_Keil.uvoptx =================================================================== --- /YC3121_demo/ModuleDemo/updata_app/Boot/prj/MDK/YC3121_Keil.uvoptx (nonexistent) +++ /YC3121_demo/ModuleDemo/updata_app/Boot/prj/MDK/YC3121_Keil.uvoptx (working copy) @@ -0,0 +1,572 @@ + + + + 1.0 + +
### uVision Project, (C) Keil Software
+ + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + YC3121 + 0x4 + ARM-ADS + + 12000000 + + 0 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + .\Listings\ + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 7 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + + + + + + + + + + + BIN\UL2CM3.DLL + + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000) + + + + + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + + + core + 0 + 0 + 0 + 0 + + 1 + 1 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\core\misc.c + misc.c + 0 + 0 + + + 1 + 2 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\core\system.c + system.c + 0 + 0 + + + 1 + 3 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\core\bt_code.c + bt_code.c + 0 + 0 + + + + + main + 1 + 0 + 0 + 0 + + 2 + 4 + 1 + 1 + 0 + 0 + ..\..\user\main.c + main.c + 0 + 0 + + + 2 + 5 + 1 + 0 + 0 + 0 + ..\..\user\ota_ble.c + ota_ble.c + 0 + 0 + + + 2 + 6 + 1 + 0 + 0 + 0 + ..\..\user\halUSB.c + halUSB.c + 0 + 0 + + + 2 + 7 + 1 + 0 + 0 + 0 + ..\..\user\otausb.c + otausb.c + 0 + 0 + + + + + sdk + 1 + 0 + 0 + 0 + + 3 + 8 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_gpio.c + yc_gpio.c + 0 + 0 + + + 3 + 9 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_uart.c + yc_uart.c + 0 + 0 + + + 3 + 10 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_systick.c + yc_systick.c + 0 + 0 + + + 3 + 11 + 4 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_encflash_bulk.lib + yc_encflash_bulk.lib + 0 + 0 + + + 3 + 12 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_timer.c + yc_timer.c + 0 + 0 + + + 3 + 13 + 4 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_qspi.lib + yc_qspi.lib + 0 + 0 + + + 3 + 14 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_bt.c + yc_bt.c + 0 + 0 + + + 3 + 15 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_otp.c + yc_otp.c + 0 + 0 + + + 3 + 16 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_ipc.c + yc_ipc.c + 0 + 0 + + + 3 + 17 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_lpm.c + yc_lpm.c + 0 + 0 + + + 3 + 18 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_sysctrl.c + yc_sysctrl.c + 0 + 0 + + + + + startup + 1 + 0 + 0 + 0 + + 4 + 19 + 2 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\startup\startup.s + startup.s + 0 + 0 + + + 4 + 20 + 2 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\startup\boot_flash_start.s + boot_flash_start.s + 0 + 0 + + + + + USB + 0 + 0 + 0 + 0 + + 5 + 21 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\libraries\harward_Der\usb_core.c + usb_core.c + 0 + 0 + + + 5 + 22 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\libraries\harward_Der\Usb_dcd.c + Usb_dcd.c + 0 + 0 + + + 5 + 23 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\libraries\harward_Der\Usb_dcd_init.c + Usb_dcd_init.c + 0 + 0 + + + 5 + 24 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\libraries\SCPU_USB_Device_Library\core\usbd_core.c + usbd_core.c + 0 + 0 + + + 5 + 25 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\libraries\SCPU_USB_Device_Library\core\usbd_ioreq.c + usbd_ioreq.c + 0 + 0 + + + 5 + 26 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\libraries\SCPU_USB_Device_Library\core\usbd_req.c + usbd_req.c + 0 + 0 + + + 5 + 27 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\scpu_usb_hid_Device_Demo\usb_main.c + usb_main.c + 0 + 0 + + + 5 + 28 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\scpu_usb_hid_Device_Demo\usbd_desc.c + usbd_desc.c + 0 + 0 + + + 5 + 29 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\scpu_usb_hid_Device_Demo\usbd_usr.c + usbd_usr.c + 0 + 0 + + + 5 + 30 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_usb\libraries\SCPU_USB_Device_Library\class\HID\usbd_hid_core.c + usbd_hid_core.c + 0 + 0 + + + + Index: updata_app/Boot/user/halUSB.c =================================================================== --- /YC3121_demo/ModuleDemo/updata_app/Boot/user/halUSB.c (revision 889) +++ /YC3121_demo/ModuleDemo/updata_app/Boot/user/halUSB.c (working copy) @@ -24,9 +24,13 @@ void halUsbDeinit(void) { - disable_clock(CLKCLS_USB); - disable_intr(INTR_USB); - + delay_ms(100); + USB_OTG_WRITE_REG8(CORE_USB_CLEAR,0x40); + USB_OTG_WRITE_REG8(USB_SOFCNT,0); + USB_OTG_WRITE_REG8(CORE_USB_CONFIG,0x00); + disable_intr(INTR_USB); + disable_clock(CLKCLS_USB); + delay_ms(100); } Index: updata_app/Boot/user/main.c =================================================================== --- /YC3121_demo/ModuleDemo/updata_app/Boot/user/main.c (revision 889) +++ /YC3121_demo/ModuleDemo/updata_app/Boot/user/main.c (working copy) @@ -37,6 +37,9 @@ #include "otausb.h" #include "board_config.h" +#define OTA_FLAG_ADDR (0x1000000+((512-8)*1024)) + + /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ @@ -46,7 +49,7 @@ void UART_Configuration(void); extern void start_app(void); -uint8_t rx_buffer_boot[32] = {0}; +uint32_t ota_flag; extern _Bool bBacktoAppFlag; uint32_t APPWRITEADDR = 0x1020000; @@ -59,11 +62,11 @@ { UART_Configuration(); MyPrintf("YC3121 OTA BOOT Demo\n"); - enc_read_flash(0x1000120, rx_buffer_boot, 32); + qspi_flash_read(OTA_FLAG_ADDR, (uint8_t*)&ota_flag, sizeof(ota_flag)); delay_ms(20); - if ((rx_buffer_boot[0] == 0xAA) && (rx_buffer_boot[1] == 0x55) && (rx_buffer_boot[2] == 0xAA) && (rx_buffer_boot[3] == 0x55)) + if (ota_flag==0x55aa55aa) { - /*USB OTA 0xAA55AA55*/ + /*USB OTA 0x55aa55aa*/ IpcInit(); enc_write_flash_bulk_init(); @@ -77,12 +80,18 @@ while (1) { Cmd_check(); - BackToApp(bBacktoAppFlag); + if(bBacktoAppFlag) + { + halUsbDeinit(); + qspi_flash_sectorerase(OTA_FLAG_ADDR); + MyPrintf("Run App\n\n"); + start_app(); + } } } - else if ((rx_buffer_boot[0] == 0xA5) && (rx_buffer_boot[1] == 0x5A) && (rx_buffer_boot[2] == 0xA5) && (rx_buffer_boot[3] == 0x5A)) + else if (ota_flag==0x5aa55aa5) { - /*BT OTA 0xA55AA55A*/ + /*BT OTA 0x5aa55aa5*/ enc_write_flash_bulk_init(); enc_earse_flash_app_area(APPWRITEADDR, 320 * 1024); MyPrintf("BT OTA Demo !\n\n"); @@ -94,9 +103,9 @@ if (BleOtaUpdateStatus()) { disable_intr(INTR_BT); - MyPrintf("Run App\n"); delay_ms(10); - enc_erase_flash_32byte(0x1000120); + qspi_flash_sectorerase(OTA_FLAG_ADDR); + MyPrintf("Run App\n\n"); start_app(); } Index: updata_app/Boot/user/otausb.h =================================================================== --- /YC3121_demo/ModuleDemo/updata_app/Boot/user/otausb.h (revision 889) +++ /YC3121_demo/ModuleDemo/updata_app/Boot/user/otausb.h (working copy) @@ -6,6 +6,5 @@ void Cmd_check(void); -void BackToApp(unsigned char status); #endif \ No newline at end of file Index: updata_app/Boot/user/otausb.c =================================================================== --- /YC3121_demo/ModuleDemo/updata_app/Boot/user/otausb.c (revision 889) +++ /YC3121_demo/ModuleDemo/updata_app/Boot/user/otausb.c (working copy) @@ -143,14 +143,3 @@ } } } - -void BackToApp(unsigned char status) -{ - if (status) - { - delay_ms(10); - MyPrintf("BackToApp\n\n"); - enc_erase_flash_32byte(0x1000120); - start_app(); - } -} \ No newline at end of file Index: updata_app/app/user/main.c =================================================================== --- /YC3121_demo/ModuleDemo/updata_app/app/user/main.c (revision 889) +++ /YC3121_demo/ModuleDemo/updata_app/app/user/main.c (working copy) @@ -45,8 +45,8 @@ * @param None * @retval None */ - -uint8_t tx_buffer_boot[32] = {0}; +#define OTA_FLAG_ADDR (0x1000000+((512-8)*1024)) +uint32_t ota_flag; int main(void) { @@ -68,32 +68,17 @@ if(uartretval == 'U') { MyPrintf("This is USB OTA Update Init\n"); - enc_erase_flash_32byte(0x1000120); - tx_buffer_boot[0] = 0xAA; - tx_buffer_boot[1] = 0x55; - tx_buffer_boot[2] = 0xAA; - tx_buffer_boot[3] = 0x55; - - for (int i = 4; i < 32; i++) - { - tx_buffer_boot[i] = 0xFF; - } - enc_write_flash(0x1000120, tx_buffer_boot, 32); + qspi_flash_sectorerase(OTA_FLAG_ADDR); + ota_flag=0x55aa55aa; + qspi_flash_write(OTA_FLAG_ADDR, (uint8_t*)&ota_flag, sizeof(ota_flag)); soft_reset(); } else if(uartretval == 'B') { MyPrintf("This is BLE OTA Update Init\n"); - enc_erase_flash_32byte(0x1000120); - tx_buffer_boot[0] = 0xA5; - tx_buffer_boot[1] = 0x5A; - tx_buffer_boot[2] = 0xA5; - tx_buffer_boot[3] = 0x5A; - for (int i = 4; i < 32; i++) - { - tx_buffer_boot[i] = 0xFF; - } - enc_write_flash(0x1000120, tx_buffer_boot, 32); + qspi_flash_sectorerase(OTA_FLAG_ADDR); + ota_flag=0x5aa55aa5; + qspi_flash_write(OTA_FLAG_ADDR, (uint8_t*)&ota_flag, sizeof(ota_flag)); soft_reset(); } }