сделано (проверено на can):

отправка ошибок бутлоадера по uart/can
проверка crc принятой страницы
проверка на бесконечное попадание в hardfault

в целом структура бута все еще в процессе разработки

Core/Bootloader/boot_can.c

@@ -72,57 +72,62 @@ void MX_BOOT_CAN_Init(void)
 // -----------------------------
 void Bootloader_CAN_Receive_Page(Bootloader_t *bl)
 {
-  uint16_t bytes_received = 0;
+    uint16_t bytes_received = 0;
-  uint8_t crc_buf[4];
+    CAN_RxHeaderTypeDef canHeader;
-  CAN_RxHeaderTypeDef canHeader;
+    uint8_t canData[8];
-  uint8_t canData[8];
+    uint32_t start_tick = HAL_GetTick();
-  uint32_t start_tick = HAL_GetTick();
 
-  // Приём данных страницы
+    // Приём страницы прошивки
-  while(bytes_received < PAGE_SIZE)
+    while(bytes_received < PAGE_SIZE)
-  {
-    if(HAL_CAN_GetRxFifoFillLevel(bl->hcan, CAN_RX_FIFO0) > 0)
     {
-      if(HAL_CAN_GetRxMessage(bl->hcan, CAN_RX_FIFO0, &canHeader, canData) == HAL_OK)
+        if(HAL_CAN_GetRxFifoFillLevel(bl->hcan, CAN_RX_FIFO0) > 0)
-      {
+        {
-        uint8_t len = canHeader.DLC;
+            if(HAL_CAN_GetRxMessage(bl->hcan, CAN_RX_FIFO0, &canHeader, canData) == HAL_OK)
-        if(bytes_received + len > PAGE_SIZE)
+            {
-          len = PAGE_SIZE - bytes_received;
+                uint8_t len = canHeader.DLC;
+                if(bytes_received + len > PAGE_SIZE)
+                    len = PAGE_SIZE - bytes_received;
 
-        memcpy(&bl->fw_buffer[bytes_received], canData, len);
+                memcpy(&bl->fw_buffer[bytes_received], canData, len);
-        bytes_received += len;
+                bytes_received += len;
-        start_tick = HAL_GetTick(); // сброс таймера
+                start_tick = HAL_GetTick(); // сброс таймера
-      }
+            }
+        }
+
+        // проверка таймаута
+        if(HAL_GetTick() - start_tick >= FW_RECEIVE_TIMEOUT_MS)
+        {
+            bl->error.bit.timeout_receive = 1;
+            bl->state = BL_STATE_ERROR;
+            return;
+        }
     }
 
-    // проверка таймаута
+    // Приём CRC (4 байта)
-    if(HAL_GetTick() - start_tick >= FW_RECEIVE_TIMEOUT_MS)
+    while(1)
     {
-      bl->state = BL_STATE_ERROR;
+        if(HAL_CAN_GetRxFifoFillLevel(bl->hcan, CAN_RX_FIFO0) > 0)
-      return;
+        {
-    }
+            if(HAL_CAN_GetRxMessage(bl->hcan, CAN_RX_FIFO0, &canHeader, canData) == HAL_OK)
-  }
+            {
+                // CRC в первых 4 байтах пакета
+                bl->fw_crc = (canData[0] << 24) |
+                             (canData[1] << 16) |
+                             (canData[2] << 8) |
+                             canData[3];
+                break;
+            }
+        }
 
-  // Приём CRC (следующий CAN пакет)
+        if(HAL_GetTick() - start_tick >= FW_RECEIVE_TIMEOUT_MS)
-  while(1)
+        {
-  {
+            bl->error.bit.timeout_receive = 1;
-    if(HAL_CAN_GetRxFifoFillLevel(bl->hcan, CAN_RX_FIFO0) > 0)
+            bl->state = BL_STATE_ERROR;
-    {
+            return;
-      if(HAL_CAN_GetRxMessage(bl->hcan, CAN_RX_FIFO0, &canHeader, canData) == HAL_OK)
+        }
-      {
-        // первые 4 байта = CRC
-        bl->fw_crc = (canData[0] << 24) | (canData[1] << 16) | (canData[2] << 8) | canData[3];
-        break;
-      }
     }
 
-    if(HAL_GetTick() - start_tick >= FW_RECEIVE_TIMEOUT_MS)
+    bl->fw_len = PAGE_SIZE;
-    {
+    bl->state = BL_STATE_IDLE;
-      bl->state = BL_STATE_ERROR;
+}
-      return;
-    }
-  }
 
-  bl->fw_len = bytes_received;
-  bl->state = BL_STATE_IDLE;
-}

Core/Bootloader/boot_main.c

@@ -2,7 +2,15 @@
 Bootloader_t boot = {0};
 
 int main()
