From 842bb64195f958b050867c50db66fc0aa413dafb Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期六, 27 七月 2024 10:42:56 +0800
Subject: [PATCH] KBus upgrade
---
C8T6_BootLoader/Src/main.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 199 insertions(+), 8 deletions(-)
diff --git a/C8T6_BootLoader/Src/main.c b/C8T6_BootLoader/Src/main.c
index 62177ee..d874889 100644
--- a/C8T6_BootLoader/Src/main.c
+++ b/C8T6_BootLoader/Src/main.c
@@ -46,6 +46,7 @@
#include "Functions.h"
#include "string.h"
#include "BSP.h"
+#include "stm32f0xx_ll_flash.h"
/* USER CODE END Includes */
@@ -57,6 +58,57 @@
unsigned char SlowFlicker=0;
unsigned char FastFlicker=0;
+
+typedef struct tagInfoBlockHdr {
+ unsigned short nBlkSign; // 寮�濮嬫爣蹇�
+ unsigned short nBlkTypeVer; // 绫诲瀷鍜岀増鏈�
+ unsigned short nBlkSize; // Block 澶у皬, 鍖呮嫭寮�濮嬪拰缁撴潫鏍囧織
+ unsigned short Pad1;
+}stInfoBlockHdr;
+
+typedef struct tagInfoBlockTail {
+
+ unsigned short CRC16;
+ unsigned short EndSign;
+}stInfoBlockTail;
+
+typedef struct tagBtLdrInfoBlock {
+ stInfoBlockHdr Hdr;
+ unsigned short nBtldrVer;
+ unsigned short nBtldrDevice;
+ unsigned short nBtldrSize; // 璁捐澶у皬
+ unsigned short nBtldrDataSize; //浠ｇ爜澶у皬
+ unsigned int nBtldr_AppAddr;
+ unsigned int nBtldr_NewAppInfoAddr;
+ unsigned int nBtldr_NewAppAddr;
+ stInfoBlockTail tail;
+}stBtLdrInfoBlock;
+// /*
+typedef struct {
+ uint32_t addr_Code_RO_Data_limit;
+
+}addr_data_def;
+// */
+extern int Region$$Table$$Base;
+addr_data_def const * paddr = (addr_data_def *)&Region$$Table$$Base;
+
+const stBtLdrInfoBlock theBtldrInfoBlock __attribute__((at(0x08000100))) = {
+ 0xAA55, // StartSign
+ 0x0101, // BlockType
+ sizeof(stBtLdrInfoBlock), //BlockSize
+ 0, // Pad,
+ 0x0100, //BtLdrVer
+ 0x0100, //BtLdrDevice;
+ 0x1000, //BtLdrSize;
+ 0x0C00, //BtLdrDataSize;
+ 0x08001000, //nBtldr_AppAddr
+ (int)&Region$$Table$$Base, //nBtldr_NewAppInfoAddr
+ 0x08009000, //nBtldr_NewAppAddr
+ 0xEEEE, //crc16;
+ 0xAA55 //EndSign;
+};
+
+// const int END_SIGN __attribute__((at(0x08000FD8))); // = 0x55aa;
uint32_t us1,us2,us3,us4,us5,us6;
@@ -72,6 +124,68 @@
/* USER CODE BEGIN 0 */
+/* Table of CRC values for high-order byte */
+/*
+const uint8_t crctablehi[] = {
+ 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81,
+ 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0,
+ 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01,
+ 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41,
+ 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81,
+ 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0,
+ 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01,
+ 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+ 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81,
+ 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0,
+ 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01,
+ 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+ 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81,
+ 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0,
+ 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01,
+ 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+ 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81,
+ 0x40
+};
+*/
+/* Table of CRC values for low-order byte */
+/*
+const uint8_t crctablelo[] = {
+ 0x00, 0xC0, 0xC1, 0x01, 0xC3, 0x03, 0x02, 0xC2, 0xC6, 0x06, 0x07, 0xC7, 0x05, 0xC5, 0xC4,
+ 0x04, 0xCC, 0x0C, 0x0D, 0xCD, 0x0F, 0xCF, 0xCE, 0x0E, 0x0A, 0xCA, 0xCB, 0x0B, 0xC9, 0x09,
+ 0x08, 0xC8, 0xD8, 0x18, 0x19, 0xD9, 0x1B, 0xDB, 0xDA, 0x1A, 0x1E, 0xDE, 0xDF, 0x1F, 0xDD,
+ 0x1D, 0x1C, 0xDC, 0x14, 0xD4, 0xD5, 0x15, 0xD7, 0x17, 0x16, 0xD6, 0xD2, 0x12, 0x13, 0xD3,
+ 0x11, 0xD1, 0xD0, 0x10, 0xF0, 0x30, 0x31, 0xF1, 0x33, 0xF3, 0xF2, 0x32, 0x36, 0xF6, 0xF7,
+ 0x37, 0xF5, 0x35, 0x34, 0xF4, 0x3C, 0xFC, 0xFD, 0x3D, 0xFF, 0x3F, 0x3E, 0xFE, 0xFA, 0x3A,
+ 0x3B, 0xFB, 0x39, 0xF9, 0xF8, 0x38, 0x28, 0xE8, 0xE9, 0x29, 0xEB, 0x2B, 0x2A, 0xEA, 0xEE,
+ 0x2E, 0x2F, 0xEF, 0x2D, 0xED, 0xEC, 0x2C, 0xE4, 0x24, 0x25, 0xE5, 0x27, 0xE7, 0xE6, 0x26,
+ 0x22, 0xE2, 0xE3, 0x23, 0xE1, 0x21, 0x20, 0xE0, 0xA0, 0x60, 0x61, 0xA1, 0x63, 0xA3, 0xA2,
+ 0x62, 0x66, 0xA6, 0xA7, 0x67, 0xA5, 0x65, 0x64, 0xA4, 0x6C, 0xAC, 0xAD, 0x6D, 0xAF, 0x6F,
+ 0x6E, 0xAE, 0xAA, 0x6A, 0x6B, 0xAB, 0x69, 0xA9, 0xA8, 0x68, 0x78, 0xB8, 0xB9, 0x79, 0xBB,
+ 0x7B, 0x7A, 0xBA, 0xBE, 0x7E, 0x7F, 0xBF, 0x7D, 0xBD, 0xBC, 0x7C, 0xB4, 0x74, 0x75, 0xB5,
+ 0x77, 0xB7, 0xB6, 0x76, 0x72, 0xB2, 0xB3, 0x73, 0xB1, 0x71, 0x70, 0xB0, 0x50, 0x90, 0x91,
+ 0x51, 0x93, 0x53, 0x52, 0x92, 0x96, 0x56, 0x57, 0x97, 0x55, 0x95, 0x94, 0x54, 0x9C, 0x5C,
+ 0x5D, 0x9D, 0x5F, 0x9F, 0x9E, 0x5E, 0x5A, 0x9A, 0x9B, 0x5B, 0x99, 0x59, 0x58, 0x98, 0x88,
+ 0x48, 0x49, 0x89, 0x4B, 0x8B, 0x8A, 0x4A, 0x4E, 0x8E, 0x8F, 0x4F, 0x8D, 0x4D, 0x4C, 0x8C,
+ 0x44, 0x84, 0x85, 0x45, 0x87, 0x47, 0x46, 0x86, 0x82, 0x42, 0x43, 0x83, 0x41, 0x81, 0x80,
+ 0x40
+};
+*/
+/*
+uint16_t crc16table(const uint8_t *ptr, uint16_t len)
+{
+ uint8_t crchi = 0xff;
+ uint8_t crclo = 0xff;
+ uint16_t index;
+ while (len--)
+ {
+ index = crclo ^ *ptr++;
+ crclo = crchi ^ crctablehi[index];
+ crchi = crctablelo[index];
+ }
+ return (crchi << 8 | crclo);
+}
+*/
+
void HAL_SYSTICK_Callback(void)
{
static int Count=0;
@@ -85,6 +199,17 @@
}
#define ApplicationAddress 0x08001000 //搴旂敤绋嬪簭棣栧湴鍧�瀹氫箟
+#define NEW_APP_INFOBLOCK_ADDR 0x08008000 // 瀛樺偍鐨勬柊搴旂敤绋嬪簭淇℃伅鍧楃殑鍦板潃
+#define NEW_APP_ADDR 0x08009000 // 瀛樺偍鐨勬柊搴旂敤绋嬪簭鐨勫湴鍧�
+
+typedef struct tagNewAppInfoBlock
+{
+ unsigned short Sign;
+ unsigned short Version;
+ unsigned int Length;
+ unsigned int nCRC;
+
+}stNewAppInfoBlock,*pNewAppInfoBlock;
typedef void (*pFunction)(void); //瀹氫箟璺宠浆鍑芥暟鎸囬拡绫诲瀷
@@ -92,28 +217,60 @@
/*璺宠浆鍒板簲鐢ㄧ▼搴忓鐞嗗嚱鏁�*/
static void JumpToApplication(void)
{
- uint32_t StackAddr; //搴旂敤绋嬪簭鏍堝湴鍧�
- uint32_t ResetVector; //搴旂敤绋嬪簭涓柇鍚戦噺琛ㄧ殑鍦板潃
+ uint32_t AppStackAddr; //搴旂敤绋嬪簭鏍堝湴鍧�
+ uint32_t AppResetVector; //搴旂敤绋嬪簭涓柇鍚戦噺琛ㄧ殑鍦板潃
pFunction JumpToApp; //瀹氫箟璺宠浆鍑芥暟鎸囬拡
__set_PRIMASK(1); //鍏抽棴鍏ㄥ眬涓柇
- StackAddr = *(__IO uint32_t*)ApplicationAddress; //0x08001000;
- ResetVector = *(__IO uint32_t*)(ApplicationAddress + 4); //0x08001004;
+ AppStackAddr = *(__IO uint32_t*)ApplicationAddress; //0x08001000;
+ AppResetVector = *(__IO uint32_t*)(ApplicationAddress + 4); //0x08001004;
- if((StackAddr&0x2FFC0000)==0x20000000) //妫�鏌ユ爤椤跺湴鍧�鏄惁鍚堟硶.
+ if((AppStackAddr&0x2FFC0000)==0x20000000) //妫�鏌ユ爤椤跺湴鍧�鏄惁鍚堟硶.
{
__disable_irq();
memcpy((void *)0x20000000,(void *)ApplicationAddress,0xc0);
- __set_MSP(StackAddr); //鍒濆鍖栧簲鐢ㄧ▼搴忔爤鎸囬拡
+ __set_MSP(AppStackAddr); //鍒濆鍖栧簲鐢ㄧ▼搴忔爤鎸囬拡
LL_APB1_GRP2_EnableClock(LL_APB1_GRP2_PERIPH_SYSCFG);
LL_SYSCFG_SetRemapMemory(LL_SYSCFG_REMAP_SRAM);
// SYSCFG
- JumpToApp = (pFunction)ResetVector;
+ JumpToApp = (pFunction)AppResetVector;
JumpToApp();
}
+}
+
+int EraseFlashMem(void * pAddrFlash, unsigned int Pages)
+{
+ ErrorStatus res;
+ res = LL_Flash_Unlock();
+// uint32_t ErrNo;
+ res = LL_Flash_PageErase(pAddrFlash,Pages);
+ LL_FLASH_Lock(FLASH);
+ return res;
+}
+
+int EraseAndWriteToFlashMem(void * pBuf, void * pAddrFlash, unsigned int nByteSize)
+{
+
+ ErrorStatus res;
+ res = LL_Flash_Unlock();
+// __disable_irq();
+ int NbPages = (nByteSize-1) / FLASH_PAGE_SIZE + 1;
+ res = LL_Flash_PageErase(pAddrFlash,NbPages);
+ for (int i=0;i<(nByteSize+1)/2;i++)
+ {
+ unsigned short value = ((uint8_t *)pBuf)[i*2] + (((uint8_t *)pBuf)[i*2 +1] << 8);
+ res = LL_FLASH_Program(ProgaraType_DATA16, (uint32_t)pAddrFlash + i*2, value);
+ if (res == ERROR) break;
+ }
+
+// __enable_irq();
+ LL_FLASH_Lock(FLASH);
+ if (res == ERROR) return 1;
+
+ return res;
}
/* USER CODE END 0 */
@@ -160,6 +317,40 @@
SetRunLed(1); //Turn On Run Led
SetErrLed(0); //Turn Off Err Led
+// check for app update
+///*
+ int FlashSize = *(unsigned short *)FLASHSIZE_BASE;
+ int NewAppAddress ;
+ int NewAppInfoBlockAddress ;
+ if (FlashSize == 64) {
+ NewAppInfoBlockAddress = 0x08008000;
+ NewAppAddress = 0x08009000U;
+ }else if (FlashSize == 256) {
+ NewAppInfoBlockAddress = 0x08020000;
+ NewAppAddress = 0x08021000U;
+ }
+
+ pNewAppInfoBlock ptheNewAppInfoBlock = (pNewAppInfoBlock) NewAppInfoBlockAddress;
+ if (ptheNewAppInfoBlock->Sign == 0x55AA)
+ {
+ //check length and CRC;
+ int length = ptheNewAppInfoBlock->Length;
+ int nCRC; // = crc16table((uint8_t *)NewAppAddress,length);
+ nCRC = crc16bitbybit((uint8_t *)NewAppAddress,length);
+ if (nCRC == ptheNewAppInfoBlock->nCRC)
+ {
+ // copy program
+ EraseAndWriteToFlashMem((void *)NewAppAddress,(void*)ApplicationAddress,length);
+
+ // verify copyed program
+ //int nCRC2 = CalCRC((void *)NewAppAddress,length);
+
+
+ //erease infoBlock
+ EraseFlashMem((void *)NewAppInfoBlockAddress,1);
+ }
+ }
+// */
int nCount=0;
while (1)
{
@@ -170,7 +361,7 @@
LL_mDelay(100);
// ToggleRunLed();
-// ToggleErrLed();
+ ToggleErrLed();
ToggleErr2Led();
// LL_IWDG_ReloadCounter(IWDG);
--
Gitblit v1.9.1