Changeset 44 for trunk/fw_g473rct/Core/Src

Timestamp:

Jan 20, 2026, 3:00:17 PM (2 weeks ago)

Author:

f.jahn

Message:

System Bootloader can be activated with 5458 command.

Location:

trunk/fw_g473rct/Core/Src

Files:

• main.c (modified) (17 diffs)
• usart.c (modified) (1 diff)

trunk/fw_g473rct/Core/Src/main.c

@@ -63 +63 @@
 /* Private define ------------------------------------------------------------*/
 /* USER CODE BEGIN PD */
+
 #define MAX_OVERCURRENT_RETRYS  3
+
 /* USER CODE END PD */
 
@@ -74 +76 @@
 
 /* USER CODE BEGIN PV */
+
+uint32_t bootLoaderMark __attribute__((section(".no_init")));
+
 modbus_t modbusData __attribute__((section(".RAM1")));
 
@@ -98 +103 @@
 void LoadBackupRegister(void);
 void SaveBackupRegister(void);
+void JumpToBootloader(void);
 /* USER CODE END PFP */
 
@@ -111 +117 @@
 int main(void)
 {
-
   /* USER CODE BEGIN 1 */
+
+  if (bootLoaderMark == GOTO_SYSTEM_BOOTLOADER_MARK)
+  {
+          bootLoaderMark = 0;
+          JumpToBootloader();
+  }
+
   uint8_t firstStartCatcher;
   int mode_button_disable_time=0;
@@ -137 +149 @@
 
   /* USER CODE BEGIN SysInit */
-
+  printf("System core clock: %uMHz\n", SystemCoreClock / 1000000U);
   /* USER CODE END SysInit */
 
@@ -165 +177 @@
   AH_COUNTER_Init();
 
-
   startType_t startType = EEPROM_isFirstStart();
   
@@ -189 +200 @@
   LoadBackupRegister();
 
-
-    // Modbus Initialisierung
+  // Modbus Initialisierung
   mbInit(&modbusData, sys_data.s.parameter.baudrate, sys_data.s.parameter.parityMode, sys_data.s.parameter.stopBit, &huart2);
   HAL_IWDG_Refresh(&hiwdg);
@@ -206 +216 @@
   //HAL_DMA_Start(hadc2.DMA_Handle,(uint32_t)&hadc2.Instance->DR, (uint32_t)adc2Data,1); //Start ADC slave DMA 
   //SET_BIT(hadc1.Instance->CFGR, ADC_CFGR_DMAEN); //Enable DMA transfer for ADC master (ADC12_CCR.MDMA = 0b00 -> MDMA mode disabled)
-  
+
     //HAL_ADC_Start_DMA(&hadc2, (uint32_t*)adc2Data, 1);
   if (HAL_ADCEx_MultiModeStart_DMA(&hadc1,(uint32_t *)adc12Data,SAMPLE_ARRAY_SIZE))  //Start ADC interleaved mode
@@ -232 +242 @@
      Error_Handler();
   }
-
 
   // ADS1260 Initialierung
@@ -252 +261 @@
   }
 
-  
   /* USER CODE END 2 */
 
@@ -282 +290 @@
 
         }
-
 
         if (newADC3Data == 1)
@@ -330 +337 @@
         }
    
-
         if (sys_data.s.values.overcurrentRetryCounter > MAX_OVERCURRENT_RETRYS)
         {
@@ -339 +345 @@
           sys_data.s.values.lvpState = OUTPUTS_OVP_SHORT_PROTECTION;
           HAL_GPIO_WritePin(CHARGE_ENABLE_GPIO_Port, CHARGE_ENABLE_Pin, OUTPUTS_CHARGE_NOT_ALLOWED);
-
-
-
         }
 
@@ -386 +389 @@
 
       sys_data.s.values.efficiency = EFFICIENCY_Exec();
-
-
-    }
+    }
+
 
 
@@ -419 +421 @@
           case COMMAND_SET_RDP_LEVEL1:                        SetFlashReadProtection(true);                                                                                               break;
           case COMMAND_SET_RDP_LEVEL1_AND_BOOTSEL:            SetBootFromFlashAndReadOutProtection();                                                                     break;
+                  case COMMAND_GOTO_SYS_BOOTLOADER:                                       bootLoaderMark = GOTO_SYSTEM_BOOTLOADER_MARK;
+                                                                                                                          HAL_NVIC_SystemReset();
           default:                                            printf("UNKNOWN COMMAND\n");
         }
@@ -601 +605 @@
                 
                 HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_DR13, sys_data.s.values.mAh_AutoModeU);
-
-
-
-
-        }
-
-
-}
-
-
+        }
+}
+
+//------------------------------------------------------------------------------
 
  void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
@@ -798 +796 @@
 }
 
+//------------------------------------------------------------------------------
+
+void JumpToBootloader (void)
+{
+        typedef void (SystemBootloader)(void);
+#ifdef DEBUG
+        printf("Cannot jump in DEBUG mode!\n");
+        return;
+#endif
+        // Disable all interrupts
+        __disable_irq();
+
+#ifdef DEINIT_RCC
+        // Set the clock to the default state
+        HAL_RCC_DeInit();
+#endif
+#ifdef DEINIT_SYSTICK
+        // Disable Systick timer
+        SysTick->CTRL = SysTick->LOAD = SysTick->VAL = 0;
+#endif
+        // Clear Interrupt Enable Register & Interrupt Pending Register
+        for (int i = 0; i < sizeof(NVIC->ICER) / sizeof(NVIC->ICER[0]); i++)
+    {
+      NVIC->ICER[i] = 0xFFFFFFFF;
+      NVIC->ICPR[i] = 0xFFFFFFFF;
+    }
+
+        // Set up the jump to boot loader address + 4
+        SystemBootloader* sb = (SystemBootloader*) (*((uint32_t *) ((SYSTEM_BOOTLOADER_START_ADDR + 4))));
+
+        // Set the main stack pointer to the bootloader stack
+        __set_MSP(*(uint32_t *)SYSTEM_BOOTLOADER_START_ADDR);
+
+        __HAL_RCC_SYSCFG_CLK_ENABLE();
+        __HAL_SYSCFG_REMAPMEMORY_SYSTEMFLASH();
+        //__HAL_RCC_SYSCFG_CLK_DISABLE();
+
+        // Re-enable all interrupts
+        __enable_irq();
+
+        // Call the function to jump to boot loader location
+        sb();
+
+        // Jump is done successfully
+        while (1)
+        {
+                // Code should never reach this loop
+                printf("Jump has failed!\n");
+        }
+}
 
 /* USER CODE END 4 */

trunk/fw_g473rct/Core/Src/usart.c

@@ -96 +96 @@
   huart2.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
   huart2.Init.ClockPrescaler = UART_PRESCALER_DIV1;
-  huart2.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_SWAP_INIT;
+  huart2.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
   huart2.AdvancedInit.Swap = UART_ADVFEATURE_SWAP_ENABLE;
   if (HAL_UART_Init(&huart2) != HAL_OK)