-{
+{  
+  __disable_irq();
+  SCB->VTOR = 0x08000000;
+  __enable_irq();
+  
+  /* Включаем тактирование PWR и BKP (APB1) и разрешаем доступ к BKP domain */
+  /* Записываем напрямую в регистры RCC/APB1ENR и PWR->CR */
+  RCC->APB1ENR |= (RCC_APB1ENR_PWREN | RCC_APB1ENR_BKPEN);
+  
   boot.state = BL_STATE_INIT;
   while (1)
   {
@@ -22,4 +30,165 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
+}
+
+
+
+void Boot_SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+
+  /* Включаем внутренний генератор HSI */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_OFF; // без PLL
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+      Error_Handler();
+  }
+
+  /* Настройка шин AHB/APB */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                                |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI; // HSI = 8 MHz
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;     // HCLK = 8 MHz
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;      // PCLK1 = 8 MHz
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;      // PCLK2 = 8 MHz
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
+  {
+      Error_Handler();
+  }
+}
+
+
+/******************************************************************************/
+/*           Cortex-M3 Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+   while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+  
+  PWR->CR |= PWR_CR_DBP;
+  BKP->DR1 = 0xDEAD;          // записываем код ошибки
+  BKP->DR2 = BKP->DR2 + 1;  // счётчик ошибок
+  NVIC_SystemReset();
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */  
+  PWR->CR |= PWR_CR_DBP;
+  BKP->DR1 = 0xBEEF;          // записываем код ошибки
+  BKP->DR2 = BKP->DR2 + 1;  // счётчик ошибок
+  NVIC_SystemReset();
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+
+void Error_Handler(void)
+{
+  NVIC_SystemReset();
 }

Core/Bootloader/boot_project_setup.h

@@ -7,26 +7,17 @@
 // KEY defines
 #define BOOTLOADER_KEY_ADR (uint32_t)0x08009800
 #define BOOTLOADER_KEY_PAGE 20
+
 // MAIN APP defines
 #define MAIN_APP_START_ADR (uint32_t)0x0800C000
 #define MAIN_APP_PAGE 21
 #define MAIN_APP_NUM_OF_PAGE 250-MAIN_APP_PAGE
 
-
+// RECEIVE defines
 #define FW_RECEIVE_TIMEOUT_MS 5000  // таймаут приёма страницы
-#define PAGE_SIZE 2048
+#define PAGE_SIZE 2048              // страницы принимаются размером с page_size (размер страниц флеш должен быть кратен PAGE_SIZE)
 
 
-typedef enum {
-  CMD_ERASE = 0x01,       ///< Команда на стирание прошивки
-  CMD_START_RECEIVE,      ///< Команда на старт приема прошивки
-  CMD_WRITE,              ///< Команда на запись блока прошивки
-  CMD_VERIFY,             ///< Команда на проверку прошивки
-  CMD_GOTOAPP,            ///< Команда на переход в приложение
-  CMD_RESET,              ///< Команда на переход в приложение
-  CMD_GO_TO_BOOT,         ///< Команда на переход в приложение
-}BootloaderCommand_t;
-
 
 
 // === RCC defines ===
