diff --git a/App/app_update.c b/App/app_update.c index 78efe35..7468214 100644 --- a/App/app_update.c +++ b/App/app_update.c @@ -218,7 +218,7 @@ int app_update_entry(struct pt *pt) update_init(send_bytes); - //擦除APP + //鎿﹂櫎APP if ((g_update.cfg.UpdateFlag == APP_UPDATE_FLAG) && dev_boot_check_app() ){ diff --git a/App/main.c b/App/main.c index b7bc7cc..7c2f06d 100644 --- a/App/main.c +++ b/App/main.c @@ -9,7 +9,7 @@ #include "hdl_clk.h" /******************************************************************************* - * 中断服务函数 + * 涓柇鏈嶅姟鍑芥暟 ******************************************************************************/ void SysTick_Handler(void) { diff --git a/components/ringbuffer.c b/components/ringbuffer.c index 225076b..c4fa578 100644 --- a/components/ringbuffer.c +++ b/components/ringbuffer.c @@ -1,5 +1,5 @@ /****************************************************************************** - * @brief 环形缓冲区管理(参考linux/kfifo) + * @brief 鐜舰缂撳啿鍖虹鐞(鍙傝僱inux/kfifo) * * Copyright (c) 2016~2020, * @@ -7,7 +7,7 @@ * * Change Logs: * Date Author Notes - * 2016-05-30 Morro 初版完成 + * 2016-05-30 Morro 鍒濈増瀹屾垚 ******************************************************************************/ #include "ringbuffer.h" #include @@ -16,10 +16,10 @@ #define min(a,b) ( (a) < (b) )? (a):(b) /* - *@brief 构造一个空环形缓冲区 - *@param[in] r - 环形缓冲区管理器 - *@param[in] buf - 数据缓冲区 - *@param[in] len - buf长度(必须是2的N次幂) + *@brief 鏋勯犱竴涓┖鐜舰缂撳啿鍖 + *@param[in] r - 鐜舰缂撳啿鍖虹鐞嗗櫒 + *@param[in] buf - 鏁版嵁缂撳啿鍖 + *@param[in] len - buf闀垮害(蹇呴』鏄2鐨凬娆″箓) *@retval bool */ bool ring_buf_init(ring_buf_t *r,unsigned char *buf, unsigned int len) @@ -31,8 +31,8 @@ bool ring_buf_init(ring_buf_t *r,unsigned char *buf, unsigned int len) } /* - *@brief 清空环形缓冲区 - *@param[in] r - 待清空的环形缓冲区 + *@brief 娓呯┖鐜舰缂撳啿鍖 + *@param[in] r - 寰呮竻绌虹殑鐜舰缂撳啿鍖 *@retval none */ void ring_buf_clr(ring_buf_t *r) @@ -41,8 +41,8 @@ void ring_buf_clr(ring_buf_t *r) } /* - *@brief 获取环形缓冲区数据长度 - *@retval 环形缓冲区中有效字节数 + *@brief 鑾峰彇鐜舰缂撳啿鍖烘暟鎹暱搴 + *@retval 鐜舰缂撳啿鍖轰腑鏈夋晥瀛楄妭鏁 */ int ring_buf_len(ring_buf_t *r) { @@ -50,10 +50,10 @@ int ring_buf_len(ring_buf_t *r) } /* - *@brief 将指定长度的数据放到环形缓冲区中 - *@param[in] buf - 数据缓冲区 - * len - 缓冲区长度 - *@retval 实际放到中的数据 + *@brief 灏嗘寚瀹氶暱搴︾殑鏁版嵁鏀惧埌鐜舰缂撳啿鍖轰腑 + *@param[in] buf - 鏁版嵁缂撳啿鍖 + * len - 缂撳啿鍖洪暱搴 + *@retval 瀹為檯鏀惧埌涓殑鏁版嵁 */ int ring_buf_put(ring_buf_t *r,unsigned char *buf,unsigned int len) { @@ -70,10 +70,10 @@ int ring_buf_put(ring_buf_t *r,unsigned char *buf,unsigned int len) } /* - *@brief 从环形缓冲区中读取指定长度的数据 - *@param[in] len - 读取长度 - *@param[out] buf - 输出数据缓冲区 - *@retval 实际读取长度 + *@brief 浠庣幆褰㈢紦鍐插尯涓鍙栨寚瀹氶暱搴︾殑鏁版嵁 + *@param[in] len - 璇诲彇闀垮害 + *@param[out] buf - 杈撳嚭鏁版嵁缂撳啿鍖 + *@retval 瀹為檯璇诲彇闀垮害 */ int ring_buf_get(ring_buf_t *r,unsigned char *buf,unsigned int len) { diff --git a/components/ringbuffer.h b/components/ringbuffer.h index b517e6c..bbb6512 100644 --- a/components/ringbuffer.h +++ b/components/ringbuffer.h @@ -1,5 +1,5 @@ /****************************************************************************** - * @brief 环形缓冲区管理(参考linux/kfifo) + * @brief 鐜舰缂撳啿鍖虹鐞(鍙傝僱inux/kfifo) * * Copyright (c) 2016~2020, * @@ -7,7 +7,7 @@ * * Change Logs: * Date Author Notes - * 2016-05-30 Morro 初版完成 + * 2016-05-30 Morro 鍒濈増瀹屾垚 ******************************************************************************/ #ifndef _RING_BUF_H_ @@ -19,12 +19,12 @@ extern "C" { #endif -/*环形缓冲区管理器*/ +/*鐜舰缂撳啿鍖虹鐞嗗櫒*/ typedef struct { - unsigned char *buf; /*环形缓冲区 */ - unsigned int size; /*环形缓冲区 */ - unsigned int front; /*头指针 */ - unsigned int rear; /*尾指针 */ + unsigned char *buf; /*鐜舰缂撳啿鍖 */ + unsigned int size; /*鐜舰缂撳啿鍖 */ + unsigned int front; /*澶存寚閽 */ + unsigned int rear; /*灏炬寚閽 */ }ring_buf_t; bool ring_buf_init(ring_buf_t *r,unsigned char *buf,unsigned int size); diff --git a/components/update_protocol.h b/components/update_protocol.h index e7d0ca5..d887df9 100644 --- a/components/update_protocol.h +++ b/components/update_protocol.h @@ -5,7 +5,7 @@ #define CRC16_BASE 0xA001 -//帧头结构体 +//甯уご缁撴瀯浣 typedef struct { uint8_t Header; uint8_t SlvAddr; @@ -13,20 +13,20 @@ typedef struct { uint8_t PayloadLen; }update_protocol_hd_t; -//主机下发升级请求载荷结构体 +//涓绘満涓嬪彂鍗囩骇璇锋眰杞借嵎缁撴瀯浣 typedef struct { uint16_t PackageNum; uint32_t AppSize; uint32_t AppCrc32; }__attribute__ ((packed))update_protocol_req_t; -//从机请求下发结构体 +//浠庢満璇锋眰涓嬪彂缁撴瀯浣 typedef struct { uint16_t PackageIndex; uint32_t PackageNum; }__attribute__ ((packed))update_protocol_get_t; -//主机应答下发数据结构体 +//涓绘満搴旂瓟涓嬪彂鏁版嵁缁撴瀯浣 typedef struct { uint16_t PackageIndex; uint16_t PackageNum; diff --git a/hdl/hdl_clk.c b/hdl/hdl_clk.c index 84c57fd..f425e2f 100644 --- a/hdl/hdl_clk.c +++ b/hdl/hdl_clk.c @@ -1,11 +1,11 @@ #include "hdl_clk.h" /******************************************************************************************************** -* @鍑芥暟鍚 hdl_xtal_init -* @鎻忚堪 澶栭儴鏅舵尟鍒濆鍖 -* @鍙傛暟 鏃 -* @杩斿洖鍊 鏃 -* @娉ㄦ剰 鏃 +* @閸戣姤鏆熼崥? hdl_xtal_init +* @閹诲繗鍫 婢舵牠鍎撮弲鑸靛盁閸掓繂顫愰崠? +* @閸欏倹鏆 閺? +* @鏉╂柨娲栭崐? 閺? +* @濞夈劍鍓 閺? ********************************************************************************************************/ #if USING_XTAL @@ -13,11 +13,11 @@ static void hdl_xtal_init(void) { stc_clock_xtal_init_t stcXtalInit; - /* XTAL 寮曡剼閰嶇疆 */ + /* XTAL 瀵洝鍓奸柊宥囩枂 */ GPIO_AnalogCmd(GPIO_PORT_H, GPIO_PIN_00 | GPIO_PIN_01, ENABLE); (void)CLK_XtalStructInit(&stcXtalInit); - /* 閰嶇疆XTAL鍜屽惎鐢╔TAL */ + /* 闁板秶鐤哫TAL閸滃苯鎯庨悽鈺擳AL */ stcXtalInit.u8State = CLK_XTAL_ON; stcXtalInit.u8Mode = CLK_XTAL_MD_OSC; stcXtalInit.u8Drv = CLK_XTAL_DRV_ULOW; @@ -28,11 +28,11 @@ static void hdl_xtal_init(void) /******************************************************************************************************** -* @鍑芥暟鍚 hdl_pll_init -* @鎻忚堪 閿佺浉鐜嶉鍒濆鍖 -* @鍙傛暟 鏃 -* @杩斿洖鍊 鏃 -* @娉ㄦ剰 鏃 +* @閸戣姤鏆熼崥? hdl_pll_init +* @閹诲繗鍫 闁夸胶娴夐悳顖氣偓宥夘暥閸掓繂顫愰崠? +* @閸欏倹鏆 閺? +* @鏉╂柨娲栭崐? 閺? +* @濞夈劍鍓 閺? ********************************************************************************************************/ static void hdl_pll_init(void) { @@ -40,7 +40,7 @@ static void hdl_pll_init(void) (void)CLK_PLLStructInit(&stcMPLLInit); - /* MPLL 閰嶇疆 */ + /* MPLL 闁板秶鐤 */ /* 16MHz/M*N = 16/2*50/2 = 200MHz */ stcMPLLInit.PLLCFGR = 0UL; stcMPLLInit.PLLCFGR_f.PLLM = (2UL - 1UL); @@ -55,33 +55,33 @@ static void hdl_pll_init(void) /******************************************************************************************************** -* @鍑芥暟鍚 hdl_clk_init -* @鎻忚堪 鏃堕挓鍒濆鍖 -* @鍙傛暟 鏃 -* @杩斿洖鍊 鏃 -* @娉ㄦ剰 鏃 +* @閸戣姤鏆熼崥? hdl_clk_init +* @閹诲繗鍫 閺冨爼鎸撻崚婵嗩潗閸? +* @閸欏倹鏆 閺? +* @鏉╂柨娲栭崐? 閺? +* @濞夈劍鍓 閺? ********************************************************************************************************/ void hdl_clk_init(void) { - /* 瑙ｉ櫎鍐欎繚鎶 */ + /* 鐟欙綁娅庨崘娆庣箽閹?*/ LL_PERIPH_WE(LL_PERIPH_EFM | LL_PERIPH_FCG | LL_PERIPH_GPIO | LL_PERIPH_PWC_CLK_RMU | LL_PERIPH_SRAM); - /* 璁剧疆鏃堕挓鍒嗛 */ + /* 鐠佸墽鐤嗛弮鍫曟寭閸掑棝顣 */ CLK_SetClockDiv(CLK_BUS_CLK_ALL, (CLK_HCLK_DIV1 | CLK_EXCLK_DIV2 | CLK_PCLK0_DIV1 | CLK_PCLK1_DIV2 | \ CLK_PCLK2_DIV4 | CLK_PCLK3_DIV4 | CLK_PCLK4_DIV2)); - /* SRAM鍒濆鍖栧寘鎷/鍐欑瓑寰呭懆鏈熻缃 */ + /* SRAM閸掓繂顫愰崠鏍у瘶閹奉剝顕/閸愭瑧鐡戝鍛噯閺堢喕顔曠純?*/ SRAM_SetWaitCycle(SRAM_SRAM_ALL, SRAM_WAIT_CYCLE1, SRAM_WAIT_CYCLE1); SRAM_SetWaitCycle(SRAM_SRAMH, SRAM_WAIT_CYCLE0, SRAM_WAIT_CYCLE0); - /* 闂瓨璇诲彇绛夊緟鍛ㄦ湡璁剧疆 */ + /* 闂傤亜鐡ㄧ拠璇插絿缁涘绶熼崨銊︽埂鐠佸墽鐤 */ EFM_SetWaitCycle(EFM_WAIT_CYCLE5); - /* XTAL 鍒濆鍖 */ + /* XTAL 閸掓繂顫愰崠?*/ // hdl_xtal_init(); - /* XTAL32 鍒濆鍖 */ + /* XTAL32 閸掓繂顫愰崠?*/ - /* MPLL 鍒濆鍖 */ + /* MPLL 閸掓繂顫愰崠?*/ hdl_pll_init(); /* enable LRC */ @@ -90,7 +90,7 @@ void hdl_clk_init(void) /* 3 cycles for 126MHz ~ 200MHz */ GPIO_SetReadWaitCycle(GPIO_RD_WAIT3); - /* 鍒囨崲椹卞姩鑳藉姏 */ + /* 閸掑洦宕叉す鍗炲З閼宠棄濮 */ PWC_HighSpeedToHighPerformance(); EFM_DataCacheResetCmd(ENABLE); @@ -99,13 +99,13 @@ void hdl_clk_init(void) /* Enable cache */ EFM_CacheCmd(ENABLE); - /* 浣胯兘鍐欎繚鎶 */ + /* 娴ｈ儻鍏橀崘娆庣箽閹?*/ LL_PERIPH_WP(LL_PERIPH_EFM | LL_PERIPH_GPIO | LL_PERIPH_SRAM); - /* 璁剧疆绯荤粺鏃堕挓婧 */ + /* 鐠佸墽鐤嗙化鑽ょ埠閺冨爼鎸撳┃?*/ CLK_SetSysClockSrc(CLK_SYSCLK_SRC_PLL); - /* 浣胯兘systick */ + /* 娴ｈ儻鍏榮ystick */ (void)SysTick_Init(1000U); } diff --git a/hdl/hdl_cs5552.c b/hdl/hdl_cs5552.c index d8194c5..563bf10 100644 --- a/hdl/hdl_cs5552.c +++ b/hdl/hdl_cs5552.c @@ -127,7 +127,7 @@ void hdl_cs5552_init(void) SET_CS5552_CS(); - /* 配置CS5552 */ + /* 閰嶇疆CS5552 */ CLR_CS5552_CS(); hdl_cs5552_write_read_byte(0x00); hdl_cs5552_write_read_byte(0xA5); @@ -143,32 +143,32 @@ void hdl_cs5552_init(void) hdl_cs5552_reg_write(GAIN_CH0_W, 0x02, 0x00, 0x00, 0x00); //GAIN_CH0 hdl_cs5552_reg_write(OS_CH1_W, 0x00, 0x00, 0x00, 0x00); //OS_CH1 hdl_cs5552_reg_write(GAIN_CH1_W, 0x02, 0x00, 0x00, 0x00); //GAIN_CH1 - hdl_cs5552_reg_write(CONV_CONF0_W, 0x30, 0x80, 0x00, 0x80); //CONV_CONF0 滤波-256CLK 速率-200Hz PGA-128 + hdl_cs5552_reg_write(CONV_CONF0_W, 0x30, 0x80, 0x00, 0x80); //CONV_CONF0 婊ゆ尝-256CLK 閫熺巼-200Hz PGA-128 hdl_cs5552_reg_write(CONV_CONF1_W, 0x00, 0x00, 0x00, 0x00); //CONV_CONF1 hdl_cs5552_reg_write(SYS_CONF0_W, 0x02, 0x01, 0x00, 0x00); //SYS_CONF0 - hdl_cs5552_reg_write(SYS_CONF1_W, 0x08, 0x11, 0x02, 0x10); //SYS_CONF1 内部时钟 内部基准源 + hdl_cs5552_reg_write(SYS_CONF1_W, 0x08, 0x11, 0x02, 0x10); //SYS_CONF1 鍐呴儴鏃堕挓 鍐呴儴鍩哄噯婧 hdl_cs5552_reg_write(SYS_CONF2_W, 0x00, 0x52, 0x10, 0x00); //SYS_CONF2 #ifdef HC32_DEBUG - /* 读取通道0设置 */ + /* 璇诲彇閫氶亾0璁剧疆 */ data = hdl_cs5552_reg_read(OS_CH0_R); printf("OS_CH0 = %d\r\n", data); data = hdl_cs5552_reg_read(GAIN_CH0_R); printf("GAIN_CH0 = %d\r\n", data); - /* 读取通道1设置 */ + /* 璇诲彇閫氶亾1璁剧疆 */ data = hdl_cs5552_reg_read(OS_CH1_R); printf("OS_CH1 = %d\r\n", data); data = hdl_cs5552_reg_read(GAIN_CH1_R); printf("GAIN_CH1 = %d\r\n", data); - /* 配置CONV */ + /* 閰嶇疆CONV */ data = hdl_cs5552_reg_read(CONV_CONF0_R); printf("CONV_CONF0 = %d\r\n", data); data = hdl_cs5552_reg_read(CONV_CONF1_R); printf("CONV_CONF1 = %d\r\n", data); - /* 配置SYS */ + /* 閰嶇疆SYS */ data = hdl_cs5552_reg_read(SYS_CONF0_R); printf("SYS_CONF0 = %d\r\n", data); data = hdl_cs5552_reg_read(SYS_CONF1_R); @@ -208,7 +208,7 @@ void hdl_cs5552_proc(void) case CS5552_OFFSET_READ: if(RESET == GET_CS5552_DOUT()) { - ad_value = hdl_cs5552_reg_read(0xFF); //获取数据 + ad_value = hdl_cs5552_reg_read(0xFF); //鑾峰彇鏁版嵁 if((ad_value & 0x1) == 0) { @@ -220,7 +220,7 @@ void hdl_cs5552_proc(void) cs5552.offset_ch1[offset_cnt] = (ad_value & 0xFFFFFFFE) | 0x0; } offset_cnt++; - cs5552.channel_sta = 1-cs5552.channel_sta; //切换通道 + cs5552.channel_sta = 1-cs5552.channel_sta; //鍒囨崲閫氶亾 cs5552.step = CS5552_OFFSET; } @@ -238,7 +238,7 @@ void hdl_cs5552_proc(void) if(RESET == GET_CS5552_DOUT()) { - ad_value = hdl_cs5552_reg_read(0xFF); //获取数据 + ad_value = hdl_cs5552_reg_read(0xFF); //鑾峰彇鏁版嵁 if((ad_value & 0x1) == 0) { @@ -256,7 +256,7 @@ void hdl_cs5552_proc(void) cs5552.buf[1] = ~(0x7FFFF - ((ad_value & 0xFFFFFFFE) >> 13)); } - cs5552.channel_sta = 1-cs5552.channel_sta; //切换通道 + cs5552.channel_sta = 1-cs5552.channel_sta; //鍒囨崲閫氶亾 cs5552.step = CS5552_START; } diff --git a/hdl/hdl_cs5552.h b/hdl/hdl_cs5552.h index 392d9b1..97cc181 100644 --- a/hdl/hdl_cs5552.h +++ b/hdl/hdl_cs5552.h @@ -93,11 +93,11 @@ typedef enum typedef struct { - en_cs5552_step step; //流程 - en_cs5552_ch channel_sta; //当前转换通道 - int32_t buf[2]; //通道数据 - uint32_t offset_ch0[OFFSET_CNT]; //通道0校准值 - uint32_t offset_ch1[OFFSET_CNT]; //通道1校准值 + en_cs5552_step step; //娴佺▼ + en_cs5552_ch channel_sta; //褰撳墠杞崲閫氶亾 + int32_t buf[2]; //閫氶亾鏁版嵁 + uint32_t offset_ch0[OFFSET_CNT]; //閫氶亾0鏍″噯鍊 + uint32_t offset_ch1[OFFSET_CNT]; //閫氶亾1鏍″噯鍊 }stc_cs5552_t; void hdl_cs5552_init(void); diff --git a/hdl/hdl_encoder.c b/hdl/hdl_encoder.c index 3b0bc18..326b44b 100644 --- a/hdl/hdl_encoder.c +++ b/hdl/hdl_encoder.c @@ -47,23 +47,23 @@ void hdl_encoder_init(void) LL_PERIPH_WE(LL_PERIPH_GPIO); - /* 配置引脚 */ + /* 閰嶇疆寮曡剼 */ (void)GPIO_StructInit(&stcGpioInit); - stcGpioInit.u16PullUp = PIN_PU_ON; //上拉输入 - stcGpioInit.u16ExtInt = PIN_EXTINT_ON; //外部中断 + stcGpioInit.u16PullUp = PIN_PU_ON; //涓婃媺杈撳叆 + stcGpioInit.u16ExtInt = PIN_EXTINT_ON; //澶栭儴涓柇 (void)GPIO_Init(ENCODER_SW_PORT, ENCODER_SW_PIN, &stcGpioInit); (void)GPIO_Init(ENCODER_A_PORT, ENCODER_A_PIN, &stcGpioInit); (void)GPIO_Init(ENCODER_B_PORT, ENCODER_B_PIN, &stcGpioInit); - /* 配置中断 */ + /* 閰嶇疆涓柇 */ (void)EXTINT_StructInit(&stcExtIntInit); stcExtIntInit.u32Filter = EXTINT_FILTER_ON; stcExtIntInit.u32FilterClock = EXTINT_FCLK_DIV8; - stcExtIntInit.u32Edge = EXTINT_TRIG_BOTH; //双边沿中断 + stcExtIntInit.u32Edge = EXTINT_TRIG_BOTH; //鍙岃竟娌夸腑鏂 (void)EXTINT_Init(ENCODER_A_EX_CH, &stcExtIntInit); (void)EXTINT_Init(ENCODER_B_EX_CH, &stcExtIntInit); - /* 配置中断源 */ + /* 閰嶇疆涓柇婧 */ stcIrqSignConfig.enIntSrc = ENCODER_A_INT_SRC; stcIrqSignConfig.enIRQn = ENCODER_A_INT_IRQn; stcIrqSignConfig.pfnCallback = &hdl_encoder_a_callback; diff --git a/hdl/hdl_flash.c b/hdl/hdl_flash.c index 7941087..9a4cdc9 100644 --- a/hdl/hdl_flash.c +++ b/hdl/hdl_flash.c @@ -58,7 +58,7 @@ int32_t hdl_flash_unlock(void) ; } - //解锁EFM + //瑙ｉ攣EFM EFM_FWMC_Cmd(ENABLE); EFM_CacheCmd(ENABLE); diff --git a/hdl/hdl_flash.h b/hdl/hdl_flash.h index 7872b57..af44aa7 100644 --- a/hdl/hdl_flash.h +++ b/hdl/hdl_flash.h @@ -53,7 +53,7 @@ extern "C" /* Vector table */ #define VECT_TAB_STEP (0x000UL) -/* flash rom map 存储分区*/ +/* flash rom map 瀛樺偍鍒嗗尯*/ //boot 16k #define FLASH_BOOT_BASE (FLASH_BASE) #define FLASH_BOOT_SIZE (4*FLASH_SECTOR_SIZE) diff --git a/hdl/hdl_lcd.c b/hdl/hdl_lcd.c index fbbe51e..3ec9d02 100644 --- a/hdl/hdl_lcd.c +++ b/hdl/hdl_lcd.c @@ -39,9 +39,9 @@ void hdl_lcd_timer_config(void) /* TIMER0 configuration */ (void)TMR0_StructInit(&stcTmr0Init); - stcTmr0Init.u32ClockSrc = TMR0_CLK_SRC_INTERN_CLK; //内部时钟 - stcTmr0Init.u32ClockDiv = TMR0_CLK_DIV64; //2分频 - stcTmr0Init.u32Func = TMR0_FUNC_CMP; //输出比较 + stcTmr0Init.u32ClockSrc = TMR0_CLK_SRC_INTERN_CLK; //鍐呴儴鏃堕挓 + stcTmr0Init.u32ClockDiv = TMR0_CLK_DIV64; //2鍒嗛 + stcTmr0Init.u32Func = TMR0_FUNC_CMP; //杈撳嚭姣旇緝 stcTmr0Init.u16CompareValue = (uint16_t)LCD_TIME_CMP_VALUE; (void)TMR0_Init(LCD_TIM_UINT, LCD_TIM_CH, &stcTmr0Init); hdl_delay_ms(1U); @@ -72,7 +72,7 @@ void hdl_lcd_config(void) LL_PERIPH_WE(LL_PERIPH_GPIO | LL_PERIPH_EFM | LL_PERIPH_FCG | LL_PERIPH_PWC_CLK_RMU | LL_PERIPH_SRAM); - /* 引脚设置 */ + /* 寮曡剼璁剧疆 */ GPIO_SetDebugPort(GPIO_PIN_TRST,DISABLE); (void)GPIO_StructInit(&stcGpioInit); @@ -87,7 +87,7 @@ void hdl_lcd_config(void) (void)GPIO_Init(LCD_RES_PORT, LCD_RES_PIN, &stcGpioInit); (void)GPIO_Init(LCD_DC_PORT, LCD_DC_PIN, &stcGpioInit); - /* SPI配置 */ + /* SPI閰嶇疆 */ FCG_Fcg1PeriphClockCmd(LCD_SPI_CLK, ENABLE); SPI_StructInit(&stcSpiInit); stcSpiInit.u32WireMode = SPI_3_WIRE; @@ -101,14 +101,14 @@ void hdl_lcd_config(void) stcSpiInit.u32FrameLevel = SPI_1_FRAME; (void)SPI_Init(LCD_SPI_UINT, &stcSpiInit); - /* DMA配置 */ + /* DMA閰嶇疆 */ FCG_Fcg0PeriphClockCmd(LCD_DMA_CLK, ENABLE); (void)DMA_StructInit(&stcDmaInit); stcDmaInit.u32BlockSize = 1UL; stcDmaInit.u32TransCount = 1; - stcDmaInit.u32DataWidth = DMA_DATAWIDTH_8BIT; //数据位宽 - stcDmaInit.u32SrcAddrInc = DMA_SRC_ADDR_INC; //源地址自增 - stcDmaInit.u32DestAddrInc = DMA_DEST_ADDR_FIX; //目标地址固定 + stcDmaInit.u32DataWidth = DMA_DATAWIDTH_8BIT; //鏁版嵁浣嶅 + stcDmaInit.u32SrcAddrInc = DMA_SRC_ADDR_INC; //婧愬湴鍧鑷 + stcDmaInit.u32DestAddrInc = DMA_DEST_ADDR_FIX; //鐩爣鍦板潃鍥哄畾 stcDmaInit.u32SrcAddr = (uint32_t)(0); stcDmaInit.u32DestAddr = (uint32_t)(&LCD_SPI_UINT->DR); stcDmaInit.u32IntEn = DMA_INT_ENABLE; @@ -116,9 +116,9 @@ void hdl_lcd_config(void) for (;;) { } } - AOS_SetTriggerEventSrc(LCD_DMA_TX_TRIG_CH, LCD_SPI_TX_EVT_SRC); //DMA发送触发源 + AOS_SetTriggerEventSrc(LCD_DMA_TX_TRIG_CH, LCD_SPI_TX_EVT_SRC); //DMA鍙戦佽Е鍙戞簮 - /* DMA 中断配置 */ + /* DMA 涓柇閰嶇疆 */ DMA_TransCompleteIntCmd(LCD_DMA_UNIT, DMA_INT_BTC_CH0, DISABLE); stcIrqSignConfig.enIntSrc = LCD_DMA_TX_INT_SRC; @@ -146,19 +146,19 @@ static void hdl_lcd_write_byte(uint8_t dat) void hdl_lcd_send(uint8_t *data, uint16_t len) { - LCD_DC_SET();//写数据 + LCD_DC_SET();//鍐欐暟鎹 enTxCompleteFlag = RESET; - DMA_SetSrcAddr(LCD_DMA_UNIT, LCD_DMA_TX_CH, (uint32_t)(data)); // 重新设置源地址和发送的数据 - DMA_SetTransCount(LCD_DMA_UNIT, LCD_DMA_TX_CH, len); //设置传输次数,传输一次，计数器减到0停止 + DMA_SetSrcAddr(LCD_DMA_UNIT, LCD_DMA_TX_CH, (uint32_t)(data)); // 閲嶆柊璁剧疆婧愬湴鍧鍜屽彂閫佺殑鏁版嵁 + DMA_SetTransCount(LCD_DMA_UNIT, LCD_DMA_TX_CH, len); //璁剧疆浼犺緭娆℃暟,浼犺緭涓娆★紝璁℃暟鍣ㄥ噺鍒0鍋滄 - DMA_ChCmd(LCD_DMA_UNIT, LCD_DMA_TX_CH, ENABLE); //使能DMA1通道 - SPI_Cmd(LCD_SPI_UINT, ENABLE); //使能SPI + DMA_ChCmd(LCD_DMA_UNIT, LCD_DMA_TX_CH, ENABLE); //浣胯兘DMA1閫氶亾 + SPI_Cmd(LCD_SPI_UINT, ENABLE); //浣胯兘SPI while (RESET == enTxCompleteFlag) { } - SPI_Cmd(LCD_SPI_UINT, DISABLE); //失能SPI + SPI_Cmd(LCD_SPI_UINT, DISABLE); //澶辫兘SPI } void hdl_lcd_dma_callback_register(lcd_dma_callback_t pCBS) @@ -178,70 +178,70 @@ void hdl_lcd_timer_callback_register(lcd_timer_callback_t pCBS) } /****************************************************************************** - 函数说明：LCD写入数据 - 入口数据：dat 写入的数据 - 返回值： 无 + 鍑芥暟璇存槑锛歀CD鍐欏叆鏁版嵁 + 鍏ュ彛鏁版嵁锛歞at 鍐欏叆鐨勬暟鎹 + 杩斿洖鍊硷細 鏃 ******************************************************************************/ void LCD_WR_DATA8(uint8_t dat) { - LCD_DC_SET();//写数据 + LCD_DC_SET();//鍐欐暟鎹 hdl_lcd_write_byte(dat); } /****************************************************************************** - 函数说明：LCD写入数据 - 入口数据：dat 写入的数据 - 返回值： 无 + 鍑芥暟璇存槑锛歀CD鍐欏叆鏁版嵁 + 鍏ュ彛鏁版嵁锛歞at 鍐欏叆鐨勬暟鎹 + 杩斿洖鍊硷細 鏃 ******************************************************************************/ void LCD_WR_DATA(uint16_t dat) { - LCD_DC_SET();//写数据 + LCD_DC_SET();//鍐欐暟鎹 hdl_lcd_write_byte(dat>>8); hdl_lcd_write_byte(dat); } /****************************************************************************** - 函数说明：LCD写入命令 - 入口数据：dat 写入的命令 - 返回值： 无 + 鍑芥暟璇存槑锛歀CD鍐欏叆鍛戒护 + 鍏ュ彛鏁版嵁锛歞at 鍐欏叆鐨勫懡浠 + 杩斿洖鍊硷細 鏃 ******************************************************************************/ void LCD_WR_REG(uint8_t dat) { - LCD_DC_CLR();//写命令 + LCD_DC_CLR();//鍐欏懡浠 hdl_lcd_write_byte(dat); } /****************************************************************************** - 函数说明：设置起始和结束地址 - 入口数据：x1,x2 设置列的起始和结束地址 - y1,y2 设置行的起始和结束地址 - 返回值： 无 + 鍑芥暟璇存槑锛氳缃捣濮嬪拰缁撴潫鍦板潃 + 鍏ュ彛鏁版嵁锛歺1,x2 璁剧疆鍒楃殑璧峰鍜岀粨鏉熷湴鍧 + y1,y2 璁剧疆琛岀殑璧峰鍜岀粨鏉熷湴鍧 + 杩斿洖鍊硷細 鏃 ******************************************************************************/ void LCD_Address_Set(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2) { - LCD_WR_REG(0x2a);//列地址设置 + LCD_WR_REG(0x2a);//鍒楀湴鍧璁剧疆 LCD_WR_DATA(x1); LCD_WR_DATA(x2); - LCD_WR_REG(0x2b);//行地址设置 + LCD_WR_REG(0x2b);//琛屽湴鍧璁剧疆 LCD_WR_DATA(y1); LCD_WR_DATA(y2); - LCD_WR_REG(0x2c);//储存器写 + LCD_WR_REG(0x2c);//鍌ㄥ瓨鍣ㄥ啓 } void hdl_lcd_fill(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint8_t *color) { - LCD_Address_Set(x1,y1,x2,y2);//设置显示范围 + LCD_Address_Set(x1,y1,x2,y2);//璁剧疆鏄剧ず鑼冨洿 hdl_lcd_send(color, (x2-x1+1)*(y2-y1+1)*2); } void LCD_DrawPoint(uint16_t x,uint16_t y,uint16_t color) { - LCD_Address_Set(x,y,x,y);//设置光标位置 + LCD_Address_Set(x,y,x,y);//璁剧疆鍏夋爣浣嶇疆 LCD_WR_DATA(color); } @@ -250,7 +250,7 @@ void hdl_lcd_init(void) hdl_lcd_config(); hdl_lcd_timer_config(); - LCD_RES_CLR();//复位 + LCD_RES_CLR();//澶嶄綅 hdl_delay_ms(100); LCD_RES_SET(); hdl_delay_ms(100); diff --git a/hdl/hdl_lcd.h b/hdl/hdl_lcd.h index 1052dce..5d6f605 100644 --- a/hdl/hdl_lcd.h +++ b/hdl/hdl_lcd.h @@ -6,7 +6,7 @@ #include "lvgl.h" -/* lcd刷屏定时器处理 */ +/* lcd鍒峰睆瀹氭椂鍣ㄥ鐞 */ #define LCD_TIM_UINT CM_TMR0_1 #define LCD_TIM_CLK FCG2_PERIPH_TMR0_1 #define LCD_TIM_CH TMR0_CH_B @@ -18,7 +18,7 @@ #define LCD_TIME_CMP_VALUE (1563) -#define USE_HORIZONTAL 0 //设置横屏或者竖屏显示 0或1为竖屏 2或3为横屏 +#define USE_HORIZONTAL 0 //璁剧疆妯睆鎴栬呯珫灞忔樉绀 0鎴1涓虹珫灞 2鎴3涓烘í灞 #define LCD_W 240 #define LCD_H 240 @@ -57,7 +57,7 @@ #define LCD_MOSI_Clr() GPIO_ResetPins(GPIO_PORT_B,GPIO_PIN_06)//SDA=MOSI #define LCD_MOSI_Set() GPIO_SetPins(GPIO_PORT_B,GPIO_PIN_06) -//画笔颜色 +//鐢荤瑪棰滆壊 #define WHITE 0xFFFF #define BLACK 0x0000 #define BLUE 0x001F @@ -69,16 +69,16 @@ #define GREEN 0x07E0 #define CYAN 0x7FFF #define YELLOW 0xFFE0 -#define BROWN 0XBC40 //棕色 -#define BRRED 0XFC07 //棕红色 -#define GRAY 0X8430 //灰色 -#define DARKBLUE 0X01CF //深蓝色 -#define LIGHTBLUE 0X7D7C //浅蓝色 -#define GRAYBLUE 0X5458 //灰蓝色 -#define LIGHTGREEN 0X841F //浅绿色 -#define LGRAY 0XC618 //浅灰色(PANNEL),窗体背景色 -#define LGRAYBLUE 0XA651 //浅灰蓝色(中间层颜色) -#define LBBLUE 0X2B12 //浅棕蓝色(选择条目的反色) +#define BROWN 0XBC40 //妫曡壊 +#define BRRED 0XFC07 //妫曠孩鑹 +#define GRAY 0X8430 //鐏拌壊 +#define DARKBLUE 0X01CF //娣辫摑鑹 +#define LIGHTBLUE 0X7D7C //娴呰摑鑹 +#define GRAYBLUE 0X5458 //鐏拌摑鑹 +#define LIGHTGREEN 0X841F //娴呯豢鑹 +#define LGRAY 0XC618 //娴呯伆鑹(PANNEL),绐椾綋鑳屾櫙鑹 +#define LGRAYBLUE 0XA651 //娴呯伆钃濊壊(涓棿灞傞鑹) +#define LBBLUE 0X2B12 //娴呮钃濊壊(閫夋嫨鏉＄洰鐨勫弽鑹) typedef void (*lcd_dma_callback_t)(void); typedef void (*lcd_timer_callback_t)(void); diff --git a/hdl/hdl_spi.c b/hdl/hdl_spi.c index 1b8d797..6d88da1 100644 --- a/hdl/hdl_spi.c +++ b/hdl/hdl_spi.c @@ -7,7 +7,7 @@ void hdl_spi1_init(void) LL_PERIPH_WE(LL_PERIPH_GPIO | LL_PERIPH_EFM | LL_PERIPH_FCG | LL_PERIPH_PWC_CLK_RMU | LL_PERIPH_SRAM); - /* 閰嶇疆SPI寮曡剼 */ + /* 闁板秶鐤哠PI瀵洝鍓 */ (void)GPIO_StructInit(&stcGpioInit); stcGpioInit.u16PinDrv = PIN_HIGH_DRV; @@ -21,20 +21,20 @@ void hdl_spi1_init(void) GPIO_SetFunc(SPI1_MOSI_PORT, SPI1_MOSI_PIN, SPI1_MOSI_FUNC); GPIO_SetFunc(SPI1_MISO_PORT, SPI1_MISO_PIN, SPI1_MISO_FUNC); - /* 閰嶇疆SPI鍙傛暟 */ + /* 闁板秶鐤哠PI閸欏倹鏆 */ SPI_StructInit(&stcSpiInit); FCG_Fcg1PeriphClockCmd(SPI1_CLOCK, ENABLE); - stcSpiInit.u32WireMode = SPI_3_WIRE; //3绾縎PI - stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //鍏ㄥ弻宸 - stcSpiInit.u32MasterSlave = SPI_MASTER; //涓绘満 - stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 绂佺敤妯″紡鏁呴殰妫娴 - stcSpiInit.u32Parity = SPI_PARITY_INVD; //鏃犲鍋舵牎楠 - stcSpiInit.u32SpiMode = SPI_MD_3; //SPI妯″紡3 - stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //棰勫垎棰 - stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //鏁版嵁瀹藉害 - stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB楂樹綅鏈夋晥 + stcSpiInit.u32WireMode = SPI_3_WIRE; //3缁剧笌PI + stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //閸忋劌寮诲? + stcSpiInit.u32MasterSlave = SPI_MASTER; //娑撶粯婧 + stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 缁備胶鏁ゅΟ鈥崇础閺佸懘娈板Λ鈧ù? + stcSpiInit.u32Parity = SPI_PARITY_INVD; //閺冪姴顨岄崑鑸电墡妤? + stcSpiInit.u32SpiMode = SPI_MD_3; //SPI濡崇础3 + stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //妫板嫬鍨庢０? + stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //閺佺増宓佺硅棄瀹 + stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB妤傛ü缍呴張澶嬫櫏 (void)SPI_Init(SPI1_INSTANCE, &stcSpiInit); SPI_Cmd(SPI1_INSTANCE, ENABLE); @@ -78,7 +78,7 @@ void hdl_spi2_init(void) LL_PERIPH_WE(LL_PERIPH_GPIO | LL_PERIPH_EFM | LL_PERIPH_FCG | LL_PERIPH_PWC_CLK_RMU | LL_PERIPH_SRAM); - /* 閰嶇疆SPI寮曡剼 */ + /* 闁板秶鐤哠PI瀵洝鍓 */ (void)GPIO_StructInit(&stcGpioInit); stcGpioInit.u16PinDrv = PIN_HIGH_DRV; @@ -92,20 +92,20 @@ void hdl_spi2_init(void) GPIO_SetFunc(SPI2_MOSI_PORT, SPI2_MOSI_PIN, SPI2_MOSI_FUNC); GPIO_SetFunc(SPI2_MISO_PORT, SPI2_MISO_PIN, SPI2_MISO_FUNC); - /* 閰嶇疆SPI鍙傛暟 */ + /* 闁板秶鐤哠PI閸欏倹鏆 */ SPI_StructInit(&stcSpiInit); FCG_Fcg1PeriphClockCmd(SPI2_CLOCK, ENABLE); - stcSpiInit.u32WireMode = SPI_3_WIRE; //3绾縎PI - stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //鍏ㄥ弻宸 - stcSpiInit.u32MasterSlave = SPI_MASTER; //涓绘満 - stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 绂佺敤妯″紡鏁呴殰妫娴 - stcSpiInit.u32Parity = SPI_PARITY_INVD; //鏃犲鍋舵牎楠 - stcSpiInit.u32SpiMode = SPI_MD_3; //SPI妯″紡3 - stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //棰勫垎棰 - stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //鏁版嵁瀹藉害 - stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB楂樹綅鏈夋晥 + stcSpiInit.u32WireMode = SPI_3_WIRE; //3缁剧笌PI + stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //閸忋劌寮诲? + stcSpiInit.u32MasterSlave = SPI_MASTER; //娑撶粯婧 + stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 缁備胶鏁ゅΟ鈥崇础閺佸懘娈板Λ鈧ù? + stcSpiInit.u32Parity = SPI_PARITY_INVD; //閺冪姴顨岄崑鑸电墡妤? + stcSpiInit.u32SpiMode = SPI_MD_3; //SPI濡崇础3 + stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //妫板嫬鍨庢０? + stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //閺佺増宓佺硅棄瀹 + stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB妤傛ü缍呴張澶嬫櫏 (void)SPI_Init(SPI2_INSTANCE, &stcSpiInit); SPI_Cmd(SPI2_INSTANCE, ENABLE); @@ -150,7 +150,7 @@ void hdl_spi3_init(void) LL_PERIPH_WE(LL_PERIPH_GPIO | LL_PERIPH_EFM | LL_PERIPH_FCG | LL_PERIPH_PWC_CLK_RMU | LL_PERIPH_SRAM); - /* 閰嶇疆SPI寮曡剼 */ + /* 闁板秶鐤哠PI瀵洝鍓 */ (void)GPIO_StructInit(&stcGpioInit); stcGpioInit.u16PinDrv = PIN_HIGH_DRV; @@ -164,20 +164,20 @@ void hdl_spi3_init(void) GPIO_SetFunc(SPI3_MOSI_PORT, SPI3_MOSI_PIN, SPI3_MOSI_FUNC); GPIO_SetFunc(SPI3_MISO_PORT, SPI3_MISO_PIN, SPI3_MISO_FUNC); - /* 閰嶇疆SPI鍙傛暟 */ + /* 闁板秶鐤哠PI閸欏倹鏆 */ SPI_StructInit(&stcSpiInit); FCG_Fcg1PeriphClockCmd(SPI3_CLOCK, ENABLE); - stcSpiInit.u32WireMode = SPI_3_WIRE; //3绾縎PI - stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //鍏ㄥ弻宸 - stcSpiInit.u32MasterSlave = SPI_MASTER; //涓绘満 - stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 绂佺敤妯″紡鏁呴殰妫娴 - stcSpiInit.u32Parity = SPI_PARITY_INVD; //鏃犲鍋舵牎楠 - stcSpiInit.u32SpiMode = SPI_MD_3; //SPI妯″紡3 - stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //棰勫垎棰 - stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //鏁版嵁瀹藉害 - stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB楂樹綅鏈夋晥 + stcSpiInit.u32WireMode = SPI_3_WIRE; //3缁剧笌PI + stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //閸忋劌寮诲? + stcSpiInit.u32MasterSlave = SPI_MASTER; //娑撶粯婧 + stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 缁備胶鏁ゅΟ鈥崇础閺佸懘娈板Λ鈧ù? + stcSpiInit.u32Parity = SPI_PARITY_INVD; //閺冪姴顨岄崑鑸电墡妤? + stcSpiInit.u32SpiMode = SPI_MD_3; //SPI濡崇础3 + stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //妫板嫬鍨庢０? + stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //閺佺増宓佺硅棄瀹 + stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB妤傛ü缍呴張澶嬫櫏 (void)SPI_Init(SPI3_INSTANCE, &stcSpiInit); SPI_Cmd(SPI3_INSTANCE, ENABLE); diff --git a/hdl/hdl_spi4.c b/hdl/hdl_spi4.c index 0db8068..132abcc 100644 --- a/hdl/hdl_spi4.c +++ b/hdl/hdl_spi4.c @@ -7,7 +7,7 @@ void hdl_spi4_init(void) LL_PERIPH_WE(LL_PERIPH_GPIO | LL_PERIPH_EFM | LL_PERIPH_FCG | LL_PERIPH_PWC_CLK_RMU | LL_PERIPH_SRAM); - /* 閰嶇疆SPI寮曡剼 */ + /* 闁板秶鐤哠PI瀵洝鍓 */ (void)GPIO_StructInit(&stcGpioInit); stcGpioInit.u16PinDrv = PIN_HIGH_DRV; @@ -21,20 +21,20 @@ void hdl_spi4_init(void) GPIO_SetFunc(SPI4_MOSI_PORT, SPI4_MOSI_PIN, SPI4_MOSI_FUNC); GPIO_SetFunc(SPI4_MISO_PORT, SPI4_MISO_PIN, SPI4_MISO_FUNC); - /* 閰嶇疆SPI鍙傛暟 */ + /* 闁板秶鐤哠PI閸欏倹鏆 */ SPI_StructInit(&stcSpiInit); FCG_Fcg1PeriphClockCmd(SPI4_CLOCK, ENABLE); - stcSpiInit.u32WireMode = SPI_3_WIRE; //3绾縎PI - stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //鍏ㄥ弻宸 - stcSpiInit.u32MasterSlave = SPI_MASTER; //涓绘満 - stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 绂佺敤妯″紡鏁呴殰妫娴 - stcSpiInit.u32Parity = SPI_PARITY_INVD; //鏃犲鍋舵牎楠 - stcSpiInit.u32SpiMode = SPI_MD_3; //SPI妯″紡3 - stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //棰勫垎棰 - stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //鏁版嵁瀹藉害 - stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB楂樹綅鏈夋晥 + stcSpiInit.u32WireMode = SPI_3_WIRE; //3缁剧笌PI + stcSpiInit.u32TransMode = SPI_FULL_DUPLEX; //閸忋劌寮诲? + stcSpiInit.u32MasterSlave = SPI_MASTER; //娑撶粯婧 + stcSpiInit.u32ModeFaultDetect = SPI_MD_FAULT_DETECT_DISABLE; // 缁備胶鏁ゅΟ鈥崇础閺佸懘娈板Λ鈧ù? + stcSpiInit.u32Parity = SPI_PARITY_INVD; //閺冪姴顨岄崑鑸电墡妤? + stcSpiInit.u32SpiMode = SPI_MD_3; //SPI濡崇础3 + stcSpiInit.u32BaudRatePrescaler = SPI_BR_CLK_DIV64; //妫板嫬鍨庢０? + stcSpiInit.u32DataBits = SPI_DATA_SIZE_8BIT; //閺佺増宓佺硅棄瀹 + stcSpiInit.u32FirstBit = SPI_FIRST_MSB; //MSB妤傛ü缍呴張澶嬫櫏 (void)SPI_Init(SPI4_INSTANCE, &stcSpiInit); SPI_Cmd(SPI4_INSTANCE, ENABLE); diff --git a/hdl/hdl_usart.c b/hdl/hdl_usart.c index 18cedcd..c45318c 100644 --- a/hdl/hdl_usart.c +++ b/hdl/hdl_usart.c @@ -6,11 +6,11 @@ #include "hdl_usart.h" -//瀹氫箟鏁版嵁鑾峰彇鍥炶皟鍑芥暟 +//鐎规矮绠熼弫鐗堝祦閼惧嘲褰囬崶鐐剁殶閸戣姤鏆 static hdl_debug_uart_rx_cb_t debug_rx_callback_cbs; static com_rx_callback com_rx_callback_cbs; -//鎺ユ敹涓柇 +//閹恒儲鏁规稉顓熸焽 static void COM_Rx_IrqCallback(void); static void COM_RxErr_IrqCallback(void); @@ -25,7 +25,7 @@ static void INTC_IrqInstalHandler(const stc_irq_signin_config_t* pstcConfig, uin } } -//璋冭瘯涓插彛 +//鐠嬪啳鐦稉鎻掑經 static void DEBUG_RxErr_IrqCallback(void) { (void)USART_ReadData(DEBUG_UART); @@ -80,7 +80,7 @@ void hdl_debug_uart_init(void) stcUartInit.u32OverSampleBit = USART_OVER_SAMPLE_8BIT; USART_UART_Init(DEBUG_UART, &stcUartInit, NULL); - //鎺ユ敹涓柇閰嶇疆 + //閹恒儲鏁规稉顓熸焽闁板秶鐤 stc_irq_signin_config_t stcIrqSigninConfig; stcIrqSigninConfig.enIRQn = DEBUG_UART_INT_EI_IRQ; stcIrqSigninConfig.enIntSrc = DEBUG_UART_INT_EI; @@ -127,7 +127,7 @@ int hdl_debug_uart_getc(int *ch) } -//閫氫俊妯″潡涓插彛鍒濆鍖 +//闁矮淇婂Ο鈥虫健娑撴彃褰涢崚婵嗩潗閸? void hdl_com_uart_init(void) { stc_usart_uart_init_t stcUartInit={0}; @@ -149,7 +149,7 @@ void hdl_com_uart_init(void) stcUartInit.u32OverSampleBit = USART_OVER_SAMPLE_8BIT; USART_UART_Init(COM_UART, &stcUartInit, NULL); - //鎺ユ敹涓柇閰嶇疆 + //閹恒儲鏁规稉顓熸焽闁板秶鐤 stcIrqSigninConfig.enIRQn = COM_INT_EI_IRQ; stcIrqSigninConfig.enIntSrc = COM_INT_EI; stcIrqSigninConfig.pfnCallback = &COM_RxErr_IrqCallback; @@ -167,7 +167,7 @@ void hdl_com_uart_init(void) } -//閫氫俊鍙戦佹暟鎹 +//闁矮淇婇崣鎴︹偓浣规殶閹? void hdl_com_uart_send(uint8_t* w_buf, uint16_t len) { uint8_t i; @@ -180,7 +180,7 @@ void hdl_com_uart_send(uint8_t* w_buf, uint16_t len) } } -//閫氫俊鍥炶皟鍑芥暟娉ㄥ唽 +//闁矮淇婇崶鐐剁殶閸戣姤鏆熷▔銊ュ斀 void hdl_com_uart_rx_register(com_rx_callback pCBS) { if (com_rx_callback_cbs == 0) @@ -189,7 +189,7 @@ void hdl_com_uart_rx_register(com_rx_callback pCBS) } } -//閫氫俊鎺ユ敹涓柇 +//闁矮淇婇幒銉︽暪娑擃厽鏌 static void COM_Rx_IrqCallback(void) { uint8_t r_data = 0; diff --git a/hdl/hdl_usb.c b/hdl/hdl_usb.c index c4f7148..2a6b6d9 100644 --- a/hdl/hdl_usb.c +++ b/hdl/hdl_usb.c @@ -15,7 +15,7 @@ void hdl_usb_init(void) LL_PERIPH_WE(LL_PERIPH_EFM | LL_PERIPH_FCG | LL_PERIPH_GPIO | LL_PERIPH_PWC_CLK_RMU | LL_PERIPH_SRAM); - /* 鏃堕挓閰嶇疆 */ + /* 閺冨爼鎸撻柊宥囩枂 */ (void)CLK_PLLxStructInit(&stcUpllInit); stcUpllInit.u8PLLState = CLK_PLLX_ON; stcUpllInit.PLLCFGR = 0UL; @@ -27,7 +27,7 @@ void hdl_usb_init(void) (void)CLK_PLLxInit(&stcUpllInit); CLK_SetUSBClockSrc(CLK_USBCLK_PLLXP); - /* 寮曡剼閰嶇疆 */ + /* 瀵洝鍓奸柊宥囩枂 */ (void)GPIO_StructInit(&stcGpioCfg); stcGpioCfg.u16PinAttr = PIN_ATTR_ANALOG; @@ -38,10 +38,10 @@ void hdl_usb_init(void) // GPIO_SetFunc(USB_VBUS_PORT, USB_VBUS_PIN, GPIO_FUNC_10); /* VBUS */ FCG_Fcg1PeriphClockCmd(FCG1_PERIPH_USBFS, ENABLE); - /* 涓柇閰嶇疆 */ + /* 娑擃厽鏌囬柊宥囩枂 */ stcIrqRegiConf.enIRQn = INT030_IRQn; stcIrqRegiConf.enIntSrc = INT_SRC_USBFS_GLB; - stcIrqRegiConf.pfnCallback = &USB_IRQ_Handler; // 娣诲姞涓柇鍑芥暟 + stcIrqRegiConf.pfnCallback = &USB_IRQ_Handler; // 濞ｈ濮炴稉顓熸焽閸戣姤鏆 (void)INTC_IrqSignIn(&stcIrqRegiConf); NVIC_ClearPendingIRQ(stcIrqRegiConf.enIRQn); NVIC_SetPriority(stcIrqRegiConf.enIRQn, DDL_IRQ_PRIO_15); diff --git a/pthreads/pt_pm.c b/pthreads/pt_pm.c index b799e4d..8c15ed5 100644 --- a/pthreads/pt_pm.c +++ b/pthreads/pt_pm.c @@ -5,15 +5,15 @@ #include "stdio.h" -// 绯荤粺绌洪棽鏉′欢 +// 缁崵绮虹粚娲＝閺夆叉 #define SYSTEM_IS_IDLE() (ALL_TASKS_IDLE()) -#define DEEP_SLEEP_THRESHOLD 5 // 杩涘叆娣卞害浼戠湢鐨勭┖闂茶鏁伴槇鍊 +#define DEEP_SLEEP_THRESHOLD 5 // 鏉╂稑鍙嗗ǎ鍗炲娴兼垹婀㈤惃鍕敄闂傝尪顓搁弫浼存閸? static struct { pm_adapter_t default_adapter; pt_t pt; - pm_mode_t current_mode; // 褰撳墠鍔熻楁ā寮 - uint32_t ref_count[PM_SLEEP_MODE_MAX]; // 寮曠敤璁℃暟鏁扮粍 + pm_mode_t current_mode; // 瑜版挸澧犻崝鐔烩偓妤伳佸? + uint32_t ref_count[PM_SLEEP_MODE_MAX]; // 瀵洜鏁ょ拋鈩冩殶閺佹壆绮 } pm; static bool system_is_idle(void) @@ -22,13 +22,13 @@ static bool system_is_idle(void) } /* -鍔熻楃鐞嗭細閬嶅巻鎵鏈変换鍔＄姸鎬侊紝鐒跺悗鏍规嵁鐢ㄤ簬璇锋眰鐨勫姛鑰楁ā寮忥紝璋冪敤閫傞厤鍣ㄦ帴鍙ｏ紝璋冩暣MCU鐨勮繍琛屾ā寮 +閸旂喕鈧顓搁悶鍡窗闁秴宸婚幍鈧張澶夋崲閸旓紕濮搁幀渚婄礉閻掕泛鎮楅弽瑙勫祦閻€劋绨拠閿嬬湴閻ㄥ嫬濮涢懓妤伳佸蹇ョ礉鐠嬪啰鏁ら柅鍌炲帳閸ｃ劍甯撮崣锝忕礉鐠嬪啯鏆CU閻ㄥ嫯绻嶇悰灞灸佸? */ static void pt_pm_handler(void) { if (system_is_idle()) { - // 鍒囨崲鍒颁笅涓涓彲鐢ㄧ殑鍔熻楁ā寮 + // 閸掑洦宕查崚棰佺瑓娑撯偓娑擃亜褰查悽銊ф畱閸旂喕鈧膩瀵? pm_mode_t next_mode = PM_SLEEP_MODE_NONE; for (pm_mode_t m = PM_SLEEP_MODE_NONE; m < PM_SLEEP_MODE_MAX; m++) { if (pm.ref_count[m] > 0 ) { @@ -43,7 +43,7 @@ static void pt_pm_handler(void) { } else { - pt_pm_release(PM_SLEEP_MODE_NONE); // 鍞ら啋绯荤粺 + pt_pm_release(PM_SLEEP_MODE_NONE); // 閸炪倝鍟嬬化鑽ょ埠 if (pm.default_adapter.wakeup) { pm.default_adapter.wakeup(); @@ -55,7 +55,7 @@ static void pt_pm_handler(void) { void pt_pm_adapter_init(pm_adapter_t *adapter) { if (adapter) { - pm.default_adapter = *adapter; // 澶嶅埗鏁翠釜缁撴瀯浣 + pm.default_adapter = *adapter; // 婢跺秴鍩楅弫缈犻嚋缂佹挻鐎担? } else { pm.default_adapter.sleep = 0; pm.default_adapter.wakeup = 0; @@ -74,7 +74,7 @@ int pt_task_pm(void) { while (1) { - pt_pm_handler(); // 澶勭悊鍔熻楃姸鎬 + pt_pm_handler(); // 婢跺嫮鎮婇崝鐔烩偓妤冨Ц閹? PT_DELAY_MS(&pm.pt, system_is_idle() ? 1000 : 100); } @@ -83,23 +83,23 @@ int pt_task_pm(void) { } /* -璇锋眰鍔熻楁ā寮忥細寮曠敤璁℃暟鑷锛屽鏋滀负1锛屽垯璋冪敤閫傞厤鍣ㄦ帴鍙ｏ紝璋冩暣MCU鐨勮繍琛屾ā寮 +鐠囬攱鐪伴崝鐔烩偓妤伳佸蹇ョ窗瀵洜鏁ょ拋鈩冩殶閼奉亜顤冮敍灞筋洤閺嬫粈璐1閿涘苯鍨拫鍐暏闁倿鍘ら崳銊﹀复閸欙綇绱濈拫鍐╂殻MCU閻ㄥ嫯绻嶇悰灞灸佸? */ void pt_pm_request(pm_mode_t mode) { if (mode >= PM_SLEEP_MODE_MAX) { - return; // 鏃犳晥妯″紡 + return; // 閺冪姵鏅ュΟ鈥崇础 } - pm.ref_count[mode]++; // 浠呮搷浣滃紩鐢ㄨ鏁 + pm.ref_count[mode]++; // 娴犲懏鎼锋担婊冪穿閻€劏顓搁弫? } /* -閲婃斁鍔熻楁ā寮忥細寮曠敤璁℃暟鑷噺锛屽鏋滀负0锛屽垯璋冪敤閫傞厤鍣ㄦ帴鍙ｏ紝璋冩暣MCU鐨勮繍琛屾ā寮 +闁插﹥鏂侀崝鐔烩偓妤伳佸蹇ョ窗瀵洜鏁ょ拋鈩冩殶閼奉亜鍣洪敍灞筋洤閺嬫粈璐0閿涘苯鍨拫鍐暏闁倿鍘ら崳銊﹀复閸欙綇绱濈拫鍐╂殻MCU閻ㄥ嫯绻嶇悰灞灸佸? */ void pt_pm_release(pm_mode_t mode) { if (mode >= PM_SLEEP_MODE_MAX) { - return; // 鏃犳晥妯″紡 + return; // 閺冪姵鏅ュΟ鈥崇础 } if (pm.ref_count[mode] > 0) { - pm.ref_count[mode]--; // 浠呮搷浣滃紩鐢ㄨ鏁 + pm.ref_count[mode]--; // 娴犲懏鎼锋担婊冪穿閻€劏顓搁弫? } }