refactor: 重构校准流程，拆分校准逻辑到南向模块
1. 删除chrg_roll_nor.h中的chrg_roll_trim_set声明 2. 从chrg_north.h中移除trim_step和north_mode成员变量 3. 在chrg_roll_sou.h中新增chrg_sou_trim_submit函数声明 4. 重构chrg_comm.c的校准处理逻辑： - 移除旧的通道关闭逻辑和本地寄存器操作 - 新增校准模式合法性校验 - 调用南向模块提交校准指令 5. 从chrg_roll_nor.c中删除全部校准相关代码 6. 在chrg_roll_sou.c中实现完整的校准指令组包和提交逻辑 7. 重构boot目录下的main.c，新增完整的系统初始化和跳转流程
This commit is contained in:
wrh
+189
-44
@@ -1,69 +1,214 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include "app_config.h"
|
||||
#include "main.h"
|
||||
|
||||
#define APP_ADDRESS 0x08040000UL
|
||||
#define APP_FLASH_END 0x08100000UL
|
||||
#define SRAM_START 0x20000000UL
|
||||
#define SRAM_END 0x20020000UL
|
||||
|
||||
/* Kept for legacy source files that remain in the Keil project. */
|
||||
UART_HandleTypeDef huart1;
|
||||
UART_HandleTypeDef huart2;
|
||||
DMA_HandleTypeDef hdma_usart1_rx;
|
||||
DMA_HandleTypeDef hdma_usart2_rx;
|
||||
|
||||
typedef void (*app_entry_t)(void);
|
||||
|
||||
void MX_DMA_DeInit(void)
|
||||
extern void System_Init(void);
|
||||
extern void APP_Init(void);
|
||||
extern void APP_Running(void);
|
||||
|
||||
|
||||
#if defined(STM32F405xx)
|
||||
|
||||
void SystemClock_Config (void)
|
||||
{
|
||||
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
|
||||
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
|
||||
|
||||
__HAL_RCC_PWR_CLK_ENABLE();
|
||||
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
|
||||
|
||||
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
|
||||
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
|
||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
|
||||
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
|
||||
RCC_OscInitStruct.PLL.PLLM = 8;
|
||||
RCC_OscInitStruct.PLL.PLLN = 192;
|
||||
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
||||
RCC_OscInitStruct.PLL.PLLQ = 4;
|
||||
HAL_RCC_OscConfig(&RCC_OscInitStruct);
|
||||
|
||||
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|
||||
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
|
||||
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
|
||||
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
|
||||
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
|
||||
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
|
||||
|
||||
HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_3);
|
||||
}
|
||||
|
||||
void MX_USART_DeInit(void)
|
||||
#elif defined(STM32F411xE)||defined(STM32F401xC)
|
||||
|
||||
void SystemClock_Config (void)
|
||||
{
|
||||
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
|
||||
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
|
||||
|
||||
__HAL_RCC_PWR_CLK_ENABLE();
|
||||
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
|
||||
|
||||
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
|
||||
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
|
||||
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
|
||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
|
||||
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
|
||||
RCC_OscInitStruct.PLL.PLLM = 8;
|
||||
RCC_OscInitStruct.PLL.PLLN = 100;
|
||||
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
||||
RCC_OscInitStruct.PLL.PLLQ = 4;
|
||||
HAL_RCC_OscConfig(&RCC_OscInitStruct);
|
||||
|
||||
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|
||||
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
|
||||
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
|
||||
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
|
||||
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
|
||||
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
|
||||
|
||||
HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_3);
|
||||
}
|
||||
|
||||
static void boot_jump_to_app(void)
|
||||
#endif
|
||||
|
||||
static void MX_GPIO_Init (void)
|
||||
{
|
||||
uint32_t app_stack = *(volatile uint32_t *)APP_ADDRESS;
|
||||
uint32_t app_reset = *(volatile uint32_t *)(APP_ADDRESS + 4U);
|
||||
app_entry_t app_entry;
|
||||
GPIO_InitTypeDef GPIO_InitStruct = {0};
|
||||
|
||||
/* Do not branch through an erased or invalid application vector table. */
|
||||
if ((app_stack < SRAM_START) || (app_stack >= SRAM_END) ||
|
||||
(app_reset < APP_ADDRESS) || (app_reset >= APP_FLASH_END)) {
|
||||
while (1) {
|
||||
}
|
||||
}
|
||||
__HAL_RCC_GPIOA_CLK_ENABLE();
|
||||
__HAL_RCC_GPIOB_CLK_ENABLE();
|
||||
__HAL_RCC_GPIOC_CLK_ENABLE();
|
||||
|
||||
__disable_irq();
|
||||
#if (ENABLE_FACTORY_FIRMWARE_BUTTON)
|
||||
__HAL_RCC_GPIOE_CLK_ENABLE();
|
||||
|
||||
SysTick->CTRL = 0;
|
||||
SysTick->LOAD = 0;
|
||||
SysTick->VAL = 0;
|
||||
GPIO_InitStruct.Pin = KEY0_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
|
||||
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
||||
HAL_GPIO_Init(KEY0_GPIO_Port, &GPIO_InitStruct);
|
||||
#endif
|
||||
|
||||
for (uint32_t i = 0; i < 8U; i++) {
|
||||
NVIC->ICER[i] = 0xFFFFFFFFUL;
|
||||
NVIC->ICPR[i] = 0xFFFFFFFFUL;
|
||||
}
|
||||
GPIO_InitStruct.Pin = LED0_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
|
||||
HAL_GPIO_Init(LED0_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
HAL_DeInit();
|
||||
SCB->VTOR = APP_ADDRESS;
|
||||
__set_MSP(app_stack);
|
||||
__set_CONTROL(0);
|
||||
__DSB();
|
||||
__ISB();
|
||||
|
||||
app_entry = (app_entry_t)app_reset;
|
||||
app_entry();
|
||||
|
||||
while (1) {
|
||||
}
|
||||
HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_SET);
|
||||
|
||||
/* Configure the MCO1 pin in alternate function mode */
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_8;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
|
||||
|
||||
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
HAL_Init();
|
||||
boot_jump_to_app();
|
||||
|
||||
while (1) {
|
||||
}
|
||||
static void MX_DMA_Init(void)
|
||||
{
|
||||
|
||||
/* DMA controller clock enable */
|
||||
__HAL_RCC_DMA1_CLK_ENABLE();
|
||||
__HAL_RCC_DMA2_CLK_ENABLE();
|
||||
|
||||
/* DMA interrupt init */
|
||||
// usart1 rx
|
||||
HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, 1, 0);
|
||||
HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn);
|
||||
|
||||
// usart2 rx
|
||||
HAL_NVIC_SetPriority(DMA1_Stream5_IRQn, 1, 0);
|
||||
HAL_NVIC_EnableIRQ(DMA1_Stream5_IRQn);
|
||||
}
|
||||
|
||||
void MX_DMA_DeInit (void)
|
||||
{
|
||||
HAL_DMA_DeInit(&hdma_usart1_rx);
|
||||
HAL_DMA_DeInit(&hdma_usart2_rx);
|
||||
}
|
||||
|
||||
static void MX_USART_Init (void)
|
||||
{
|
||||
huart1.Instance = USART1;
|
||||
huart1.Init.BaudRate = 115200;
|
||||
huart1.Init.WordLength = UART_WORDLENGTH_8B;
|
||||
huart1.Init.StopBits = UART_STOPBITS_1;
|
||||
huart1.Init.Parity = UART_PARITY_NONE;
|
||||
huart1.Init.Mode = UART_MODE_TX_RX;
|
||||
huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
|
||||
huart1.Init.OverSampling = UART_OVERSAMPLING_16;
|
||||
HAL_UART_Init(&huart1);
|
||||
|
||||
huart2.Instance = USART2;
|
||||
huart2.Init.BaudRate = 115200;
|
||||
huart2.Init.WordLength = UART_WORDLENGTH_8B;
|
||||
huart2.Init.StopBits = UART_STOPBITS_1;
|
||||
huart2.Init.Parity = UART_PARITY_NONE;
|
||||
huart2.Init.Mode = UART_MODE_TX_RX;
|
||||
huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
|
||||
huart2.Init.OverSampling = UART_OVERSAMPLING_16;
|
||||
HAL_UART_Init(&huart2);
|
||||
}
|
||||
|
||||
void MX_USART_DeInit (void)
|
||||
{
|
||||
HAL_UART_DeInit(&huart1);
|
||||
HAL_UART_DeInit(&huart2);
|
||||
}
|
||||
|
||||
|
||||
int main (void)
|
||||
{
|
||||
HAL_Init();
|
||||
SystemClock_Config();
|
||||
|
||||
System_Init();
|
||||
|
||||
MX_GPIO_Init();
|
||||
MX_DMA_Init();
|
||||
MX_USART_Init();
|
||||
#if 0
|
||||
printf("\r\n\r\n========================================\r\n");
|
||||
printf("\t%s boot V%d.%d.%d\r\n", NAME_CHIP,
|
||||
VERSION_MAIN, VERSION_SUB, VERSION_FIX);
|
||||
printf("\tbuilt @ %s\r\n", BUILD_TIMESTAMP);
|
||||
printf("Chip UID: %08X - %08X - %08X\r\n",
|
||||
HAL_GetUIDw0(), HAL_GetUIDw1(), HAL_GetUIDw2());
|
||||
printf("========================================\r\n");
|
||||
#else
|
||||
printf("\tboot V%d.%d.%d built @ %s\r\n",
|
||||
VERSION_MAIN, VERSION_SUB, VERSION_FIX, BUILD_TIMESTAMP);
|
||||
#endif
|
||||
APP_Init();
|
||||
|
||||
while (1) {
|
||||
APP_Running();
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int fputc(int ch, FILE *f)
|
||||
{
|
||||
HAL_UART_Transmit(&huart2, (uint8_t *)&ch, 1, 0xffff);
|
||||
return ch;
|
||||
}
|
||||
|
||||
int fgetc(FILE * f)
|
||||
{
|
||||
uint8_t ch = 0;
|
||||
HAL_UART_Receive(&huart2,&ch, 1, 0xffff);
|
||||
return ch;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user