@@ -49,8 +40,8 @@ typedef enum {
 // === CAN defines ===
 #define CAN_BOOT            CAN1
 #define CAN_MODE            CAN_MODE_NORMAL
-// Presacler = 1: 500 kbps при 8 MHz
+// Presacler = 1 для 500 kbps при 8 MHz
-#define CAN_SPEED_PRESCALER 2           
+#define CAN_SPEED_PRESCALER 4           
 #define CAN_SPEED_BS1       CAN_BS1_13TQ
 #define CAN_SPEED_BS2       CAN_BS2_2TQ
 

Core/Bootloader/boot_uart.c

@@ -63,6 +63,7 @@ void Bootloader_UART_Receive_Page(Bootloader_t *bl)
       // проверка таймаута
       if(HAL_GetTick() - start_tick >= FW_RECEIVE_TIMEOUT_MS)
       {
+        bl->error.bit.timeout_receive = 1;
         bl->state = BL_STATE_ERROR;  // превышен таймаут
         return;
       }
@@ -82,6 +83,7 @@ void Bootloader_UART_Receive_Page(Bootloader_t *bl)
     {
       if(HAL_GetTick() - start_tick >= FW_RECEIVE_TIMEOUT_MS)
       {
+        bl->error.bit.timeout_receive = 1;
         bl->state = BL_STATE_ERROR;
         return;
       }

Core/Bootloader/bootloader.c

@@ -3,37 +3,52 @@
 #include "boot_uart.h"
 #include "boot_can.h"
 
-CAN_TxHeaderTypeDef TxHeader;
+HAL_StatusTypeDef res_hal;
-CAN_RxHeaderTypeDef RxHeader;
+CAN_TxHeaderTypeDef TxHeaderBoot;
-uint32_t TxMailBox = 0; // num of used mail
+CAN_RxHeaderTypeDef RxHeaderBoot;
+uint32_t TxMailBoxBoot = 0;
+uint8_t TXDataBoot[8] = {0};
+int receive_uart_flag = 0;
 
 void SetKey(void);
 uint32_t ReadKey(void);
-void ResetKey(void);
+void EraseKey(void);
 void Boot_SystemClock_Config(void);
 void JumpToApplocation(void);
 
 void Bootloader_UART_Receive_Page(Bootloader_t *bl);
 void Bootloader_CAN_Receive_Page(Bootloader_t *bl);
   
-void Bootloader_Init(void)
+uint32_t CRC32_Compute(const uint8_t* data, uint32_t length);
+
+void Bootloader_Init(Bootloader_t *bl)
 {	
-	HAL_Init();	
+  HAL_Init();	
-	Boot_SystemClock_Config();
+  
+  Boot_SystemClock_Config();
   MX_BOOT_UART_Init();
   MX_BOOT_CAN_Init();
+ 
 }
 
-HAL_StatusTypeDef res_hal;
 
 
+
+
+uint32_t code = 0;
+uint32_t cnt  = 0;
 void Bootloader_Task(Bootloader_t *bl)
 {
+  
   switch (bl->state)
   {
     case BL_STATE_INIT:
+      code = LoadErrorCode();
+      cnt  = LoadErrorCnt();
+
+      bl->prev_state = bl->state;
       // Проверяем ключ, чтобы понять запускать приложение или программирование
-      if (ReadKey() == BL_KEY_APP_WRITTEN)
+      if ((ReadKey() == BL_KEY_APP_WRITTEN) && (cnt <= 5))
       {
         bl->state = BL_STATE_JUMP_TO_APP;
         break; // не инициализируем, а сразу прыгаем в приложение
@@ -44,89 +59,202 @@ void Bootloader_Task(Bootloader_t *bl)
       }
       
       // Инициализация периферии
-      Bootloader_Init();
+      Bootloader_Init(bl);
       bl->huart = &huart_boot;
       bl->hcan  = &hcan_boot;
+      bl->TxHeader.DLC = 8;
+      bl->TxHeader.StdId = 123;
       bl->addr = MAIN_APP_START_ADR;
+  
+      if(cnt > 5)
+      {
+        ClearErrorCode();
+        if(code == 0xDEAD)  // HardFault
+        {
+          ResetKey();
+          bl->error.bit.hardfault_cycle = 1;
+          TXDataBoot[0] = 0xAA; 
+          TXDataBoot[1] = (bl->error.all >> 8) & 0xFF;
+          TXDataBoot[2] = bl->error.all & 0xFF;
+          res_hal = HAL_CAN_AddTxMessage(bl->hcan, &bl->TxHeader, TXDataBoot, &TxMailBoxBoot);
+          res_hal = HAL_UART_Transmit(bl->huart, TXDataBoot, 1, 100);
+        }
+        else if(code == 0xBEEF)  // MemManage
+        {
+          ResetKey();
+          bl->error.bit.memmanage_cycle = 1;
+          TXDataBoot[0] = 0x55;
+          TXDataBoot[1] = (bl->error.all >> 8) & 0xFF;
+          TXDataBoot[2] = bl->error.all & 0xFF;
+          res_hal = HAL_CAN_AddTxMessage(bl->hcan, &bl->TxHeader, TXDataBoot, &TxMailBoxBoot);
+          res_hal = HAL_UART_Transmit(bl->huart, TXDataBoot, 1, 100);
+        }
+      }
+  
       break;
 
     case BL_STATE_IDLE:
-      // Ждем команды по UART или CAN
+      if((bl->state != bl->prev_state) && (bl->prev_state != BL_STATE_ERROR))
-      if(bl->state != bl->prev_state)
       {
-        static uint8_t Data[8] = {0};
+        TXDataBoot[0] = 0x00;
-        static uint32_t TxMail = {0};
+        res_hal = HAL_CAN_AddTxMessage(bl->hcan, &bl->TxHeader, TXDataBoot, &TxMailBoxBoot);
-        Data[0] = 0xFA;
+        res_hal = HAL_UART_Transmit(bl->huart, TXDataBoot, 1, 100);
-        HAL_CAN_AddTxMessage(bl->hcan, &bl->TxHeader, Data, &TxMail);
-        HAL_UART_Transmit()
       }
+      bl->prev_state = bl->state;
+      // Ждем команды по UART или CAN
       if (Receive_FW_Command(bl) == 0xFF)   // функция обработки команд, возвращает 1 если ошибка
       {
+        bl->error.bit.unknown_cmd = 1;
         bl->state = BL_STATE_ERROR;
       }
       break;
-
+      
+    case BL_STATE_RESET:
+      NVIC_SystemReset();
+      break;      
+      
     case BL_STATE_ERASE:
-      ResetKey();
+      bl->prev_state = bl->state;
+      EraseKey();
       if (FLASH_Erase_App() == HAL_OK)  // твоя функция стирания MAIN_APP_PAGE..NUM
       {
         bl->state = BL_STATE_IDLE;
       }
       else
       {
+        bl->error.bit.erase_err = 1;
         bl->state = BL_STATE_ERROR;
       }
       break;
 
     case BL_STATE_RECEIVE_UART:
-      // В этом состоянии мы просто принимаем страницу + CRC
-      Bootloader_UART_Receive_Page(bl);
-      break;
     case BL_STATE_RECEIVE_CAN:
-      Bootloader_CAN_Receive_Page(bl);
+      receive_uart_flag = (bl->state == BL_STATE_RECEIVE_UART) ? 1 : 0;
+    
+      TXDataBoot[0] = 0x00;
+      bl->prev_state = bl->state;
+      if(receive_uart_flag)
+      {
+        res_hal = HAL_UART_Transmit(bl->huart, TXDataBoot, 1, 100);
+        Bootloader_UART_Receive_Page(bl);
+      }
+      else
+      {
+        res_hal = HAL_CAN_AddTxMessage(bl->hcan, &bl->TxHeader, TXDataBoot, &TxMailBoxBoot);
+        Bootloader_CAN_Receive_Page(bl);
+      }
+      uint32_t crc_calculated = CRC32_Compute((uint8_t *)bl->fw_buffer, bl->fw_len);
+      if(crc_calculated != bl->fw_crc)
+      {
+        for(int i = 0; i < bl->fw_len; i++)
+        {
+          bl->fw_buffer[i] = 0;
+        }
+        bl->error.bit.crc_err = 1;
+        bl->state = BL_STATE_ERROR;
+      }
       break;
       
     case BL_STATE_WRITE:
+      bl->prev_state = bl->state;
       if (FLASH_Write_Page(&bl->addr, bl->fw_buffer, bl->fw_len) == HAL_OK)  // запись блока во Flash
       {
         bl->state = BL_STATE_IDLE;  // ждём следующего блока
       }
       else
       {
+        bl->error.bit.write_err = 1;
         bl->state = BL_STATE_ERROR;
       }
       break;
 
     case BL_STATE_VERIFY:
+      bl->prev_state = bl->state;
       if (/*Verify_Flash_CRC(bl->fw_crc)*/0 == HAL_OK)
       {
-        ResetKey();
+        EraseKey();
         SetKey();  // отметка, что прошивка записана
         bl->state = BL_STATE_IDLE;
       }
       else
       {
+        bl->error.bit.verify_err = 1;
         bl->state = BL_STATE_ERROR;
       }
       break;
 
     case BL_STATE_JUMP_TO_APP:
+      bl->prev_state = bl->state;
       JumpToApplocation();
       break;
+    
+    case BL_STATE_JUMP_TO_BOOT:
+      bl->prev_state = bl->state;
+      JumpToBootloader();
+      break;
+
 
     case BL_STATE_ERROR:
-      // обработка ошибок (можно светодиод, повторная инициализация, лог по UART)
+      if(bl->state != bl->prev_state)
-      Error_Handler();
+      {
+        TXDataBoot[0] = 0xFF;
+        TXDataBoot[1] = (bl->error.all >> 8) & (0xFF);
+        TXDataBoot[2] = bl->error.all & (0xFF);
+        res_hal = HAL_CAN_AddTxMessage(bl->hcan, &bl->TxHeader, TXDataBoot, &TxMailBoxBoot);
+        res_hal = HAL_UART_Transmit(bl->huart, TXDataBoot, 1, 100);
+      }
+      bl->prev_state = bl->state;
+      // Ждем команды по UART или CAN
+      if (Receive_FW_Command(bl) == 0xFF)   // функция обработки команд, возвращает 1 если ошибка
+      {
+        bl->error.bit.unknown_cmd      = 1;
+        bl->state = BL_STATE_ERROR;
+      }
       break;
 
     default:
+      bl->error.bit.unknown_cmd = 1;
       bl->state = BL_STATE_ERROR;
       break;
   }
-  bl->prev_state = bl->state;
   
 }
 
+
+uint8_t SetBootState(Bootloader_t *bl, BootloaderCommand_t cmd, uint8_t uart_flag)
+{
+  switch(cmd)
+  {
+    case CMD_ERASE: // команда: стереть Flash
+      bl->state = BL_STATE_ERASE;
+      return 0x00;
+    case CMD_START_RECEIVE: // команда: принять блок
+      if(uart_flag)
+        bl->state = BL_STATE_RECEIVE_UART;
+      else
+        bl->state = BL_STATE_RECEIVE_CAN;        
+      return 0x00;
+    case CMD_WRITE: // команда: записать блок
+      bl->state = BL_STATE_WRITE;
+      return 0x00;      
+    case CMD_VERIFY: // команда: проверка прошивки
+      bl->state = BL_STATE_VERIFY;
+      return 0x00;
+    case CMD_GOTOAPP: // команда: прыжок в приложение
+      bl->state = BL_STATE_JUMP_TO_APP;
+      return 0x00;
+    case CMD_RESET: // команда: прыжок в приложение
+      bl->state = BL_STATE_RESET;
+      return 0x00;
+    case CMD_GOTOBOOT: // команда: прыжок в бутлоадер
+      bl->state = BL_STATE_JUMP_TO_BOOT;
+      return 0x00;
+
+    default:
+      return 0xFF; // неизвестная команда
+  }
+}
+
 /**
  * @brief  Обработка команд прошивки по UART или CAN
  * @param  bl: указатель на структуру бутлоадера
@@ -136,6 +264,7 @@ uint8_t Receive_FW_Command(Bootloader_t *bl)
 {
   BootloaderCommand_t cmd = 0;
   HAL_StatusTypeDef res = HAL_ERROR;
+  uint8_t ret_val = 0x00;
 
   // ---------------------------
   // Чтение команды по UART
@@ -143,83 +272,68 @@ uint8_t Receive_FW_Command(Bootloader_t *bl)
   res = HAL_UART_Receive(bl->huart, &cmd, 1, 10); // таймаут 10 ms
   if (res == HAL_OK)
   {
-    switch(cmd)
+    ret_val = SetBootState(bl, cmd, 1);
-    {
-      case CMD_ERASE: // команда: стереть Flash
-        bl->state = BL_STATE_ERASE;
-        return 0x00;
-      case CMD_START_RECEIVE: // команда: принять блок
-        bl->state = BL_STATE_RECEIVE_UART;
-        return 0x00;
-      case CMD_WRITE: // команда: записать блок
-        bl->state = BL_STATE_WRITE;
-        return 0x00;      
-      case CMD_VERIFY: // команда: проверка прошивки
-        bl->state = BL_STATE_VERIFY;
-        return 0x00;
-      case CMD_GOTOAPP: // команда: прыжок в приложение
-        bl->state = BL_STATE_JUMP_TO_APP;
-        return 0x00;
-
-      default:
-        return 0xFF; // неизвестная команда
-    }
   }
 
   // ---------------------------
   // Чтение команды по CAN
   // ---------------------------
-  CAN_RxHeaderTypeDef canHeader;
   uint8_t canData[8];
   if (HAL_CAN_GetRxFifoFillLevel(bl->hcan, CAN_RX_FIFO0) > 0)
   {
-    if (HAL_CAN_GetRxMessage(bl->hcan, CAN_RX_FIFO0, &canHeader, canData) == HAL_OK)
+    if (HAL_CAN_GetRxMessage(bl->hcan, CAN_RX_FIFO0, &RxHeaderBoot, canData) == HAL_OK)
     {
       cmd = canData[0]; // предполагаем, что команда в первом байте
-      switch(cmd)
+      ret_val = SetBootState(bl, cmd, 0);
-      {
-        case CMD_ERASE:
-          bl->state = BL_STATE_ERASE;
-          return 0x00;
-        case CMD_START_RECEIVE:
-          // запускаем прием первой страницы + crc, затем после приема всего массива ждем следующей комманды
-          bl->state = BL_STATE_RECEIVE_CAN;
-          return 0x00;        
-        case CMD_WRITE: // команда: записать блок
-          bl->state = BL_STATE_WRITE;
-          return 0x00;           
-        case CMD_VERIFY:
-          bl->state = BL_STATE_VERIFY;
-          return 0x00;
-        case CMD_GOTOAPP:
-          bl->state = BL_STATE_JUMP_TO_APP;
-          return 0x00;
-        
-        default:
-          return 0xFF;
-      }
     }
   }
 
 #ifdef TEST_CAN
-	TxHeader.StdId = 0x200; // ID OF MESSAGE
+	TxHeaderBoot.StdId = 0x200; // ID OF MESSAGE
-	TxHeader.ExtId = 0; // STANDART FRAME (NOT EXTENTED)
+	TxHeaderBoot.ExtId = 0; // STANDART FRAME (NOT EXTENTED)
-	TxHeader.RTR = CAN_RTR_DATA; // TRANSMIT DATA OR 
+	TxHeaderBoot.RTR = CAN_RTR_DATA; // TRANSMIT DATA OR 
-	TxHeader.IDE = CAN_ID_STD; // STANDART FRAME
+	TxHeaderBoot.IDE = CAN_ID_STD; // STANDART FRAME
-	TxHeader.DLC = 8; // DATA SIZE
+	TxHeaderBoot.DLC = 8; // DATA SIZE
-	TxHeader.TransmitGlobalTime = DISABLE; //THIS MODE IS NOT USED, SO DISABLE
+	TxHeaderBoot.TransmitGlobalTime = DISABLE; //THIS MODE IS NOT USED, SO DISABLE
 	uint8_t asd[8] = "ABCDEFGL";
-  res_hal =	HAL_CAN_AddTxMessage(&hcan_boot, &TxHeader, asd, &TxMailBox); // add to mail for transmit
+  res_hal =	HAL_CAN_AddTxMessage(&hcan_boot, &TxHeaderBoot, asd, &TxMailBoxBoot); // add to mail for transmit
 	HAL_Delay(1000);
 #endif
   
-  return 0x00; // если команды нет, ничего не делаем, остаёмся в BL_STATE_IDLE
+  return ret_val;
+}
+
+uint32_t CRC32_Compute(const uint8_t* data, uint32_t length)
+{
+    const uint32_t polynomial = 0x04C11DB7;
+    uint32_t crc = 0xFFFFFFFF;
+
+    for(uint32_t i = 0; i < length; i++)
+    {
+        crc ^= ((uint32_t)data[i] << 24);
+        for(uint8_t j = 0; j < 8; j++)
+        {
+            if(crc & 0x80000000)
+                crc = (crc << 1) ^ polynomial;
+            else
+                crc <<= 1;
+        }
+    }
+
+    return crc ^ 0xFFFFFFFF;
 }
 
 
+// key functions
+void ResetKey(void)
+{	
+	HAL_FLASH_Unlock();
+	
+	HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, BOOTLOADER_KEY_ADR, 0);
+	
+	HAL_FLASH_Lock();	
+}
 
-
-// reset/set key function
 void SetKey(void)
 {	
 	HAL_FLASH_Unlock();
@@ -234,7 +348,7 @@ uint32_t ReadKey(void)
 	return (*(__IO uint32_t*)BOOTLOADER_KEY_ADR);
 }
 
-void ResetKey(void)
+void EraseKey(void)
 {	
 	FLASH_EraseInitTypeDef EraseInitStruct;
 	HAL_FLASH_Unlock();
@@ -252,55 +366,62 @@ void ResetKey(void)
 
 void JumpToApplocation(void)
 {
-  // jump to main app
-  //Задаётся адрес программы со смещением от начала вектора прерываний
-  uint32_t app_jump_adr;
-  app_jump_adr=*((volatile uint32_t*)(MAIN_APP_START_ADR+4));
-  void(*GoToApp)(void);
-  
   //Деинициализация HAL
   HAL_DeInit();
   
-  GoToApp = (void (*) (void)) app_jump_adr;
   //Перенос вектора прерываний на начало зашитой программы
   __disable_irq();
   __set_MSP(*((volatile uint32_t*)MAIN_APP_START_ADR));
   __enable_irq();
+  
   //Переход к выполнению зашитой программы
-  GoToApp();
+  __ASM volatile(
+      "ldr r0, [%0, #4]\n"  // r0 = *(MAIN_APP_START_ADR + 4)
+      "bx  r0\n"            // переход по адресу в r0
+      :
+      : "r"(MAIN_APP_START_ADR)
+      : "r0"
+  );
+  //Note: asm потому что при O0 компилятор делал локальные переменные, 
+  //      из-за чего при смене стека он не мог получить адрес для прыжка
 }
 
 
-
+void JumpToBootloader(void)
-void Boot_SystemClock_Config(void)
 {
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  // jump to boot
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  ResetKey(); // сброс ключа (не erase, просто битый ключ
-
+  NVIC_SystemReset(); // сброс и переход в бутлоадер (т.к. нет ключа)
-  /* Включаем внутренний генератор HSI */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_OFF; // без PLL
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-      Error_Handler();
-  }
-
-  /* Настройка шин AHB/APB */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                                |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI; // HSI = 8 MHz
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;     // HCLK = 8 MHz
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;      // PCLK1 = 8 MHz
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;      // PCLK2 = 8 MHz
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
-  {
-      Error_Handler();
-  }
 }
 
