修复源代码中文注释乱码并统一为UTF-8编码，Lora频率改为470MHz频段
1. 修复 source/inc/bsp.h、source/inc/main.h、source/src/bsp.c 中文注释乱码，统一保存为UTF-8编码 2. Lora中心频率由433.1MHz改为470.1MHz~492.6MHz，步进500kHz，共46个信道(CH0~CH45) 3. 新增下载前配置检查注释块，LORA_FREQ默认信道改为CH0 4. 更新Keil调试配置(CMSIS_AGDI调试器及观察窗口设置)
This commit is contained in:
+49
-49
@@ -22,20 +22,20 @@ static __IO bool LpUart0_Tx_Flag;
|
||||
|
||||
static void SystemClkInit(en_sysctrl_rch_freq_t enRchFreq)
|
||||
{
|
||||
///< RCH时钟不同频率的切换，需要先将时钟切换到RCL
|
||||
///< RCH时钟不同频率的切换，需要先将时钟切换到RCL
|
||||
Sysctrl_SetRCLTrim(SysctrlRclFreq32768);
|
||||
Sysctrl_SetRCLStableTime(SysctrlRclStableCycle64);
|
||||
Sysctrl_ClkSourceEnable(SysctrlClkRCL, TRUE);
|
||||
Sysctrl_SysClkSwitch(SysctrlClkRCL);
|
||||
|
||||
///< 加载目标频率的RCH的TRIM值
|
||||
///< 加载目标频率的RCH的TRIM值
|
||||
Sysctrl_SetRCHTrim(enRchFreq);
|
||||
///< 使能RCH
|
||||
///< 使能RCH
|
||||
Sysctrl_ClkSourceEnable(SysctrlClkRCH, TRUE);
|
||||
///< 时钟切换到RCH
|
||||
///< 时钟切换到RCH
|
||||
Sysctrl_SysClkSwitch(SysctrlClkRCH);
|
||||
|
||||
///< HCLK不超过24M：此处设置FLASH读等待周期为0 cycle
|
||||
///< HCLK不超过24M：此处设置FLASH读等待周期为0 cycle
|
||||
Flash_WaitCycle(FlashWaitCycle0);
|
||||
}
|
||||
|
||||
@@ -43,14 +43,14 @@ static void SystemClkInit(en_sysctrl_rch_freq_t enRchFreq)
|
||||
|
||||
static void SystemClkInit(en_sysctrl_xth_freq_t enXthFreq)
|
||||
{
|
||||
///<======================== 切换至XTH32MHz ==============================
|
||||
///< 当使用的时钟源HCLK大于24M：设置FLASH 读等待周期为1 cycle(默认值也为1 cycle)
|
||||
///<======================== 切换至XTH32MHz ==============================
|
||||
///< 当使用的时钟源HCLK大于24M：设置FLASH 读等待周期为1 cycle(默认值也为1 cycle)
|
||||
if(SysctrlXthFreq24_32MHz == enXthFreq)
|
||||
{
|
||||
Flash_WaitCycle(FlashWaitCycle1);
|
||||
}
|
||||
|
||||
///< 切换时钟前（根据外部高速晶振）设置XTH频率范围,配置晶振参数，使能目标时钟，此处为SYSTEM_XTH = 32MHz
|
||||
///< 切换时钟前（根据外部高速晶振）设置XTH频率范围,配置晶振参数，使能目标时钟，此处为SYSTEM_XTH = 32MHz
|
||||
Sysctrl_SetXTHFreq(enXthFreq);
|
||||
Sysctrl_XTHDriverCfg(SysctrlXtalDriver3);
|
||||
Sysctrl_SetXTHStableTime(SysctrlXthStableCycle16384);
|
||||
@@ -62,16 +62,16 @@ static void SystemClkInit(en_sysctrl_xth_freq_t enXthFreq)
|
||||
{
|
||||
Flash_WaitCycle(FlashWaitCycle0);
|
||||
}
|
||||
//M0P_SYSCTRL->SYSCTRL0_f.WAKEUP_BYRCH = 0; //唤醒保持原时钟
|
||||
//M0P_SYSCTRL->SYSCTRL0_f.WAKEUP_BYRCH = 0; //唤醒保持原时钟
|
||||
}
|
||||
|
||||
#elif (SYSCLK == SYSCLK_PLL)
|
||||
///<请注意根据外部晶振配置宏——[SYSTEM_XTH],如果使用PLL，XTH必须小于24MHz
|
||||
///<请注意根据外部晶振配置宏——[SYSTEM_XTH],如果使用PLL，XTH必须小于24MHz
|
||||
static void SystemClkInit(void)
|
||||
{
|
||||
stc_sysctrl_pll_cfg_t stcPLLCfg;
|
||||
|
||||
///< 切换时钟前（根据外部高速晶振）设置XTH频率范围,配置晶振参数，使能目标时钟，此处为SYSTEM_XTH = 32MHz
|
||||
///< 切换时钟前（根据外部高速晶振）设置XTH频率范围,配置晶振参数，使能目标时钟，此处为SYSTEM_XTH = 32MHz
|
||||
// Sysctrl_SetXTHFreq(SysctrlXthFreq4_8MHz);
|
||||
// Sysctrl_XTHDriverCfg(SysctrlXtalDriver3);
|
||||
// Sysctrl_SetXTHStableTime(SysctrlXthStableCycle16384);
|
||||
@@ -82,17 +82,17 @@ static void SystemClkInit(void)
|
||||
delay1ms(10);
|
||||
|
||||
stcPLLCfg.enInFreq = SysctrlPllInFreq6_12MHz; //XTH 8MHz
|
||||
stcPLLCfg.enOutFreq = SysctrlPllOutFreq36_48MHz; //PLL 输出
|
||||
stcPLLCfg.enPllClkSrc = SysctrlPllRch; //输入时钟源选择RCH
|
||||
stcPLLCfg.enOutFreq = SysctrlPllOutFreq36_48MHz; //PLL 输出
|
||||
stcPLLCfg.enPllClkSrc = SysctrlPllRch; //输入时钟源选择RCH
|
||||
stcPLLCfg.enPllMul = SysctrlPllMul6; //8MHz x 6 = 48MHz
|
||||
Sysctrl_SetPLLFreq(&stcPLLCfg);
|
||||
|
||||
///< 当使用的时钟源HCLK大于24M：设置FLASH 读等待周期为1 cycle(默认值也为1 cycle)
|
||||
///< 当使用的时钟源HCLK大于24M：设置FLASH 读等待周期为1 cycle(默认值也为1 cycle)
|
||||
Flash_WaitCycle(FlashWaitCycle1);
|
||||
|
||||
///< 使能PLL
|
||||
///< 使能PLL
|
||||
Sysctrl_ClkSourceEnable(SysctrlClkPLL, TRUE);
|
||||
///< 时钟切换到PLL
|
||||
///< 时钟切换到PLL
|
||||
Sysctrl_SysClkSwitch(SysctrlClkPLL);
|
||||
|
||||
}
|
||||
@@ -100,9 +100,9 @@ static void SystemClkInit(void)
|
||||
|
||||
static void SystemRCLInit(void)
|
||||
{
|
||||
Sysctrl_SetRCLTrim(SysctrlRclFreq38400); ///< 配置RCL时钟为32kHz
|
||||
Sysctrl_SetRCLTrim(SysctrlRclFreq38400); ///< 配置RCL时钟为32kHz
|
||||
Sysctrl_SetRCLStableTime(SysctrlRclStableCycle256);
|
||||
Sysctrl_ClkSourceEnable(SysctrlClkRCL, TRUE); ///< 使能RCL时钟
|
||||
Sysctrl_ClkSourceEnable(SysctrlClkRCL, TRUE); ///< 使能RCL时钟
|
||||
}
|
||||
|
||||
static void LPUartInit(void)
|
||||
@@ -116,32 +116,32 @@ static void LPUartInit(void)
|
||||
///<TX
|
||||
stcGpioCfg.enDir = GpioDirOut;
|
||||
Gpio_Init(LPUART_TX_PORT, LPUART_TX_PIN, &stcGpioCfg);
|
||||
Gpio_SetAfMode(LPUART_TX_PORT, LPUART_TX_PIN, LPUART_TX_AF); //配置PA00为LPUART1_TX
|
||||
Gpio_SetAfMode(LPUART_TX_PORT, LPUART_TX_PIN, LPUART_TX_AF); //配置PA00为LPUART1_TX
|
||||
|
||||
//<RX
|
||||
stcGpioCfg.enDir = GpioDirIn;
|
||||
Gpio_Init(LPUART_RX_PORT, LPUART_RX_PIN,&stcGpioCfg);
|
||||
Gpio_SetAfMode(LPUART_RX_PORT, LPUART_RX_PIN, LPUART_RX_AF); //配置PA01为LPUART1_RX
|
||||
Gpio_SetAfMode(LPUART_RX_PORT, LPUART_RX_PIN, LPUART_RX_AF); //配置PA01为LPUART1_RX
|
||||
|
||||
DDL_ZERO_STRUCT(stcCfg);
|
||||
Sysctrl_SetPeripheralGate(LPUART_PERIPHERAL_CLK,TRUE);
|
||||
|
||||
///<LPUART 初始化
|
||||
stcCfg.enStopBit = LPUart1bit; ///<1停止位
|
||||
stcCfg.enMmdorCk = LPUartEven; ///<偶校验
|
||||
stcCfg.stcBaud.enSclkSel = LPUartMskRcl; ///<传输时钟源
|
||||
stcCfg.stcBaud.u32Sclk = 38400; ///<PCLK获取
|
||||
stcCfg.stcBaud.enSclkDiv = LPUartMsk4Or8Div; ///<采样分频
|
||||
stcCfg.stcBaud.u32Baud = 9600; ///<波特率
|
||||
stcCfg.enRunMode = LPUartMskMode1; ///<工作模式
|
||||
///<LPUART 初始化
|
||||
stcCfg.enStopBit = LPUart1bit; ///<1停止位
|
||||
stcCfg.enMmdorCk = LPUartEven; ///<偶校验
|
||||
stcCfg.stcBaud.enSclkSel = LPUartMskRcl; ///<传输时钟源
|
||||
stcCfg.stcBaud.u32Sclk = 38400; ///<PCLK获取
|
||||
stcCfg.stcBaud.enSclkDiv = LPUartMsk4Or8Div; ///<采样分频
|
||||
stcCfg.stcBaud.u32Baud = 9600; ///<波特率
|
||||
stcCfg.enRunMode = LPUartMskMode1; ///<工作模式
|
||||
LPUart_Init(LPUART, &stcCfg);
|
||||
|
||||
///<LPUART 中断使能
|
||||
LPUart_ClrStatus(LPUART,LPUartRC); ///<清接收中断请求
|
||||
LPUart_ClrStatus(LPUART,LPUartTC); ///<清发送中断请求
|
||||
LPUart_EnableIrq(LPUART,LPUartTxIrq); ///<使能发送中断
|
||||
LPUart_EnableIrq(LPUART,LPUartRxIrq); ///<使能接收中断
|
||||
EnableNvic(LPUART_IRQN,IrqLevel3,TRUE); ///<系统中断使能
|
||||
///<LPUART 中断使能
|
||||
LPUart_ClrStatus(LPUART,LPUartRC); ///<清接收中断请求
|
||||
LPUart_ClrStatus(LPUART,LPUartTC); ///<清发送中断请求
|
||||
LPUart_EnableIrq(LPUART,LPUartTxIrq); ///<使能发送中断
|
||||
LPUart_EnableIrq(LPUART,LPUartRxIrq); ///<使能接收中断
|
||||
EnableNvic(LPUART_IRQN,IrqLevel3,TRUE); ///<系统中断使能
|
||||
}
|
||||
|
||||
void DBGUartSend(uint8_t *sData, int sLen)
|
||||
@@ -167,13 +167,13 @@ void DBGUartSend(uint8_t *sData, int sLen)
|
||||
void LpUart0_IRQHandler(void)
|
||||
{
|
||||
if(LPUart_GetStatus(LPUART, LPUartTC)) {
|
||||
LPUart_ClrStatus(LPUART, LPUartTC); ///<清发送中断请求
|
||||
LPUart_ClrStatus(LPUART, LPUartTC); ///<清发送中断请求
|
||||
LpUart0_Tx_Flag = true;
|
||||
}
|
||||
|
||||
if(LPUart_GetStatus(LPUART, LPUartRC)) { ///接收数据
|
||||
LPUart_ClrStatus(LPUART, LPUartRC); ///<清接收中断请求
|
||||
uint8_t u8RxData = LPUart_ReceiveData(LPUART); ///读取数据
|
||||
if(LPUart_GetStatus(LPUART, LPUartRC)) { ///接收数据
|
||||
LPUart_ClrStatus(LPUART, LPUartRC); ///<清接收中断请求
|
||||
uint8_t u8RxData = LPUart_ReceiveData(LPUART); ///读取数据
|
||||
DebugUartIRQ(u8RxData);
|
||||
}
|
||||
}
|
||||
@@ -181,13 +181,13 @@ void LpUart0_IRQHandler(void)
|
||||
void LpUart1_IRQHandler(void)
|
||||
{
|
||||
if(LPUart_GetStatus(LPUART, LPUartTC)) {
|
||||
LPUart_ClrStatus(LPUART, LPUartTC); ///<清发送中断请求
|
||||
LPUart_ClrStatus(LPUART, LPUartTC); ///<清发送中断请求
|
||||
LpUart0_Tx_Flag = true;
|
||||
}
|
||||
|
||||
if(LPUart_GetStatus(LPUART, LPUartRC)) { ///接收数据
|
||||
LPUart_ClrStatus(LPUART, LPUartRC); ///<清接收中断请求
|
||||
uint8_t u8RxData = LPUart_ReceiveData(LPUART); ///读取数据
|
||||
if(LPUart_GetStatus(LPUART, LPUartRC)) { ///接收数据
|
||||
LPUart_ClrStatus(LPUART, LPUartRC); ///<清接收中断请求
|
||||
uint8_t u8RxData = LPUart_ReceiveData(LPUART); ///读取数据
|
||||
DebugUartIRQ(u8RxData);
|
||||
}
|
||||
}
|
||||
@@ -200,12 +200,12 @@ static void GPIOInit(void)
|
||||
DDL_ZERO_STRUCT(GpioInitStruct);
|
||||
Sysctrl_SetPeripheralGate(SysctrlPeripheralGpio,TRUE);
|
||||
|
||||
GpioInitStruct.enDir = GpioDirOut; ///< 端口方向配置->输入
|
||||
GpioInitStruct.enDrv = GpioDrvH; ///< 端口驱动能力配置->高驱动能力
|
||||
GpioInitStruct.enPu = GpioPuDisable; ///< 端口上下拉配置->无
|
||||
GpioInitStruct.enDir = GpioDirOut; ///< 端口方向配置->输入
|
||||
GpioInitStruct.enDrv = GpioDrvH; ///< 端口驱动能力配置->高驱动能力
|
||||
GpioInitStruct.enPu = GpioPuDisable; ///< 端口上下拉配置->无
|
||||
GpioInitStruct.enPd = GpioPdDisable;
|
||||
GpioInitStruct.enOD = GpioOdDisable; ///< 端口开漏输出配置->开漏输出关闭
|
||||
GpioInitStruct.enCtrlMode = GpioAHB; ///< 端口输入/输出值寄存器总线控制模式配置->AHB
|
||||
GpioInitStruct.enOD = GpioOdDisable; ///< 端口开漏输出配置->开漏输出关闭
|
||||
GpioInitStruct.enCtrlMode = GpioAHB; ///< 端口输入/输出值寄存器总线控制模式配置->AHB
|
||||
GpioInitStruct.bOutputVal = false;
|
||||
|
||||
Gpio_Init(RS485_CTRL_PORT, RS485_CTRL_PIN, &GpioInitStruct);
|
||||
@@ -215,9 +215,9 @@ static void GPIOInit(void)
|
||||
static void WdtInit(void)
|
||||
{
|
||||
#if (USE_WDT == 1)
|
||||
///< 开启WDT外设时钟
|
||||
///< 开启WDT外设时钟
|
||||
Sysctrl_SetPeripheralGate(SysctrlPeripheralWdt,TRUE);
|
||||
///< WDT 初始化
|
||||
///< WDT 初始化
|
||||
Wdt_Init(WdtResetEn, WdtT52s4);
|
||||
Wdt_Start();
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user