diff --git a/demo/env/stm32f10x/non_os_spi_flash/app/src/app.c b/demo/env/stm32f10x/non_os_spi_flash/app/src/app.c index 8a4f127..4185192 100644 --- a/demo/env/stm32f10x/non_os_spi_flash/app/src/app.c +++ b/demo/env/stm32f10x/non_os_spi_flash/app/src/app.c @@ -6,21 +6,21 @@ static void test_env(void); int main(void){ - + BSP_Init(); - + if (easyflash_init() == EF_NO_ERR) { /* test Env demo */ test_env(); - } + } while(1) { LED_RUN_ON; delay(6000000); LED_RUN_OFF; - delay(6000000); + delay(6000000); } - + return 0; } diff --git a/demo/env/stm32f10x/non_os_spi_flash/components/easyflash/port/ef_port.c b/demo/env/stm32f10x/non_os_spi_flash/components/easyflash/port/ef_port.c index 4e12a8d..6651456 100644 --- a/demo/env/stm32f10x/non_os_spi_flash/components/easyflash/port/ef_port.c +++ b/demo/env/stm32f10x/non_os_spi_flash/components/easyflash/port/ef_port.c @@ -96,10 +96,10 @@ EfErrCode ef_port_erase(uint32_t addr, size_t size) { EfErrCode result = EF_NO_ERR; sfud_err sfud_result = SFUD_SUCCESS; const sfud_flash *flash = sfud_get_device_table() + SFUD_SST25_DEVICE_INDEX; - + /* make sure the start address is a multiple of FLASH_ERASE_MIN_SIZE */ EF_ASSERT(addr % EF_ERASE_MIN_SIZE == 0); - + sfud_result = sfud_erase(flash, addr, size); if(sfud_result != SFUD_SUCCESS) { diff --git a/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.c b/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.c index d05d344..d110253 100644 --- a/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.c +++ b/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.c @@ -32,20 +32,20 @@ */ static void RCC_Configuration(void) { - //下面是给各模块开启时钟 - //启动GPIO + //涓嬮潰鏄粰鍚勬ā鍧楀紑鍚椂閽 + //鍚姩GPIO RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA | RCC_APB2Periph_GPIOB | \ RCC_APB2Periph_GPIOC | RCC_APB2Periph_GPIOD | \ RCC_APB2Periph_GPIOE | RCC_APB2Periph_GPIOG, ENABLE); - //启动AFIO + //鍚姩AFIO RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE); - //启动USART1时钟 + //鍚姩USART1鏃堕挓 RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); - //启动USART2时钟 + //鍚姩USART2鏃堕挓 RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); - //启动DMA时钟 + //鍚姩DMA鏃堕挓 RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE); /* Enable ADC1 and GPIOC clock */ RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE); @@ -95,13 +95,13 @@ static void GPIO_Configuration(void) GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_Init(GPIOB, &GPIO_InitStructure); - + /* USART1_TX */ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_Init(GPIOA, &GPIO_InitStructure); - + /* USART1_RX */ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_10; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING; @@ -118,7 +118,7 @@ static void GPIO_Configuration(void) void USART1_Configuration(void) { USART_InitTypeDef USART_InitStructure; - + USART_InitStructure.USART_BaudRate = 115200; USART_InitStructure.USART_WordLength = USART_WordLength_8b; USART_InitStructure.USART_StopBits = USART_StopBits_1; @@ -126,14 +126,14 @@ void USART1_Configuration(void) USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None; USART_InitStructure.USART_Mode = USART_Mode_Tx | USART_Mode_Rx; USART_Init(USART1, &USART_InitStructure); - + USART_Cmd(USART1, ENABLE); } /** * IWDG_Configuration */ -static void IWDG_Configuration(void) +static void IWDG_Configuration(void) { IWDG_WriteAccessCmd(IWDG_WriteAccess_Enable); IWDG_SetPrescaler(IWDG_Prescaler_64); @@ -161,12 +161,12 @@ int fputc(int ch, FILE *f) int fgetc(FILE *f) { - + while(!(USART_GetFlagStatus(USART1, USART_FLAG_RXNE) == SET)) { } - - + + return (USART_ReceiveData(USART1)); } diff --git a/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.h b/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.h index 54a1ae8..b5386cd 100644 --- a/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.h +++ b/demo/env/stm32f10x/non_os_spi_flash/components/others/bsp.h @@ -26,38 +26,38 @@ */ /* board configuration */ // SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card -// Default: 1 -#define STM32_USE_SDIO 0 +// Default: 1 +#define STM32_USE_SDIO 0 /* whether use board external SRAM memory */ // Use external SRAM memory on the board -// Enable External SRAM memory +// Enable External SRAM memory #define STM32_EXT_SRAM 0 -// Begin Address of External SRAM -// Default: 0x68000000 +// Begin Address of External SRAM +// Default: 0x68000000 #define STM32_EXT_SRAM_BEGIN 0x68000000 /* the begining address of external SRAM */ -// End Address of External SRAM -// Default: 0x68080000 +// End Address of External SRAM +// Default: 0x68080000 #define STM32_EXT_SRAM_END 0x68080000 /* the end address of external SRAM */ // // Internal SRAM memory size[Kbytes] <8-64> -// Default: 64 +// Default: 64 #define STM32_SRAM_SIZE 64 #define STM32_SRAM_END (SRAM_BASE + STM32_SRAM_SIZE * 1024) #define VECT_TAB_FLASH /* use Flash to store vector table */ -#define LED_RUN_ON GPIO_SetBits (GPIOB,GPIO_Pin_5) //RUN -#define LED_RUN_OFF GPIO_ResetBits(GPIOB,GPIO_Pin_5) //RUN +#define LED_RUN_ON GPIO_SetBits (GPIOB,GPIO_Pin_5) //RUN +#define LED_RUN_OFF GPIO_ResetBits(GPIOB,GPIO_Pin_5) //RUN /*********************************************************************************************************/ -/** MACRO'S */ +/** MACRO'S */ /***********************************************************************************************************/ /***********************************************************************************************************/ -/* DATA TYPES */ +/* DATA TYPES */ /***********************************************************************************************************/ diff --git a/demo/env/stm32f10x/non_os_spi_flash/components/others/types.h b/demo/env/stm32f10x/non_os_spi_flash/components/others/types.h index 72fff45..380f6cc 100644 --- a/demo/env/stm32f10x/non_os_spi_flash/components/others/types.h +++ b/demo/env/stm32f10x/non_os_spi_flash/components/others/types.h @@ -7,15 +7,15 @@ typedef int bool_t; /**< boolean type */ #ifndef TRUE - #define TRUE 1 + #define TRUE 1 #endif #ifndef FALSE - #define FALSE 0 + #define FALSE 0 #endif #ifndef NULL - #define NULL 0 + #define NULL 0 #endif #define success 0 diff --git a/demo/env/stm32f10x/non_os_spi_flash/components/sfud/port/sfud_port.c b/demo/env/stm32f10x/non_os_spi_flash/components/sfud/port/sfud_port.c index 8b605fc..75fe117 100644 --- a/demo/env/stm32f10x/non_os_spi_flash/components/sfud/port/sfud_port.c +++ b/demo/env/stm32f10x/non_os_spi_flash/components/sfud/port/sfud_port.c @@ -74,16 +74,16 @@ static void gpio_configuration(spi_user_data_t spi) { static void spi_configuration(spi_user_data_t spi) { SPI_InitTypeDef SPI_InitStructure; - SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; //SPI 设置为双线双向全双工 - SPI_InitStructure.SPI_Mode = SPI_Mode_Master; //设置为主 SPI - SPI_InitStructure.SPI_DataSize = SPI_DataSize_8b; //SPI 发送接收 8 位帧结构 - SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low; //时钟悬空低 - SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge; //数据捕获于第一个时钟沿 - //TODO 以后可以尝试硬件 CS - SPI_InitStructure.SPI_NSS = SPI_NSS_Soft; //内部 NSS 信号由 SSI 位控制 - SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_2; //波特率预分频值为 2 - SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; //数据传输从 MSB 位开始 - SPI_InitStructure.SPI_CRCPolynomial = 7; // CRC 值计算的多项式 + SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; //SPI 璁剧疆涓哄弻绾垮弻鍚戝叏鍙屽伐 + SPI_InitStructure.SPI_Mode = SPI_Mode_Master; //璁剧疆涓轰富 SPI + SPI_InitStructure.SPI_DataSize = SPI_DataSize_8b; //SPI 鍙戦佹帴鏀 8 浣嶅抚缁撴瀯 + SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low; //鏃堕挓鎮┖浣 + SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge; //鏁版嵁鎹曡幏浜庣涓涓椂閽熸部 + //TODO 浠ュ悗鍙互灏濊瘯纭欢 CS + SPI_InitStructure.SPI_NSS = SPI_NSS_Soft; //鍐呴儴 NSS 淇″彿鐢 SSI 浣嶆帶鍒 + SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_2; //娉㈢壒鐜囬鍒嗛鍊间负 2 + SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; //鏁版嵁浼犺緭浠 MSB 浣嶅紑濮 + SPI_InitStructure.SPI_CRCPolynomial = 7; // CRC 鍊艰绠楃殑澶氶」寮 SPI_I2S_DeInit(spi->spix); SPI_Init(spi->spix, &SPI_InitStructure); @@ -117,15 +117,15 @@ static sfud_err spi_write_read(const sfud_spi *spi, const uint8_t *write_buf, si } GPIO_ResetBits(spi_dev->cs_gpiox, spi_dev->cs_gpio_pin); - /* 开始读写数据 */ + /* 寮濮嬭鍐欐暟鎹 */ for (size_t i = 0, retry_times; i < write_size + read_size; i++) { - /* 先写缓冲区中的数据到 SPI 总线，数据写完后，再写 dummy(0xFF) 到 SPI 总线 */ + /* 鍏堝啓缂撳啿鍖轰腑鐨勬暟鎹埌 SPI 鎬荤嚎锛屾暟鎹啓瀹屽悗锛屽啀鍐 dummy(0xFF) 鍒 SPI 鎬荤嚎 */ if (i < write_size) { send_data = *write_buf++; } else { send_data = SFUD_DUMMY_DATA; } - /* 发送数据 */ + /* 鍙戦佹暟鎹 */ retry_times = 1000; while (SPI_I2S_GetFlagStatus(spi_dev->spix, SPI_I2S_FLAG_TXE) == RESET) { SFUD_RETRY_PROCESS(NULL, retry_times, result); @@ -134,7 +134,7 @@ static sfud_err spi_write_read(const sfud_spi *spi, const uint8_t *write_buf, si goto exit; } SPI_I2S_SendData(spi_dev->spix, send_data); - /* 接收数据 */ + /* 鎺ユ敹鏁版嵁 */ retry_times = 1000; while (SPI_I2S_GetFlagStatus(spi_dev->spix, SPI_I2S_FLAG_RXNE) == RESET) { SFUD_RETRY_PROCESS(NULL, retry_times, result); @@ -143,7 +143,7 @@ static sfud_err spi_write_read(const sfud_spi *spi, const uint8_t *write_buf, si goto exit; } read_data = SPI_I2S_ReceiveData(spi_dev->spix); - /* 写缓冲区中的数据发完后，再读取 SPI 总线中的数据到读缓冲区 */ + /* 鍐欑紦鍐插尯涓殑鏁版嵁鍙戝畬鍚庯紝鍐嶈鍙 SPI 鎬荤嚎涓殑鏁版嵁鍒拌缂撳啿鍖 */ if (i >= write_size) { *read_buf++ = read_data; } @@ -167,13 +167,13 @@ sfud_err sfud_spi_port_init(sfud_flash *flash) { switch (flash->index) { case SFUD_SST25_DEVICE_INDEX: { - /* RCC 初始化 */ + /* RCC 鍒濆鍖 */ rcc_configuration(&spi1); - /* GPIO 初始化 */ + /* GPIO 鍒濆鍖 */ gpio_configuration(&spi1); - /* SPI 外设初始化 */ + /* SPI 澶栬鍒濆鍖 */ spi_configuration(&spi1); - /* 同步 Flash 移植所需的接口及数据 */ + /* 鍚屾 Flash 绉绘鎵闇鐨勬帴鍙ｅ強鏁版嵁 */ flash->spi.wr = spi_write_read; flash->spi.lock = spi_lock; flash->spi.unlock = spi_unlock; diff --git a/demo/env/stm32f10x/non_os_spi_flash/components/sfud/src/sfud_sfdp.c b/demo/env/stm32f10x/non_os_spi_flash/components/sfud/src/sfud_sfdp.c index 95157e6..98a5922 100644 --- a/demo/env/stm32f10x/non_os_spi_flash/components/sfud/src/sfud_sfdp.c +++ b/demo/env/stm32f10x/non_os_spi_flash/components/sfud/src/sfud_sfdp.c @@ -223,7 +223,7 @@ static bool read_basic_table(sfud_flash *flash, sfdp_para_header *basic_header) return false; } /* get write granularity */ - //TODO 目前为 1.0 所提供的方式，后期支持 V1.5 及以上的方式读取 page size + //TODO 鐩墠涓 1.0 鎵鎻愪緵鐨勬柟寮忥紝鍚庢湡鏀寔 V1.5 鍙婁互涓婄殑鏂瑰紡璇诲彇 page size switch ((table[0] & (0x01 << 2)) >> 2) { case 0: sfdp->write_gran = 1; diff --git a/demo/env/stm32f10x/rtt/app/inc/app_task.h b/demo/env/stm32f10x/rtt/app/inc/app_task.h index 60a51f4..40eb523 100644 --- a/demo/env/stm32f10x/rtt/app/inc/app_task.h +++ b/demo/env/stm32f10x/rtt/app/inc/app_task.h @@ -4,7 +4,7 @@ #ifndef APP_TASK_H #define APP_TASK_H -#include +#include #include #include diff --git a/demo/env/stm32f10x/rtt/app/inc/delay_conf.h b/demo/env/stm32f10x/rtt/app/inc/delay_conf.h index 36c376b..39b060a 100644 --- a/demo/env/stm32f10x/rtt/app/inc/delay_conf.h +++ b/demo/env/stm32f10x/rtt/app/inc/delay_conf.h @@ -4,29 +4,29 @@ #include"rtconfig.h" #if RT_TICK_PER_SECOND == 1 -#define DELAY_1S (RT_TICK_PER_SECOND) -#define DELAY_S(X) (X*DELAY_1S) +#define DELAY_1S (RT_TICK_PER_SECOND) +#define DELAY_S(X) (X*DELAY_1S) -#elif RT_TICK_PER_SECOND == 10 -#define DELAY_100MS(X) (X) -#define DELAY_S(X) (X*10) +#elif RT_TICK_PER_SECOND == 10 +#define DELAY_100MS(X) (X) +#define DELAY_S(X) (X*10) -#elif RT_TICK_PER_SECOND == 100 -#define DELAY_10MS(X) (X) -#define DELAY_100MS(X) (X*10) -#define DELAY_S(X) (X*100) +#elif RT_TICK_PER_SECOND == 100 +#define DELAY_10MS(X) (X) +#define DELAY_100MS(X) (X*10) +#define DELAY_S(X) (X*100) #elif (RT_TICK_PER_SECOND == 1000) -#define DELAY_1MS (RT_TICK_PER_SECOND/1000) +#define DELAY_1MS (RT_TICK_PER_SECOND/1000) #define DELAY_MS(X) (X*DELAY_1MS) -#define DELAY_S(X) (X*1000*DELAY_1MS) +#define DELAY_S(X) (X*1000*DELAY_1MS) #elif (RT_TICK_PER_SECOND == 10000) #define DELAY_100US(X) (X*RT_TICK_PER_SECOND/10000) -#define DELAY_1MS (RT_TICK_PER_SECOND/1000) +#define DELAY_1MS (RT_TICK_PER_SECOND/1000) #define DELAY_MS(X) (X*DELAY_1MS) -#define DELAY_S(X) (X*1000*DELAY_1MS) +#define DELAY_S(X) (X*1000*DELAY_1MS) #endif @@ -37,5 +37,5 @@ #define DELAY_SYS_FAULT_LED_ON DELAY_MS(50) #define DELAY_SYS_FAULT_LED_OFF DELAY_MS(950) -#endif +#endif diff --git a/demo/env/stm32f10x/rtt/app/inc/rtconfig.h b/demo/env/stm32f10x/rtt/app/inc/rtconfig.h index 8db10fd..6de5516 100644 --- a/demo/env/stm32f10x/rtt/app/inc/rtconfig.h +++ b/demo/env/stm32f10x/rtt/app/inc/rtconfig.h @@ -3,16 +3,16 @@ #define __RTTHREAD_CFG_H__ /* RT_NAME_MAX*/ -#define RT_NAME_MAX 24 +#define RT_NAME_MAX 24 /* RT_ALIGN_SIZE*/ -#define RT_ALIGN_SIZE 8 +#define RT_ALIGN_SIZE 8 /* PRIORITY_MAX */ -#define RT_THREAD_PRIORITY_MAX 32 +#define RT_THREAD_PRIORITY_MAX 32 /* Tick per Second */ -#define RT_TICK_PER_SECOND 10000 //0.1ms +#define RT_TICK_PER_SECOND 10000 //0.1ms /* SECTION: RT_DEBUG */ /* Thread Debug */ @@ -26,9 +26,9 @@ /* Using Software Timer */ /* #define RT_USING_TIMER_SOFT */ -#define RT_TIMER_THREAD_PRIO 4 -#define RT_TIMER_THREAD_STACK_SIZE 512 -#define RT_TIMER_TICK_PER_SECOND 1000 +#define RT_TIMER_THREAD_PRIO 4 +#define RT_TIMER_THREAD_STACK_SIZE 512 +#define RT_TIMER_TICK_PER_SECOND 1000 /* SECTION: IPC */ /* Using Semaphore*/ @@ -60,11 +60,11 @@ /* Using Device System */ #define RT_USING_CONSOLE // -#define RT_CONSOLE_DEVICE_NAME "uart1" +#define RT_CONSOLE_DEVICE_NAME "uart1" /* SECTION: Console options */ /* the buffer size of console*/ -#define RT_CONSOLEBUF_SIZE 512 +#define RT_CONSOLEBUF_SIZE 512 /* SECTION: finsh, a C-Express shell */ #define RT_USING_FINSH diff --git a/demo/env/stm32f10x/rtt/app/src/app.c b/demo/env/stm32f10x/rtt/app/src/app.c index d92c3c3..bfd5b26 100644 --- a/demo/env/stm32f10x/rtt/app/src/app.c +++ b/demo/env/stm32f10x/rtt/app/src/app.c @@ -1,13 +1,13 @@ #include "app_task.h" int main(void){ - /* disable interrupt first */ - rt_hw_interrupt_disable(); + /* disable interrupt first */ + rt_hw_interrupt_disable(); - /* startup RT-Thread RTOS */ - rtthread_startup(); + /* startup RT-Thread RTOS */ + rtthread_startup(); - return 0; + return 0; } diff --git a/demo/env/stm32f10x/rtt/app/src/app_task.c b/demo/env/stm32f10x/rtt/app/src/app_task.c index 944f93e..0d97c42 100644 --- a/demo/env/stm32f10x/rtt/app/src/app_task.c +++ b/demo/env/stm32f10x/rtt/app/src/app_task.c @@ -83,14 +83,14 @@ void test_env(void) { * @param parameter parameter */ void sys_init_thread(void* parameter){ - set_system_status(SYSTEM_STATUS_INIT); + set_system_status(SYSTEM_STATUS_INIT); /* EasyFlash initialization */ if (easyflash_init() == EF_NO_ERR) { /* initialize OK and switch to running status */ set_system_status(SYSTEM_STATUS_RUN); - /* test Env demo */ - test_env(); + /* test Env demo */ + test_env(); } else { /* initialize fail and switch to fault status */ set_system_status(SYSTEM_STATUS_FAULT); diff --git a/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c b/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c index 8f17ad9..b3982f0 100644 --- a/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c +++ b/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c @@ -53,7 +53,7 @@ static struct rt_semaphore env_cache_lock; */ EfErrCode ef_port_init(ef_env const **default_env, size_t *default_env_size) { EfErrCode result = EF_NO_ERR; - + *default_env = default_env_set; *default_env_size = sizeof(default_env_set) / sizeof(default_env_set[0]); @@ -99,10 +99,10 @@ EfErrCode ef_port_erase(uint32_t addr, size_t size) { EfErrCode result = EF_NO_ERR; FLASH_Status flash_status; size_t erase_pages, i; - + /* make sure the start address is a multiple of FLASH_ERASE_MIN_SIZE */ EF_ASSERT(addr % EF_ERASE_MIN_SIZE == 0); - + /* calculate pages */ erase_pages = size / PAGE_SIZE; if (size % PAGE_SIZE != 0) { diff --git a/demo/env/stm32f10x/rtt/components/others/bsp.c b/demo/env/stm32f10x/rtt/components/others/bsp.c index c3a3d11..aed4058 100644 --- a/demo/env/stm32f10x/rtt/components/others/bsp.c +++ b/demo/env/stm32f10x/rtt/components/others/bsp.c @@ -39,20 +39,20 @@ void rt_hw_board_init() */ static void RCC_Configuration(void) { - //下面是给各模块开启时钟 - //启动GPIO + //涓嬮潰鏄粰鍚勬ā鍧楀紑鍚椂閽 + //鍚姩GPIO RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA | RCC_APB2Periph_GPIOB | \ RCC_APB2Periph_GPIOC | RCC_APB2Periph_GPIOD | \ RCC_APB2Periph_GPIOE | RCC_APB2Periph_GPIOG, ENABLE); - //启动AFIO + //鍚姩AFIO RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE); - //启动USART1时钟 + //鍚姩USART1鏃堕挓 RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); - //启动USART2时钟 + //鍚姩USART2鏃堕挓 RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); - //启动DMA时钟 + //鍚姩DMA鏃堕挓 RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE); /* Enable ADC1 and GPIOC clock */ RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE); @@ -108,7 +108,7 @@ static void GPIO_Configuration(void) /** * IWDG_Configuration */ -static void IWDG_Configuration(void) +static void IWDG_Configuration(void) { IWDG_WriteAccessCmd(IWDG_WriteAccess_Enable); IWDG_SetPrescaler(IWDG_Prescaler_64); diff --git a/demo/env/stm32f10x/rtt/components/others/bsp.h b/demo/env/stm32f10x/rtt/components/others/bsp.h index 7a3b1b4..b0f7da0 100644 --- a/demo/env/stm32f10x/rtt/components/others/bsp.h +++ b/demo/env/stm32f10x/rtt/components/others/bsp.h @@ -29,23 +29,23 @@ */ /* board configuration */ // SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card -// Default: 1 -#define STM32_USE_SDIO 0 +// Default: 1 +#define STM32_USE_SDIO 0 /* whether use board external SRAM memory */ // Use external SRAM memory on the board -// Enable External SRAM memory +// Enable External SRAM memory #define STM32_EXT_SRAM 0 -// Begin Address of External SRAM -// Default: 0x68000000 +// Begin Address of External SRAM +// Default: 0x68000000 #define STM32_EXT_SRAM_BEGIN 0x68000000 /* the begining address of external SRAM */ -// End Address of External SRAM -// Default: 0x68080000 +// End Address of External SRAM +// Default: 0x68080000 #define STM32_EXT_SRAM_END 0x68080000 /* the end address of external SRAM */ // // Internal SRAM memory size[Kbytes] <8-64> -// Default: 64 +// Default: 64 #define STM32_SRAM_SIZE 64 #define STM32_SRAM_END (SRAM_BASE + STM32_SRAM_SIZE * 1024) @@ -53,18 +53,18 @@ /* RT_USING_UART */ #define RT_USING_UART1 -#define RT_UART_RX_BUFFER_SIZE 64 +#define RT_UART_RX_BUFFER_SIZE 64 -#define LED_RUN_ON GPIO_SetBits (GPIOA,GPIO_Pin_10) //RUN -#define LED_RUN_OFF GPIO_ResetBits(GPIOA,GPIO_Pin_10) //RUN +#define LED_RUN_ON GPIO_SetBits (GPIOA,GPIO_Pin_10) //RUN +#define LED_RUN_OFF GPIO_ResetBits(GPIOA,GPIO_Pin_10) //RUN /*********************************************************************************************************/ -/** MACRO'S */ +/** MACRO'S */ /***********************************************************************************************************/ /***********************************************************************************************************/ -/* DATA TYPES */ +/* DATA TYPES */ /***********************************************************************************************************/ diff --git a/demo/env/stm32f10x/rtt/components/others/types.h b/demo/env/stm32f10x/rtt/components/others/types.h index 72fff45..380f6cc 100644 --- a/demo/env/stm32f10x/rtt/components/others/types.h +++ b/demo/env/stm32f10x/rtt/components/others/types.h @@ -7,15 +7,15 @@ typedef int bool_t; /**< boolean type */ #ifndef TRUE - #define TRUE 1 + #define TRUE 1 #endif #ifndef FALSE - #define FALSE 0 + #define FALSE 0 #endif #ifndef NULL - #define NULL 0 + #define NULL 0 #endif #define success 0 diff --git a/demo/env/stm32f10x/rtt/components/rtt_uart/usart.c b/demo/env/stm32f10x/rtt/components/rtt_uart/usart.c index 3770e5e..02567c7 100644 --- a/demo/env/stm32f10x/rtt/components/rtt_uart/usart.c +++ b/demo/env/stm32f10x/rtt/components/rtt_uart/usart.c @@ -1,7 +1,7 @@ /* * File : usart.c * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006-2013, RT-Thread Development Team + * COPYRIGHT (C) 2006-2021, RT-Thread Development Team * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -155,18 +155,18 @@ static rt_err_t stm32_control(struct rt_serial_device *serial, int cmd, void *ar if (irq_type == RT_DEVICE_FLAG_INT_RX) { /* return rx irq flag */ - return USART_GetFlagStatus(uart->uart_device, USART_FLAG_RXNE); + return USART_GetFlagStatus(uart->uart_device, USART_FLAG_RXNE); } else if (irq_type == RT_DEVICE_FLAG_INT_TX) { /* return tx flag */ if (uart->tx_irq_type == USART_IT_TC) { - return USART_GetFlagStatus(uart->uart_device, USART_FLAG_TC); + return USART_GetFlagStatus(uart->uart_device, USART_FLAG_TC); } else if (uart->tx_irq_type == USART_IT_TXE) { - return USART_GetFlagStatus(uart->uart_device, USART_FLAG_TXE); + return USART_GetFlagStatus(uart->uart_device, USART_FLAG_TXE); } } break; diff --git a/demo/env/stm32f4xx/app/inc/app_task.h b/demo/env/stm32f4xx/app/inc/app_task.h index 9162d64..5e94448 100644 --- a/demo/env/stm32f4xx/app/inc/app_task.h +++ b/demo/env/stm32f4xx/app/inc/app_task.h @@ -4,7 +4,7 @@ #ifndef APP_TASK_H #define APP_TASK_H -#include +#include #include #include diff --git a/demo/env/stm32f4xx/app/inc/delay_conf.h b/demo/env/stm32f4xx/app/inc/delay_conf.h index 36c376b..39b060a 100644 --- a/demo/env/stm32f4xx/app/inc/delay_conf.h +++ b/demo/env/stm32f4xx/app/inc/delay_conf.h @@ -4,29 +4,29 @@ #include"rtconfig.h" #if RT_TICK_PER_SECOND == 1 -#define DELAY_1S (RT_TICK_PER_SECOND) -#define DELAY_S(X) (X*DELAY_1S) +#define DELAY_1S (RT_TICK_PER_SECOND) +#define DELAY_S(X) (X*DELAY_1S) -#elif RT_TICK_PER_SECOND == 10 -#define DELAY_100MS(X) (X) -#define DELAY_S(X) (X*10) +#elif RT_TICK_PER_SECOND == 10 +#define DELAY_100MS(X) (X) +#define DELAY_S(X) (X*10) -#elif RT_TICK_PER_SECOND == 100 -#define DELAY_10MS(X) (X) -#define DELAY_100MS(X) (X*10) -#define DELAY_S(X) (X*100) +#elif RT_TICK_PER_SECOND == 100 +#define DELAY_10MS(X) (X) +#define DELAY_100MS(X) (X*10) +#define DELAY_S(X) (X*100) #elif (RT_TICK_PER_SECOND == 1000) -#define DELAY_1MS (RT_TICK_PER_SECOND/1000) +#define DELAY_1MS (RT_TICK_PER_SECOND/1000) #define DELAY_MS(X) (X*DELAY_1MS) -#define DELAY_S(X) (X*1000*DELAY_1MS) +#define DELAY_S(X) (X*1000*DELAY_1MS) #elif (RT_TICK_PER_SECOND == 10000) #define DELAY_100US(X) (X*RT_TICK_PER_SECOND/10000) -#define DELAY_1MS (RT_TICK_PER_SECOND/1000) +#define DELAY_1MS (RT_TICK_PER_SECOND/1000) #define DELAY_MS(X) (X*DELAY_1MS) -#define DELAY_S(X) (X*1000*DELAY_1MS) +#define DELAY_S(X) (X*1000*DELAY_1MS) #endif @@ -37,5 +37,5 @@ #define DELAY_SYS_FAULT_LED_ON DELAY_MS(50) #define DELAY_SYS_FAULT_LED_OFF DELAY_MS(950) -#endif +#endif diff --git a/demo/env/stm32f4xx/app/inc/rtconfig.h b/demo/env/stm32f4xx/app/inc/rtconfig.h index 8db10fd..6de5516 100644 --- a/demo/env/stm32f4xx/app/inc/rtconfig.h +++ b/demo/env/stm32f4xx/app/inc/rtconfig.h @@ -3,16 +3,16 @@ #define __RTTHREAD_CFG_H__ /* RT_NAME_MAX*/ -#define RT_NAME_MAX 24 +#define RT_NAME_MAX 24 /* RT_ALIGN_SIZE*/ -#define RT_ALIGN_SIZE 8 +#define RT_ALIGN_SIZE 8 /* PRIORITY_MAX */ -#define RT_THREAD_PRIORITY_MAX 32 +#define RT_THREAD_PRIORITY_MAX 32 /* Tick per Second */ -#define RT_TICK_PER_SECOND 10000 //0.1ms +#define RT_TICK_PER_SECOND 10000 //0.1ms /* SECTION: RT_DEBUG */ /* Thread Debug */ @@ -26,9 +26,9 @@ /* Using Software Timer */ /* #define RT_USING_TIMER_SOFT */ -#define RT_TIMER_THREAD_PRIO 4 -#define RT_TIMER_THREAD_STACK_SIZE 512 -#define RT_TIMER_TICK_PER_SECOND 1000 +#define RT_TIMER_THREAD_PRIO 4 +#define RT_TIMER_THREAD_STACK_SIZE 512 +#define RT_TIMER_TICK_PER_SECOND 1000 /* SECTION: IPC */ /* Using Semaphore*/ @@ -60,11 +60,11 @@ /* Using Device System */ #define RT_USING_CONSOLE // -#define RT_CONSOLE_DEVICE_NAME "uart1" +#define RT_CONSOLE_DEVICE_NAME "uart1" /* SECTION: Console options */ /* the buffer size of console*/ -#define RT_CONSOLEBUF_SIZE 512 +#define RT_CONSOLEBUF_SIZE 512 /* SECTION: finsh, a C-Express shell */ #define RT_USING_FINSH diff --git a/demo/env/stm32f4xx/app/src/app.c b/demo/env/stm32f4xx/app/src/app.c index d92c3c3..bfd5b26 100644 --- a/demo/env/stm32f4xx/app/src/app.c +++ b/demo/env/stm32f4xx/app/src/app.c @@ -1,13 +1,13 @@ #include "app_task.h" int main(void){ - /* disable interrupt first */ - rt_hw_interrupt_disable(); + /* disable interrupt first */ + rt_hw_interrupt_disable(); - /* startup RT-Thread RTOS */ - rtthread_startup(); + /* startup RT-Thread RTOS */ + rtthread_startup(); - return 0; + return 0; } diff --git a/demo/env/stm32f4xx/app/src/app_task.c b/demo/env/stm32f4xx/app/src/app_task.c index bd67c22..956fc69 100644 --- a/demo/env/stm32f4xx/app/src/app_task.c +++ b/demo/env/stm32f4xx/app/src/app_task.c @@ -75,7 +75,7 @@ void test_env(void) { * @param parameter parameter */ void sys_init_thread(void* parameter){ - set_system_status(SYSTEM_STATUS_INIT); + set_system_status(SYSTEM_STATUS_INIT); /* EasyFlash initialization */ if (easyflash_init() == EF_NO_ERR) { @@ -134,8 +134,8 @@ void rtthread_startup(void) rt_system_timer_init(); #ifdef RT_USING_HEAP - /* init memory system */ - rt_system_heap_init((void*)STM32_SRAM_BEGIN, (void*)STM32_SRAM_END); + /* init memory system */ + rt_system_heap_init((void*)STM32_SRAM_BEGIN, (void*)STM32_SRAM_END); #endif /* init scheduler system */ diff --git a/demo/env/stm32f4xx/app/src/user_finsh_cmd.c b/demo/env/stm32f4xx/app/src/user_finsh_cmd.c index e3f701d..0ab12fb 100644 --- a/demo/env/stm32f4xx/app/src/user_finsh_cmd.c +++ b/demo/env/stm32f4xx/app/src/user_finsh_cmd.c @@ -1,7 +1,7 @@ /* * user_finsh_cmd.c * - * Created on: 2013年12月7日 + * Created on: 2013骞12鏈7鏃 * Author: Armink */ #include diff --git a/demo/env/stm32f4xx/components/others/bsp.c b/demo/env/stm32f4xx/components/others/bsp.c index e75b851..f6ea807 100644 --- a/demo/env/stm32f4xx/components/others/bsp.c +++ b/demo/env/stm32f4xx/components/others/bsp.c @@ -39,23 +39,23 @@ void rt_hw_board_init() */ static void RCC_Configuration(void) { - //下面是给各模块开启时钟 - //启动GPIO - RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | \ - RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | \ - RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOG, - ENABLE); - - //启动USART1时钟 - RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); - //启动USART2时钟 - RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); - //启动DMA时钟 - RCC_APB1PeriphClockCmd(RCC_AHB1Periph_DMA1, ENABLE); - /* Enable ADC1 and GPIOC clock */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE); - /* Enable WWDG clock */ - RCC_APB1PeriphClockCmd(RCC_APB1Periph_WWDG, ENABLE); + //涓嬮潰鏄粰鍚勬ā鍧楀紑鍚椂閽 + //鍚姩GPIO + RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | \ + RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | \ + RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOG, + ENABLE); + + //鍚姩USART1鏃堕挓 + RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); + //鍚姩USART2鏃堕挓 + RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); + //鍚姩DMA鏃堕挓 + RCC_APB1PeriphClockCmd(RCC_AHB1Periph_DMA1, ENABLE); + /* Enable ADC1 and GPIOC clock */ + RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE); + /* Enable WWDG clock */ + RCC_APB1PeriphClockCmd(RCC_APB1Periph_WWDG, ENABLE); } /** @@ -81,9 +81,9 @@ static void NVIC_Configuration(void) */ static void GPIO_Configuration(void) { - GPIO_InitTypeDef GPIO_InitStructure; + GPIO_InitTypeDef GPIO_InitStructure; - /* PA13:SWDIO PA14:SWCLK for debug, can't set to output mode */ + /* PA13:SWDIO PA14:SWCLK for debug, can't set to output mode */ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_All & (~(GPIO_Pin_13 | GPIO_Pin_14)); GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; @@ -99,20 +99,20 @@ static void GPIO_Configuration(void) GPIO_Init(GPIOF, &GPIO_InitStructure); GPIO_Init(GPIOG, &GPIO_InitStructure); - /******************系统运行LED指示灯配置*******************/ - GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12; + /******************绯荤粺杩愯LED鎸囩ず鐏厤缃*******************/ + GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_Init(GPIOB, &GPIO_InitStructure); } /** * IWDG_Configuration */ -static void IWDG_Configuration(void) +static void IWDG_Configuration(void) { IWDG_WriteAccessCmd(IWDG_WriteAccess_Enable); IWDG_SetPrescaler(IWDG_Prescaler_64); diff --git a/demo/env/stm32f4xx/components/others/bsp.h b/demo/env/stm32f4xx/components/others/bsp.h index fda3890..43e7ba6 100644 --- a/demo/env/stm32f4xx/components/others/bsp.h +++ b/demo/env/stm32f4xx/components/others/bsp.h @@ -29,24 +29,24 @@ */ /* board configuration */ // SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card -// Default: 1 -#define STM32_USE_SDIO 0 +// Default: 1 +#define STM32_USE_SDIO 0 /* whether use board external SRAM memory */ // Use external SRAM memory on the board -// Enable External SRAM memory +// Enable External SRAM memory #define STM32_EXT_SRAM 0 -// Begin Address of External SRAM -// Default: 0x68000000 +// Begin Address of External SRAM +// Default: 0x68000000 #define STM32_EXT_SRAM_BEGIN 0x68000000 /* the begining address of external SRAM */ -// End Address of External SRAM -// Default: 0x68080000 +// End Address of External SRAM +// Default: 0x68080000 #define STM32_EXT_SRAM_END 0x68080000 /* the end address of external SRAM */ // #define STM32_SRAM_BEGIN SRAM_BASE // Internal SRAM memory size[Kbytes] -// Default: 128 +// Default: 128 #define STM32_SRAM_SIZE 128 #define STM32_SRAM_END (SRAM_BASE + STM32_SRAM_SIZE * 1024) @@ -54,18 +54,18 @@ /* RT_USING_UART */ #define RT_USING_UART1 -#define RT_UART_RX_BUFFER_SIZE 64 +#define RT_UART_RX_BUFFER_SIZE 64 -#define LED_RUN_ON GPIO_SetBits (GPIOB,GPIO_Pin_12) //RUN -#define LED_RUN_OFF GPIO_ResetBits(GPIOB,GPIO_Pin_12) //RUN +#define LED_RUN_ON GPIO_SetBits (GPIOB,GPIO_Pin_12) //RUN +#define LED_RUN_OFF GPIO_ResetBits(GPIOB,GPIO_Pin_12) //RUN /*********************************************************************************************************/ -/** MACRO'S */ +/** MACRO'S */ /***********************************************************************************************************/ /***********************************************************************************************************/ -/* DATA TYPES */ +/* DATA TYPES */ /***********************************************************************************************************/ diff --git a/demo/env/stm32f4xx/components/others/types.h b/demo/env/stm32f4xx/components/others/types.h index 72fff45..380f6cc 100644 --- a/demo/env/stm32f4xx/components/others/types.h +++ b/demo/env/stm32f4xx/components/others/types.h @@ -7,15 +7,15 @@ typedef int bool_t; /**< boolean type */ #ifndef TRUE - #define TRUE 1 + #define TRUE 1 #endif #ifndef FALSE - #define FALSE 0 + #define FALSE 0 #endif #ifndef NULL - #define NULL 0 + #define NULL 0 #endif #define success 0 diff --git a/demo/iap/ymodem+rtt.c b/demo/iap/ymodem+rtt.c index 0b05a90..b95a593 100644 --- a/demo/iap/ymodem+rtt.c +++ b/demo/iap/ymodem+rtt.c @@ -28,14 +28,14 @@ /** - * IAP 更新步骤： - * 1、在RT-Thread的Finsh终端中输入"update"； - * 2、在Ymodem传输开始时（通过ymodem_on_begin回调），将会使用ef_erase_bak_app方法擦除掉备份区存储的应用； - * 3、使用ef_write_data_to_bak方法将接收到数据保存到Flash中。这个过程将会在Ymodem接收数据的回调ymodem_on_data中； - * 4、当接收完成后，修改环境变量"iap_need_copy_app"值为1、环境变量"change iap_copy_app_size"值为已下载APP大小，保存环境变量， - * 这样是为了保证在更新时意外掉电后，下次上电依然会自动恢复更新； - * 5、擦除并拷贝应用至应用程序入口； - * 6、修改并保存环境变量"iap_need_copy_app"及"iap_copy_app_size"的值为0。 + * IAP 鏇存柊姝ラ锛 + * 1銆佸湪RT-Thread鐨凢insh缁堢涓緭鍏"update"锛 + * 2銆佸湪Ymodem浼犺緭寮濮嬫椂锛堥氳繃ymodem_on_begin鍥炶皟锛夛紝灏嗕細浣跨敤ef_erase_bak_app鏂规硶鎿﹂櫎鎺夊浠藉尯瀛樺偍鐨勫簲鐢紱 + * 3銆佷娇鐢╡f_write_data_to_bak鏂规硶灏嗘帴鏀跺埌鏁版嵁淇濆瓨鍒癋lash涓傝繖涓繃绋嬪皢浼氬湪Ymodem鎺ユ敹鏁版嵁鐨勫洖璋儁modem_on_data涓紱 + * 4銆佸綋鎺ユ敹瀹屾垚鍚庯紝淇敼鐜鍙橀噺"iap_need_copy_app"鍊间负1銆佺幆澧冨彉閲"change iap_copy_app_size"鍊间负宸蹭笅杞紸PP澶у皬锛屼繚瀛樼幆澧冨彉閲忥紝 + * 杩欐牱鏄负浜嗕繚璇佸湪鏇存柊鏃舵剰澶栨帀鐢靛悗锛屼笅娆′笂鐢典緷鐒朵細鑷姩鎭㈠鏇存柊锛 + * 5銆佹摝闄ゅ苟鎷疯礉搴旂敤鑷冲簲鐢ㄧ▼搴忓叆鍙ｏ紱 + * 6銆佷慨鏀瑰苟淇濆瓨鐜鍙橀噺"iap_need_copy_app"鍙"iap_copy_app_size"鐨勫间负0銆 * * IAP update step: * 1. Input "update" command in RT-Thread finsh terminal. diff --git a/easyflash/inc/ef_cfg.h b/easyflash/inc/ef_cfg.h index 717748b..45f1d30 100644 --- a/easyflash/inc/ef_cfg.h +++ b/easyflash/inc/ef_cfg.h @@ -40,9 +40,9 @@ * Please change it when your firmware add a new ENV to default_env_set. */ #define EF_ENV_VER_NUM /* @note you must define it for a value, such as 0 */ - + /* MCU Endian Configuration, default is Little Endian Order. */ -/* #define EF_BIG_ENDIAN */ +/* #define EF_BIG_ENDIAN */ #endif /* EF_USING_ENV */ diff --git a/easyflash/port/ef_port.c b/easyflash/port/ef_port.c index 26dc551..bb7db96 100644 --- a/easyflash/port/ef_port.c +++ b/easyflash/port/ef_port.c @@ -102,7 +102,7 @@ EfErrCode ef_port_erase(uint32_t addr, size_t size) { */ EfErrCode ef_port_write(uint32_t addr, const uint32_t *buf, size_t size) { EfErrCode result = EF_NO_ERR; - + /* You can add your code under here. */ return result; @@ -112,18 +112,18 @@ EfErrCode ef_port_write(uint32_t addr, const uint32_t *buf, size_t size) { * lock the ENV ram cache */ void ef_port_env_lock(void) { - + /* You can add your code under here. */ - + } /** * unlock the ENV ram cache */ void ef_port_env_unlock(void) { - + /* You can add your code under here. */ - + } @@ -146,7 +146,7 @@ void ef_log_debug(const char *file, const long line, const char *format, ...) { va_start(args, format); /* You can add your code under here. */ - + va_end(args); #endif @@ -166,7 +166,7 @@ void ef_log_info(const char *format, ...) { va_start(args, format); /* You can add your code under here. */ - + va_end(args); } /** @@ -182,6 +182,6 @@ void ef_print(const char *format, ...) { va_start(args, format); /* You can add your code under here. */ - + va_end(args); } diff --git a/easyflash/src/ef_env.c b/easyflash/src/ef_env.c index 01bac5a..28d2c28 100644 --- a/easyflash/src/ef_env.c +++ b/easyflash/src/ef_env.c @@ -507,7 +507,7 @@ static uint32_t get_next_env_addr(sector_meta_data_t sector, env_node_obj_t pre_ addr = find_next_env_addr(addr, sector->addr + SECTOR_SIZE - SECTOR_HDR_DATA_SIZE); if (addr > sector->addr + SECTOR_SIZE || pre_env->len == 0) { - //TODO 扇区连续模式 + //TODO 鎵囧尯杩炵画妯″紡 return FAILED_ADDR; } } else { @@ -542,7 +542,7 @@ static EfErrCode read_env(env_node_obj_t env) env->crc_is_ok = false; return EF_READ_ERR; } else if (env->len > SECTOR_SIZE - SECTOR_HDR_DATA_SIZE && env->len < ENV_AREA_SIZE) { - //TODO 扇区连续模式，或者写入长度没有写入完整 + //TODO 鎵囧尯杩炵画妯″紡锛屾垨鑰呭啓鍏ラ暱搴︽病鏈夊啓鍏ュ畬鏁 EF_ASSERT(0); } @@ -1726,7 +1726,7 @@ static bool check_and_recovery_env_cb(env_node_obj_t env, void *arg1, void *arg2 } else if (env->status == ENV_PRE_WRITE) { uint8_t status_table[ENV_STATUS_TABLE_SIZE]; /* the ENV has not write finish, change the status to error */ - //TODO 绘制异常处理的状态装换图 + //TODO 缁樺埗寮傚父澶勭悊鐨勭姸鎬佽鎹㈠浘 write_status(env->addr.start, status_table, ENV_STATUS_NUM, ENV_ERR_HDR); return true; }