-void Error_Handler(void)
+
+// Сохранение кода ошибки
+// Чтение после ресета
+uint32_t LoadErrorCode(void)
 {
-  NVIC_SystemReset();
+    return BKP->DR1;
-}
+}
+
+uint32_t LoadErrorCnt(void)
+{
+    return BKP->DR2;
+}
+
+void ClearErrorCode(void)
+{
+    PWR->CR |= PWR_CR_DBP;
+    BKP->DR1 = 0;
+    BKP->DR2 = 0;
+}
+
+
+__WEAK void Boot_SystemClock_Config(void)
+{
+}
+
+
+__WEAK void Error_Handler(void)
+{
+  while(1);
+}
+

Core/Bootloader/bootloader.h

@@ -8,6 +8,18 @@
 #define BL_KEY_APP_WRITTEN 0xAAAA5555
 
 // ERROR DEFINES
+/**
+ * @brief Комманды бутлоадера
+ */
+typedef enum {
+  CMD_ERASE = 0x01,       ///< Команда на стирание прошивки
+  CMD_START_RECEIVE,      ///< Команда на старт приема прошивки
+  CMD_WRITE,              ///< Команда на запись блока прошивки
+  CMD_VERIFY,             ///< Команда на проверку прошивки
+  CMD_GOTOAPP,            ///< Команда на переход в приложение
+  CMD_RESET,              ///< Команда на переход в приложение
+  CMD_GOTOBOOT,           ///< Команда на переход в приложение
+}BootloaderCommand_t;
 
 /**
  * @brief Состояние бутлоадера
@@ -21,12 +33,33 @@ typedef enum {
   BL_STATE_RECEIVE_CAN,   ///< Состояние: прием прошивки по CAN
   BL_STATE_WRITE,         ///< Состояние: запись данных
   BL_STATE_VERIFY,        ///< Состояние: проверка прошивки
-  BL_STATE_ERROR          ///< Состояние: ошибка
+  BL_STATE_ERROR,         ///< Состояние: ошибка
+  BL_STATE_RESET,          ///< Состояние: сброс контролллера
+  BL_STATE_JUMP_TO_BOOT,  ///< Состояние: запуск приложения
 } BootloaderState_t;
 
+/**
+ * @brief Ошибки бутлоадера
+ */
+typedef union {
+  uint16_t all;
+  struct {
+    unsigned unknown_cmd:1;
+    unsigned erase_err:1;
+    unsigned write_err:1;
+    unsigned verify_err:1;
+    unsigned timeout_receive:1;
+    unsigned crc_err:1;
+    unsigned hardfault_cycle:1;
+    unsigned memmanage_cycle:1;
+  }bit;
+} BootloaderError_t;
+
 
 typedef struct {
   BootloaderState_t   state;                ///< текущее состояние бутлоадера
+  BootloaderError_t   error;
+  
   uint32_t            addr;                 ///< текущий адрес прошивки
 
   uint8_t             fw_size;              ///< размер прошивки
@@ -40,7 +73,19 @@ typedef struct {
   BootloaderState_t   prev_state;           ///< предыдущее состояние бутлоадера
 } Bootloader_t;
 
+extern uint32_t TxMailBoxBoot;
+extern uint8_t TXDataBoot[8];
 
+void ResetKey(void);
+void JumpToBootloader(void);
+
+
+void SaveErrorCode(uint32_t code);
+uint32_t LoadErrorCode(void);
+uint32_t LoadErrorCnt(void);
+void ClearErrorCode(void);
+
+void Boot_SystemClock_Config(void);
 void Bootloader_Task(Bootloader_t *bl);
 uint8_t Receive_FW_Command(Bootloader_t *bl);
 

Core/Src/can.c

@@ -23,6 +23,7 @@
 /* USER CODE BEGIN 0 */
 #include "message.h"
 #include "gpio.h"
+#include "bootloader.h"
 void CAN_filterConfig(void);
 
 CAN_TxHeaderTypeDef TxHeader;
@@ -189,6 +190,15 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan_i)
     /* Reception Error */
     Error_Handler();
   }
+  
+  if(msgData[0] == CMD_GOTOBOOT)
+  {
+    JumpToBootloader();
+  }
+  else if(msgData[0] == CMD_RESET)
+  {
+    NVIC_SystemReset();
+  }
 
 	if((msgHeader.ExtId & 0xFF00000)  != RX_box_ID) 
 	if((msgHeader.ExtId & 0xFF00000)  != BC_box_ID)	return;

MDK-ARM/uksvep_2_2_v1.uvoptx

@@ -25,227 +25,6 @@
     <TargetName>uksvep_2_2_v1</TargetName>
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>8000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>1</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>0</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>4</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
-        <pMon>Segger\JL2CM3.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>JL2CM3</Key>
-          <Name>-U11111118 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(3BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06414041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM))</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint/>
-      <WatchWindow1>
-        <Ww>
-          <count>0</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>input</ItemText>
-        </Ww>
-        <Ww>
-          <count>1</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>Inputs</ItemText>
-        </Ww>
-        <Ww>
-          <count>2</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>duty_cycle,0x0A</ItemText>
-        </Ww>
-        <Ww>
-          <count>3</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>frequency,0x0A</ItemText>
-        </Ww>
-        <Ww>
-          <count>4</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>uwTick,0x0A</ItemText>
-        </Ww>
-      </WatchWindow1>
-      <MemoryWindow1>
-        <Mm>
-          <WinNumber>1</WinNumber>
-          <SubType>0</SubType>
-          <ItemText>0x0800C000</ItemText>
-          <AccSizeX>0</AccSizeX>
-        </Mm>
-      </MemoryWindow1>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>1</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>0</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\GPIOB</Name>
-          <WinId>35905</WinId>
-        </Entry>
-      </SystemViewers>
-      <DebugDescription>
-        <Enable>1</Enable>
-        <EnableFlashSeq>0</EnableFlashSeq>
-        <EnableLog>0</EnableLog>
-        <Protocol>2</Protocol>
-        <DbgClock>10000000</DbgClock>
-      </DebugDescription>
-    </TargetOption>
-  </Target>
-
-  <Target>
-    <TargetName>bootloader</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
       <CLKADS>8000000</CLKADS>
       <OPTTT>
@@ -361,7 +140,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U60145543 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(3BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06414041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
+          <Name>-U11111118 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(3BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06414041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -369,12 +148,29 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>81</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134288232</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>../Core/Src/main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\uksvep_2_2_v1\../Core/Src/main.c\81</Expression>
+        </Bp>
+      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
           <WinNumber>1</WinNumber>
-          <ItemText>boot</ItemText>
+          <ItemText>input</ItemText>
         </Ww>
         <Ww>
           <count>1</count>
@@ -399,22 +195,35 @@
         <Ww>
           <count>5</count>
           <WinNumber>1</WinNumber>
-          <ItemText>GoToApp</ItemText>
+          <ItemText>modbus</ItemText>
         </Ww>
         <Ww>
           <count>6</count>
           <WinNumber>1</WinNumber>
-          <ItemText>app_jump_adr</ItemText>
+          <ItemText>msgData[0]</ItemText>
+        </Ww>
+        <Ww>
+          <count>7</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>CMD_GOTOBOOT</ItemText>
         </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>
           <SubType>0</SubType>
-          <ItemText>0x08009800</ItemText>
+          <ItemText>0x0800d000</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
+      <MemoryWindow2>
+        <Mm>
+          <WinNumber>2</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>0x08009800</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow2>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -477,6 +286,347 @@
     </TargetOption>
   </Target>
 
+  <Target>
+    <TargetName>bootloader</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>4</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>Segger\JL2CM3.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1605,104,-1155,661,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>JL2CM3</Key>
+          <Name>-U60145543 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(3BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06414041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>210</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134220168</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\Core\Bootloader\bootloader.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\bootloader\../Core/Bootloader/bootloader.c\210</Expression>
+        </Bp>
+        <Bp>
+          <Number>1</Number>
+          <Type>0</Type>
+          <LineNumber>216</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134220188</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\Core\Bootloader\bootloader.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\bootloader\../Core/Bootloader/bootloader.c\216</Expression>
+        </Bp>
+        <Bp>
+          <Number>2</Number>
+          <Type>0</Type>
+          <LineNumber>111</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134219682</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\Core\Bootloader\bootloader.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\bootloader\../Core/Bootloader/bootloader.c\111</Expression>
+        </Bp>
+        <Bp>
+          <Number>3</Number>
+          <Type>0</Type>
+          <LineNumber>214</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>..\Core\Bootloader\bootloader.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+        <Bp>
+          <Number>4</Number>
+          <Type>0</Type>
+          <LineNumber>219</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>..\Core\Bootloader\bootloader.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+      </Breakpoint>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>boot</ItemText>
+        </Ww>
+        <Ww>
+          <count>1</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>Inputs</ItemText>
+        </Ww>
+        <Ww>
+          <count>2</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>duty_cycle,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>3</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>frequency,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>4</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>uwTick,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>5</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>GoToApp</ItemText>
+        </Ww>
+        <Ww>
+          <count>6</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>app_jump_adr</ItemText>
+        </Ww>
+        <Ww>
+          <count>7</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>TXDataBoot</ItemText>
+        </Ww>
+      </WatchWindow1>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>0x0800d000</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <MemoryWindow2>
+        <Mm>
+          <WinNumber>2</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>0x08009800</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow2>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+      <SystemViewers>
+        <Entry>
+          <Name>System Viewer\BKP</Name>
+          <WinId>35903</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\CAN</Name>
+          <WinId>35904</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\GPIOB</Name>
+          <WinId>35905</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\PWR</Name>
+          <WinId>35901</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\RCC</Name>
+          <WinId>35902</WinId>
+        </Entry>
+      </SystemViewers>
+      <DebugDescription>
+        <Enable>1</Enable>
+        <EnableFlashSeq>0</EnableFlashSeq>
+        <EnableLog>0</EnableLog>
+        <Protocol>2</Protocol>
+        <DbgClock>10000000</DbgClock>
+      </DebugDescription>
+    </TargetOption>
+  </Target>
+
   <Group>
     <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>1</tvExp>
@@ -906,6 +1056,18 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>..\Core\Bootloader\boot_main.c</PathWithFileName>
+      <FilenameWithoutPath>boot_main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>..\Core\Bootloader\bootloader.c</PathWithFileName>
       <FilenameWithoutPath>bootloader.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -913,7 +1075,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>35</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -925,7 +1087,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -937,7 +1099,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>36</FileNumber>
+      <FileNumber>37</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -949,7 +1111,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>37</FileNumber>
+      <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -961,7 +1123,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>39</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -973,7 +1135,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>39</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -985,7 +1147,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <FileNumber>41</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -995,18 +1157,6 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>41</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Core\Bootloader\boot_main.c</PathWithFileName>
-      <FilenameWithoutPath>boot_main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
   </Group>
 
   <Group>

MDK-ARM/uksvep_2_2_v1.uvprojx

@@ -315,7 +315,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>2</Optim>
+            <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -661,81 +661,68 @@
         </Group>
         <Group>
           <GroupName>Bootloader</GroupName>
-          <GroupOption>
-            <CommonProperty>
-              <UseCPPCompiler>0</UseCPPCompiler>
-              <RVCTCodeConst>0</RVCTCodeConst>
-              <RVCTZI>0</RVCTZI>
-              <RVCTOtherData>0</RVCTOtherData>
-              <ModuleSelection>0</ModuleSelection>
-              <IncludeInBuild>0</IncludeInBuild>
-              <AlwaysBuild>2</AlwaysBuild>
-              <GenerateAssemblyFile>2</GenerateAssemblyFile>
-              <AssembleAssemblyFile>2</AssembleAssemblyFile>
-              <PublicsOnly>2</PublicsOnly>
-              <StopOnExitCode>11</StopOnExitCode>
-              <CustomArgument></CustomArgument>
-              <IncludeLibraryModules></IncludeLibraryModules>
-              <ComprImg>1</ComprImg>
-            </CommonProperty>
-            <GroupArmAds>
-              <Cads>
-                <interw>2</interw>
-                <Optim>0</Optim>
-                <oTime>2</oTime>
-                <SplitLS>2</SplitLS>
-                <OneElfS>2</OneElfS>
-                <Strict>2</Strict>
-                <EnumInt>2</EnumInt>
-                <PlainCh>2</PlainCh>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <wLevel>0</wLevel>
-                <uThumb>2</uThumb>
-                <uSurpInc>2</uSurpInc>
-                <uC99>2</uC99>
-                <uGnu>2</uGnu>
-                <useXO>2</useXO>
-                <v6Lang>0</v6Lang>
-                <v6LangP>0</v6LangP>
-                <vShortEn>2</vShortEn>
-                <vShortWch>2</vShortWch>
-                <v6Lto>2</v6Lto>
-                <v6WtE>2</v6WtE>
-                <v6Rtti>2</v6Rtti>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath></IncludePath>
-                </VariousControls>
-              </Cads>
-              <Aads>
-                <interw>2</interw>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <thumb>2</thumb>
-                <SplitLS>2</SplitLS>
-                <SwStkChk>2</SwStkChk>
-                <NoWarn>2</NoWarn>
-                <uSurpInc>2</uSurpInc>
-                <useXO>2</useXO>
-                <ClangAsOpt>0</ClangAsOpt>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath></IncludePath>
-                </VariousControls>
-              </Aads>
-            </GroupArmAds>
-          </GroupOption>
           <Files>
             <File>
               <FileName>boot_project_setup.h</FileName>
               <FileType>5</FileType>
               <FilePath>..\Core\Bootloader\boot_project_setup.h</FilePath>
             </File>
+            <File>
+              <FileName>boot_main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Core\Bootloader\boot_main.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>0</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
+            </File>
             <File>
               <FileName>bootloader.c</FileName>
               <FileType>1</FileType>
@@ -776,11 +763,6 @@
               <FileType>5</FileType>
               <FilePath>..\Core\Bootloader\boot_uart.h</FilePath>
             </File>
-            <File>
-              <FileName>boot_main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Core\Bootloader\boot_main.c</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>
@@ -1097,7 +1079,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>2</Optim>
+            <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -1467,6 +1449,11 @@
               <FileType>5</FileType>
               <FilePath>..\Core\Bootloader\boot_project_setup.h</FilePath>
             </File>
+            <File>
+              <FileName>boot_main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Core\Bootloader\boot_main.c</FilePath>
+            </File>
             <File>
               <FileName>bootloader.c</FileName>
               <FileType>1</FileType>
@@ -1507,11 +1494,6 @@
               <FileType>5</FileType>
               <FilePath>..\Core\Bootloader\boot_uart.h</FilePath>
             </File>
-            <File>
-              <FileName>boot_main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Core\Bootloader\boot_main.c</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>