diff --git a/.gitignore b/.gitignore index 51b3184..a5e06f4 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ DebugConfig Objects *.uvguix.* *.uvoptx +*.uvgui.* \ No newline at end of file diff --git a/apps/chrg/applications/SConscript b/apps/chrg/applications/SConscript index 48fd32d..bc8e4a3 100644 --- a/apps/chrg/applications/SConscript +++ b/apps/chrg/applications/SConscript @@ -4,9 +4,11 @@ import os cwd = GetCurrentDir() src = Glob('*.c') src += Glob('bsp/*.c') +src += Glob('thread/*.c') path = [cwd] path += [cwd + '/bsp'] +path += [cwd + '/thread'] group = DefineGroup('Applications', src, depend = [''], CPPPATH = path) diff --git a/apps/chrg/applications/bsp/chrg_tty.c b/apps/chrg/applications/bsp/chrg_tty.c index c42f7e1..6efbab6 100644 --- a/apps/chrg/applications/bsp/chrg_tty.c +++ b/apps/chrg/applications/bsp/chrg_tty.c @@ -1,9 +1,13 @@ +#include #include #include #include "chrg_tty.h" +#include "chrg_north.h" +#include "chrg_south.h" + struct chrg_tty_t chrgtty[TOTAL_TTY] = { [IDX_TTY_RS485] = { .dev = RT_NULL, @@ -108,10 +112,21 @@ static void chrg_tty_recv_entry (void *data) rt_memset(rx_raw, 0, RT_SERIAL_RB_BUFSZ); rx_len = rt_device_read(pTTY->msg.dev, 0, rx_raw, pTTY->msg.size); if (rx_len > 0) { - + switch (pTTY->index) { + case IDX_TTY_NORTH: { + struct chrg_north_t *pNOR = &chrgnor; + rt_memset(&pNOR->buf, 0, sizeof(pNOR->buf)); + strcpy((char *)pNOR->buf, "send mb msg"); + rt_mb_send(&pNOR->mb, (rt_uint32_t)&pNOR->buf); + } + break; + + default: + break; + } + } } - } } diff --git a/apps/chrg/applications/thread/chrg_north.c b/apps/chrg/applications/thread/chrg_north.c new file mode 100644 index 0000000..967a860 --- /dev/null +++ b/apps/chrg/applications/thread/chrg_north.c @@ -0,0 +1,67 @@ + +#include + +#include "chrg_north.h" + +#define LOG_TAG "chrg.nor" +#define DBG_ENABLE +#define DBG_SECTION_NAME LOG_TAG +#define DBG_LEVEL DBG_LOG +#define DBG_COLOR +#include + +struct chrg_north_t chrgnor = { + .tid = RT_NULL, + .name = THRED_NAME_NORTH, + +}; + +static void chrg_north_entry (void *data) +{ + struct chrg_north_t *pNOR = (struct chrg_north_t *)data; + + if (RT_NULL == pNOR) { + return ; + } + + char *str = RT_NULL; + + while (1) { + if (rt_mb_recv(&pNOR->mb, (rt_uint32_t *)&str, RT_WAITING_FOREVER) == RT_EOK) { + rt_kprintf("%s recv %s\r\n", pNOR->name, str); + } + + //rt_thread_mdelay(1000); + } + + rt_mb_detach(&pNOR->mb); +} + +static int chrg_north_init (void) +{ + rt_err_t ret; + struct chrg_north_t *pNOR = &chrgnor; + ret = rt_mb_init(&pNOR->mb, "mb_nor", &pNOR->mb_pool[0], + sizeof(pNOR->mb_pool)/4, RT_IPC_FLAG_FIFO); + if (RT_NULL != ret) { + LOG_E("mb init failed."); + return RT_ENOMEM; + } + + pNOR->tid = rt_thread_create(pNOR->name, chrg_north_entry, pNOR, + 4096, RT_MAIN_THREAD_PRIORITY, 10); + if (RT_NULL != pNOR->tid) { + rt_thread_startup(pNOR->tid); + LOG_I("start thread '%s'.", pNOR->name); + } else { + LOG_E("start thread '%s' failed.", pNOR->name); + return -RT_ERROR; + } + + return 0; +} + + +INIT_APP_EXPORT(chrg_north_init); + + diff --git a/apps/chrg/applications/thread/chrg_north.h b/apps/chrg/applications/thread/chrg_north.h new file mode 100644 index 0000000..c41aeb0 --- /dev/null +++ b/apps/chrg/applications/thread/chrg_north.h @@ -0,0 +1,21 @@ +#ifndef __CHRG_NORTH_H__ +#define __CHRG_NORTH_H__ + +#include + +#define THRED_NAME_NORTH "thr_nor" + +struct chrg_north_t { + rt_thread_t tid; + const char *name; + + struct rt_mailbox mb; + rt_uint8_t mb_pool[128]; + rt_uint8_t buf[256]; +}; + +extern struct chrg_north_t chrgnor; + + +#endif + diff --git a/apps/chrg/applications/thread/chrg_south.c b/apps/chrg/applications/thread/chrg_south.c new file mode 100644 index 0000000..a06d13d --- /dev/null +++ b/apps/chrg/applications/thread/chrg_south.c @@ -0,0 +1,48 @@ + +#include + +#include "chrg_south.h" + +#define LOG_TAG "chrg.sou" +#define DBG_ENABLE +#define DBG_SECTION_NAME LOG_TAG +#define DBG_LEVEL DBG_LOG +#define DBG_COLOR +#include + +struct chrg_south_t chrgsou = { + .tid = RT_NULL, + .name = THRED_NAME_SOUTH, + +}; + +static void chrg_south_entry (void *data) +{ + while (1) { + //rt_kprintf("sou\r\n"); + rt_thread_mdelay(1000); + } + +} + +static int chrg_south_init (void) +{ + struct chrg_south_t *pSOU = &chrgsou; + + pSOU->tid = rt_thread_create(pSOU->name, chrg_south_entry, pSOU, + 4096, RT_MAIN_THREAD_PRIORITY, 10); + if (RT_NULL != pSOU->tid) { + rt_thread_startup(pSOU->tid); + LOG_I("start thread '%s'.", pSOU->name); + } else { + LOG_E("start thread '%s' failed.", pSOU->name); + return -RT_ERROR; + } + + return 0; +} + + +INIT_APP_EXPORT(chrg_south_init); + + diff --git a/apps/chrg/applications/thread/chrg_south.h b/apps/chrg/applications/thread/chrg_south.h new file mode 100644 index 0000000..1b34e5e --- /dev/null +++ b/apps/chrg/applications/thread/chrg_south.h @@ -0,0 +1,18 @@ +#ifndef __CHRG_SOUTH_H__ +#define __CHRG_SOUTH_H__ + +#include + +#define THRED_NAME_SOUTH "thr_sou" + +struct chrg_south_t { + rt_thread_t tid; + const char *name; + +}; + +extern struct chrg_south_t chrgsou; + + +#endif + diff --git a/apps/chrg/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h b/apps/chrg/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h index 1f11be6..13fa5a8 100644 --- a/apps/chrg/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h +++ b/apps/chrg/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h @@ -49,10 +49,10 @@ */ #define HAL_MODULE_ENABLED -/* #define HAL_ADC_MODULE_ENABLED */ +#define HAL_ADC_MODULE_ENABLED /* #define HAL_CRYP_MODULE_ENABLED */ #define HAL_CAN_MODULE_ENABLED -/* #define HAL_CRC_MODULE_ENABLED */ +#define HAL_CRC_MODULE_ENABLED /* #define HAL_CRYP_MODULE_ENABLED */ /* #define HAL_DAC_MODULE_ENABLED */ /* #define HAL_DCMI_MODULE_ENABLED */ diff --git a/apps/chrg/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c b/apps/chrg/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c index 3f63ddb..3642c61 100644 --- a/apps/chrg/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c +++ b/apps/chrg/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c @@ -24,6 +24,181 @@ void HAL_MspInit(void) /* USER CODE END MspInit 1 */ } +#if 0 +void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) +{ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + if(hadc->Instance==ADC1) { + /* Peripheral clock enable */ + __HAL_RCC_ADC1_CLK_ENABLE(); + + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**ADC1 GPIO Configuration + PA1 ------> ADC1_IN1 + */ + GPIO_InitStruct.Pin = GPIO_PIN_1; + GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; + GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + } + +} + +void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) +{ + if(hadc->Instance==ADC1) { + /* Peripheral clock disable */ + __HAL_RCC_ADC1_CLK_DISABLE(); + + /**ADC1 GPIO Configuration + PA1 ------> ADC1_IN1 + */ + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_1); + } + +} +#endif + +void HAL_CRC_MspInit(CRC_HandleTypeDef* hcrc) +{ + if(hcrc->Instance==CRC) { + /* Peripheral clock enable */ + __HAL_RCC_CRC_CLK_ENABLE(); + } + +} + +void HAL_CRC_MspDeInit(CRC_HandleTypeDef* hcrc) +{ + if(hcrc->Instance==CRC) { + /* Peripheral clock disable */ + __HAL_RCC_CRC_CLK_DISABLE(); + } + +} + +void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) +{ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + if(htim_base->Instance==TIM2) { + /* Peripheral clock enable */ + __HAL_RCC_TIM2_CLK_ENABLE(); + } else if(htim_base->Instance==TIM3) { + /* Peripheral clock enable */ + __HAL_RCC_TIM3_CLK_ENABLE(); + } else if(htim_base->Instance==TIM4) { + /* Peripheral clock enable */ + __HAL_RCC_TIM4_CLK_ENABLE(); + + __HAL_RCC_GPIOD_CLK_ENABLE(); + /**TIM4 GPIO Configuration + PD12 ------> TIM4_CH1 + */ + GPIO_InitStruct.Pin = GPIO_PIN_12; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF2_TIM4; + HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + } else if(htim_base->Instance==TIM6) { + /* Peripheral clock enable */ + __HAL_RCC_TIM6_CLK_ENABLE(); + } else if(htim_base->Instance==TIM12) { + /* Peripheral clock enable */ + __HAL_RCC_TIM12_CLK_ENABLE(); + } + +} + +void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) +{ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + if(htim->Instance==TIM2) { + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**TIM2 GPIO Configuration + PA1 ------> TIM2_CH2 + PA2 ------> TIM2_CH3 + */ + GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF1_TIM2; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + } else if(htim->Instance==TIM3) { + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**TIM3 GPIO Configuration + PA6 ------> TIM3_CH1 + PA7 ------> TIM3_CH2 + */ + GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF2_TIM3; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + } else if(htim->Instance==TIM4) { + __HAL_RCC_GPIOD_CLK_ENABLE(); + /**TIM4 GPIO Configuration + PD13 ------> TIM4_CH2 + */ + GPIO_InitStruct.Pin = GPIO_PIN_13; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF2_TIM4; + HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + } else if(htim->Instance==TIM12) { + __HAL_RCC_GPIOH_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); + /**TIM12 GPIO Configuration + PH6 ------> TIM12_CH1 + PB15 ------> TIM12_CH2 + */ + GPIO_InitStruct.Pin = GPIO_PIN_6; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF9_TIM12; + HAL_GPIO_Init(GPIOH, &GPIO_InitStruct); + + GPIO_InitStruct.Pin = GPIO_PIN_15; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF9_TIM12; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + } + +} + +void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) +{ + if(htim_base->Instance==TIM2) { + /* Peripheral clock disable */ + __HAL_RCC_TIM2_CLK_DISABLE(); + } else if(htim_base->Instance==TIM3) { + /* Peripheral clock disable */ + __HAL_RCC_TIM3_CLK_DISABLE(); + } else if(htim_base->Instance==TIM4) { + /* Peripheral clock disable */ + __HAL_RCC_TIM4_CLK_DISABLE(); + + /**TIM4 GPIO Configuration + PD12 ------> TIM4_CH1 + PD13 ------> TIM4_CH2 + */ + HAL_GPIO_DeInit(GPIOD, GPIO_PIN_12|GPIO_PIN_13); + } else if(htim_base->Instance==TIM6) { + /* Peripheral clock disable */ + __HAL_RCC_TIM6_CLK_DISABLE(); + } else if(htim_base->Instance==TIM12) { + /* Peripheral clock disable */ + __HAL_RCC_TIM12_CLK_DISABLE(); + } + +} + /** * @brief UART MSP Initialization * This function configures the hardware resources used in this example diff --git a/apps/chrg/project.uvprojx b/apps/chrg/project.uvprojx index e52c267..d799d84 100644 --- a/apps/chrg/project.uvprojx +++ b/apps/chrg/project.uvprojx @@ -7,7 +7,7 @@ - rt-thread + chrg 0x4 ARM-ADS 0 @@ -48,7 +48,7 @@ 1 .\build\keil\Obj\ - rt-thread + chrg 1 0 1 @@ -336,9 +336,9 @@ 0 - __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC, STM32F405xx, RT_USING_LIBC, USE_HAL_DRIVER, __STDC_LIMIT_MACROS + RT_USING_ARMLIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, USE_HAL_DRIVER, STM32F405xx, __STDC_LIMIT_MACROS, RT_USING_LIBC - .;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\drivers\include;..\..\libs\freemodbus\modbus\ascii;..\..\rt-thread\components\drivers\include;..\..\rt-thread\include;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers;board\ports;..\..\rt-thread\components\libc\posix\io\epoll;..\..\libs\freemodbus\modbus\tcp;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\config;..\..\rt-thread\components\fal\inc;..\..\rt-thread\components\drivers\phy;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\drivers\include;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers;..\..\rt-thread\components\finsh;..\..\libs\freemodbus\port;..\..\rt-thread\components\libc\compilers\common\include;applications;..\..\rt-thread\components\drivers\include;..\..\libs\stm32f4\STM32F4_HAL\Inc;..\..\libs\stm32f4\STM32F4_HAL\Inc\Legacy;..\..\rt-thread\components\drivers\include;..\..\rt-thread\libcpu\arm\cortex-m4;..\..\rt-thread\components\libc\posix\io\poll;..\..\rt-thread\components\libc\posix\ipc;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_flash;..\..\rt-thread\components\drivers\include;..\..\libs\freemodbus\modbus\rtu;..\..\rt-thread\libcpu\arm\common;..\..\rt-thread\components\libc\compilers\common\extension;..\..\rt-thread\components\libc\posix\io\eventfd;..\..\rt-thread\components\libc\compilers\common\extension\fcntl\octal;board;..\..\rt-thread\components\drivers\smp_call;..\..\libs\cmsis-core\Include;..\..\rt-thread\components\drivers\include;board\CubeMX_Config\Inc;..\..\libs\stm32f4\STM32F4_CMSIS\Include;..\..\libs\freemodbus\modbus\include;applications\bsp;..\..\rt-thread\components\drivers\include + ..\..\libs\freemodbus\modbus\include;..\..\libs\stm32f4\STM32F4_CMSIS\Include;..\..\rt-thread\libcpu\arm\common;..\..\rt-thread\components\drivers\include;..\..\libs\freemodbus\modbus\rtu;..\..\rt-thread\components\drivers\phy;..\..\rt-thread\components\libc\posix\io\poll;board\CubeMX_Config\Inc;..\..\rt-thread\components\libc\compilers\common\extension;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\config;..\..\rt-thread\libcpu\arm\cortex-m4;..\..\libs\cmsis-core\Include;..\..\rt-thread\components\drivers\include;board;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_flash;..\..\libs\freemodbus\modbus\ascii;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\fal\inc;.;..\..\rt-thread\include;..\..\rt-thread\components\libc\posix\io\eventfd;..\..\rt-thread\components\drivers\smp_call;..\..\rt-thread\components\libc\compilers\common\include;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\libc\posix\ipc;..\..\rt-thread\components\drivers\include;..\..\libs\freemodbus\port;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\libc\posix\io\epoll;..\..\libs\stm32f4\STM32F4_HAL\Inc\Legacy;board\ports;..\..\rt-thread\components\drivers\include;applications\thread;applications\bsp;..\..\rt-thread\components\finsh;..\..\libs\stm32f4\STM32F4_HAL\Inc;..\..\rt-thread\components\libc\compilers\common\extension\fcntl\octal;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers;..\..\rt-thread\components\drivers\include;..\..\libs\freemodbus\modbus\tcp;applications @@ -382,56 +382,66 @@ Applications - - chrg_intr.c - 1 - applications\bsp\chrg_intr.c - chrg_wdt.c 1 applications\bsp\chrg_wdt.c - chrg_clk.c + chrg_north.c 1 - applications\bsp\chrg_clk.c - - - chrg_tmr.c - 1 - applications\bsp\chrg_tmr.c - - - chrg_switch.c - 1 - applications\bsp\chrg_switch.c - - - main.c - 1 - applications\main.c - - - chrg_tty.c - 1 - applications\bsp\chrg_tty.c + applications\thread\chrg_north.c chrg_i2c.c 1 applications\bsp\chrg_i2c.c + + chrg_clk.c + 1 + applications\bsp\chrg_clk.c + + + chrg_intr.c + 1 + applications\bsp\chrg_intr.c + chrg_pin.c 1 applications\bsp\chrg_pin.c + + chrg_south.c + 1 + applications\thread\chrg_south.c + + + chrg_tty.c + 1 + applications\bsp\chrg_tty.c + chrg_can.c 1 applications\bsp\chrg_can.c + + chrg_tmr.c + 1 + applications\bsp\chrg_tmr.c + + + main.c + 1 + applications\main.c + + + chrg_switch.c + 1 + applications\bsp\chrg_switch.c + chrg_fal.c 1 @@ -1616,6 +1626,11 @@ Fal + + fal_flash.c + 1 + ..\..\rt-thread\components\fal\src\fal_flash.c + fal_rtt.c 1 @@ -1631,21 +1646,11 @@ 1 ..\..\rt-thread\components\fal\src\fal.c - - fal_flash.c - 1 - ..\..\rt-thread\components\fal\src\fal_flash.c - Finsh - - shell.c - 1 - ..\..\rt-thread\components\finsh\shell.c - cmd.c 1 @@ -1661,80 +1666,25 @@ 1 ..\..\rt-thread\components\finsh\msh.c + + shell.c + 1 + ..\..\rt-thread\components\finsh\shell.c + FreeModbus - mbfuncdiag.c + user_mb_app_m.c 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncdiag.c + ..\..\libs\freemodbus\port\user_mb_app_m.c - mbfuncdisc_m.c + mbfuncholding.c 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncdisc_m.c - - - mbrtu.c - 1 - ..\..\libs\freemodbus\modbus\rtu\mbrtu.c - - - port.c - 1 - ..\..\libs\freemodbus\port\port.c - - - mbfunccoils.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfunccoils.c - - - mb_m.c - 1 - ..\..\libs\freemodbus\modbus\mb_m.c - - - sample_mb_master.c - 1 - ..\..\libs\freemodbus\samples\sample_mb_master.c - - - portserial_m.c - 1 - ..\..\libs\freemodbus\port\portserial_m.c - - - mbfuncdisc.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncdisc.c - - - porttimer.c - 1 - ..\..\libs\freemodbus\port\porttimer.c - - - mbfuncinput_m.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncinput_m.c - - - mbfuncholding_m.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncholding_m.c - - - mbfuncother.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncother.c - - - mbfunccoils_m.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfunccoils_m.c + ..\..\libs\freemodbus\modbus\functions\mbfuncholding.c porttcp.c @@ -1742,14 +1692,19 @@ ..\..\libs\freemodbus\port\porttcp.c - portevent.c + mbfunccoils_m.c 1 - ..\..\libs\freemodbus\port\portevent.c + ..\..\libs\freemodbus\modbus\functions\mbfunccoils_m.c - mbcrc.c + mbfuncother.c 1 - ..\..\libs\freemodbus\modbus\rtu\mbcrc.c + ..\..\libs\freemodbus\modbus\functions\mbfuncother.c + + + port.c + 1 + ..\..\libs\freemodbus\port\port.c mbrtu_m.c @@ -1757,9 +1712,74 @@ ..\..\libs\freemodbus\modbus\rtu\mbrtu_m.c - user_mb_app_m.c + mbfuncinput.c 1 - ..\..\libs\freemodbus\port\user_mb_app_m.c + ..\..\libs\freemodbus\modbus\functions\mbfuncinput.c + + + mbfuncdisc.c + 1 + ..\..\libs\freemodbus\modbus\functions\mbfuncdisc.c + + + mb_m.c + 1 + ..\..\libs\freemodbus\modbus\mb_m.c + + + sample_mb_slave.c + 1 + ..\..\libs\freemodbus\samples\sample_mb_slave.c + + + mbrtu.c + 1 + ..\..\libs\freemodbus\modbus\rtu\mbrtu.c + + + mbfuncinput_m.c + 1 + ..\..\libs\freemodbus\modbus\functions\mbfuncinput_m.c + + + mb.c + 1 + ..\..\libs\freemodbus\modbus\mb.c + + + portevent_m.c + 1 + ..\..\libs\freemodbus\port\portevent_m.c + + + porttimer.c + 1 + ..\..\libs\freemodbus\port\porttimer.c + + + portserial_m.c + 1 + ..\..\libs\freemodbus\port\portserial_m.c + + + mbfuncdisc_m.c + 1 + ..\..\libs\freemodbus\modbus\functions\mbfuncdisc_m.c + + + mbutils.c + 1 + ..\..\libs\freemodbus\modbus\functions\mbutils.c + + + mbfuncholding_m.c + 1 + ..\..\libs\freemodbus\modbus\functions\mbfuncholding_m.c + + + portevent.c + 1 + ..\..\libs\freemodbus\port\portevent.c user_mb_app.c @@ -1772,14 +1792,19 @@ ..\..\libs\freemodbus\port\porttimer_m.c - portevent_m.c + mbcrc.c 1 - ..\..\libs\freemodbus\port\portevent_m.c + ..\..\libs\freemodbus\modbus\rtu\mbcrc.c - sample_mb_slave.c + mbfunccoils.c 1 - ..\..\libs\freemodbus\samples\sample_mb_slave.c + ..\..\libs\freemodbus\modbus\functions\mbfunccoils.c + + + mbfuncdiag.c + 1 + ..\..\libs\freemodbus\modbus\functions\mbfuncdiag.c portserial.c @@ -1787,24 +1812,9 @@ ..\..\libs\freemodbus\port\portserial.c - mbutils.c + sample_mb_master.c 1 - ..\..\libs\freemodbus\modbus\functions\mbutils.c - - - mbfuncholding.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncholding.c - - - mb.c - 1 - ..\..\libs\freemodbus\modbus\mb.c - - - mbfuncinput.c - 1 - ..\..\libs\freemodbus\modbus\functions\mbfuncinput.c + ..\..\libs\freemodbus\samples\sample_mb_master.c @@ -2657,9 +2667,9 @@ klibc - rt_vsnprintf_tiny.c + kstdio.c 1 - ..\..\rt-thread\src\klibc\rt_vsnprintf_tiny.c + ..\..\rt-thread\src\klibc\kstdio.c rt_vsscanf.c @@ -2667,20 +2677,20 @@ ..\..\rt-thread\src\klibc\rt_vsscanf.c - kstdio.c + kerrno.c 1 - ..\..\rt-thread\src\klibc\kstdio.c + ..\..\rt-thread\src\klibc\kerrno.c + + + rt_vsnprintf_tiny.c + 1 + ..\..\rt-thread\src\klibc\rt_vsnprintf_tiny.c kstring.c 1 ..\..\rt-thread\src\klibc\kstring.c - - kerrno.c - 1 - ..\..\rt-thread\src\klibc\kerrno.c - @@ -2732,70 +2742,115 @@ STM32F4-HAL - stm32f4xx_hal_rng.c + stm32f4xx_hal_crc.c 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rng.c + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_crc.c + + + stm32f4xx_hal_i2c_ex.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_i2c_ex.c stm32f4xx_hal_rtc.c 1 ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rtc.c - - stm32f4xx_hal_flash_ramfunc.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash_ramfunc.c - - - stm32f4xx_hal_usart.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_usart.c - stm32f4xx_hal_dma_ex.c 1 ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma_ex.c - stm32f4xx_hal_crc.c + stm32f4xx_hal.c 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_crc.c + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal.c - stm32f4xx_hal_cec.c + stm32f4xx_hal_rcc_ex.c 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cec.c - - - stm32f4xx_hal_wwdg.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_wwdg.c - - - stm32f4xx_hal_flash.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash.c - - - stm32f4xx_hal_flash_ex.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash_ex.c - - - stm32f4xx_hal_cryp.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp.c + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc_ex.c stm32f4xx_hal_can.c 1 ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_can.c + + stm32f4xx_hal_tim.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_tim.c + + + stm32f4xx_hal_dma.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma.c + + + stm32f4xx_hal_cryp.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp.c + + + stm32f4xx_hal_cortex.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cortex.c + + + stm32f4xx_hal_rcc.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc.c + stm32f4xx_hal_tim_ex.c 1 ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_tim_ex.c + + stm32f4xx_hal_rtc_ex.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rtc_ex.c + + + stm32f4xx_hal_pwr_ex.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr_ex.c + + + stm32f4xx_hal_uart.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_uart.c + + + stm32f4xx_hal_flash_ex.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash_ex.c + + + stm32f4xx_hal_flash.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash.c + + + stm32f4xx_hal_wwdg.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_wwdg.c + + + stm32f4xx_hal_rng.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rng.c + + + stm32f4xx_hal_usart.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_usart.c + + + stm32f4xx_hal_lptim.c + 1 + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_lptim.c + stm32f4xx_hal_i2c.c 1 @@ -2817,65 +2872,20 @@ ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr.c - stm32f4xx_hal.c + stm32f4xx_hal_cec.c 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal.c + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cec.c - stm32f4xx_hal_dma.c + stm32f4xx_hal_flash_ramfunc.c 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma.c - - - stm32f4xx_hal_uart.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_uart.c - - - stm32f4xx_hal_i2c_ex.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_i2c_ex.c - - - stm32f4xx_hal_rtc_ex.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rtc_ex.c - - - stm32f4xx_hal_rcc.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc.c - - - stm32f4xx_hal_rcc_ex.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc_ex.c - - - stm32f4xx_hal_lptim.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_lptim.c + ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash_ramfunc.c stm32f4xx_hal_iwdg.c 1 ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_iwdg.c - - stm32f4xx_hal_cortex.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cortex.c - - - stm32f4xx_hal_tim.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_tim.c - - - stm32f4xx_hal_pwr_ex.c - 1 - ..\..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr_ex.c - diff --git a/apps/chrg/template.uvprojx b/apps/chrg/template.uvprojx index 5bcfb67..7698477 100644 --- a/apps/chrg/template.uvprojx +++ b/apps/chrg/template.uvprojx @@ -7,7 +7,7 @@ - rt-thread + chrg 0x4 ARM-ADS 0 @@ -48,7 +48,7 @@ 1 .\build\keil\Obj\ - rt-thread + chrg 1 0 1 diff --git a/mdks/all_mdks.uvmpw.uvgui.weiqi b/mdks/all_mdks.uvmpw.uvgui.weiqi deleted file mode 100644 index a51ba40..0000000 --- a/mdks/all_mdks.uvmpw.uvgui.weiqi +++ /dev/null @@ -1,1779 +0,0 @@ - - - - -6.1 - -
### uVision Project, (C) Keil Software
- - - - - 44 - 0 - 1 - - -1 - -1 - - - -1 - -1 - - - 67 - 567 - 1842 - 1014 - - - - 0 - - 60 - 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000000000000 - - - - 0 - Build - - -1 - -1 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F40000004F00000090050000DD000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1005 - 1005 - 1 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 0300000066000000ED00000015020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 109 - 109 - 1 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 0300000066000000ED00000015020000 - - - 16 - 3C00000053000000580100008F020000 - - - - 1465 - 1465 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 000000002902000090050000B7020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1466 - 1466 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1467 - 1467 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1468 - 1468 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1506 - 1506 - 0 - 0 - 0 - 0 - 32767 - 0 - 16384 - 0 - - 16 - A3040000660000008D050000FF000000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 1913 - 1913 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F7000000660000008D050000C4000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1935 - 1935 - 0 - 0 - 0 - 0 - 32767 - 0 - 32768 - 0 - - 16 - 030000002C0200008D0500009E020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 1936 - 1936 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 1937 - 1937 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 1939 - 1939 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1940 - 1940 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1941 - 1941 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 1942 - 1942 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 195 - 195 - 1 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 0300000066000000ED00000015020000 - - - 16 - 3C00000053000000580100008F020000 - - - - 196 - 196 - 1 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 0300000066000000ED00000015020000 - - - 16 - 3C00000053000000580100008F020000 - - - - 197 - 197 - 1 - 0 - 0 - 0 - 32767 - 0 - 32768 - 0 - - 16 - 0000000046020000EB04000079030000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 198 - 198 - 0 - 0 - 0 - 0 - 32767 - 0 - 32768 - 0 - - 16 - 000000001502000090050000B7020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 199 - 199 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 03000000490200008D050000A7020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 203 - 203 - 0 - 0 - 0 - 0 - 32767 - 0 - 8192 - 0 - - 16 - F40000006300000090050000DD000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 204 - 204 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F7000000660000008D050000C4000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 221 - 221 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 00000000000000000000000000000000 - - - 16 - 0A0000000A0000006E0000006E000000 - - - - 2506 - 2506 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A0040000630000009005000025020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 2507 - 2507 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 000000002902000090050000A3020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 343 - 343 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F7000000660000008D050000C4000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 346 - 346 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F7000000660000008D050000C4000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 35141 - 35141 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F40000006300000090050000DD000000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35824 - 35824 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F7000000660000008D050000C4000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 35885 - 35885 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35886 - 35886 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35887 - 35887 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35888 - 35888 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35889 - 35889 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35890 - 35890 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35891 - 35891 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35892 - 35892 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35893 - 35893 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35894 - 35894 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35895 - 35895 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35896 - 35896 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35897 - 35897 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35898 - 35898 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35899 - 35899 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35900 - 35900 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35901 - 35901 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35902 - 35902 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35903 - 35903 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35904 - 35904 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 35905 - 35905 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 38003 - 38003 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 0300000066000000ED0000009E020000 - - - 16 - 3C00000053000000580100008F020000 - - - - 38007 - 38007 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 000000004602000090050000C0020000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 436 - 436 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 03000000490200008D050000A7020000 - - - 16 - 3C00000053000000580100008F020000 - - - - 437 - 437 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 440 - 440 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 463 - 463 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 03000000490200008D050000A7020000 - - - 16 - 3C00000053000000580100008F020000 - - - - 466 - 466 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 03000000490200008D050000A7020000 - - - 16 - 3C00000053000000580100008F020000 - - - - 470 - 470 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - F7000000660000008D050000C4000000 - - - 16 - 3C0000005300000004030000E1000000 - - - - 50000 - 50000 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50001 - 50001 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50002 - 50002 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50003 - 50003 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50004 - 50004 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50005 - 50005 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50006 - 50006 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50007 - 50007 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50008 - 50008 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50009 - 50009 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50010 - 50010 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50011 - 50011 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50012 - 50012 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50013 - 50013 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50014 - 50014 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50015 - 50015 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50016 - 50016 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50017 - 50017 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50018 - 50018 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 50019 - 50019 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - A3040000660000008D0500007A010000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 59392 - 59392 - 1 - 0 - 0 - 0 - 32767 - 0 - 8192 - 0 - - 16 - 0000000000000000D10300001C000000 - - - 16 - 0A0000000A0000006E0000006E000000 - - - - 59393 - 0 - 1 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 0000000079030000EB0400008C030000 - - - 16 - 0A0000000A0000006E0000006E000000 - - - - 59399 - 59399 - 1 - 0 - 0 - 0 - 32767 - 0 - 8192 - 1 - - 16 - 000000001C000000E701000038000000 - - - 16 - 0A0000000A0000006E0000006E000000 - - - - 59400 - 59400 - 0 - 0 - 0 - 0 - 32767 - 0 - 8192 - 2 - - 16 - 00000000380000006F02000054000000 - - - 16 - 0A0000000A0000006E0000006E000000 - - - - 824 - 824 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000002C0200008D0500008A020000 - - - 16 - 3C000000530000002C0100001C010000 - - - - 3334 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000003C0000005300000004030000E1000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000003C000000530000002C0100001C010000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000002E020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000003C000000530000002C0100001C010000000000004F000000F00000002E0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000011020000900500001502000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000003C000000530000002C0100001C010000000000001502000090050000B702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000002E020000EB04000032020000010000000100001004000000010000006DFDFFFF8C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000003C0000005300000004030000E10000000000000032020000EB040000790300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF24536F757263652042726F77736572202D202A2A2A204E6F7420456E61626C6564202A2A2A00000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 - - - 59392 - File - - 2556 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000400020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000004000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000004000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000040000000000000000000000000000000000000100000001000000960000000200205000000000074D65737361676596000000000000000100074D65737361676500000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000004001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 - - - 1423 - 2800FFFF01001100434D4643546F6F6C426172427574746F6E00E1000000000000FFFFFFFF000100000000000000010000000000000001000000018001E1000000000000FFFFFFFF000100000000000000010000000000000001000000018003E1000000000000FFFFFFFF0001000000000000000100000000000000010000000180CD7F000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF000000000000000000010000000000000001000000018023E1000000000000FFFFFFFF000100000000000000010000000000000001000000018022E1000000000000FFFFFFFF000100000000000000010000000000000001000000018025E1000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001802BE1000000000000FFFFFFFF00010000000000000001000000000000000100000001802CE1000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001807A8A000000000000FFFFFFFF00010000000000000001000000000000000100000001807B8A000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180D3B0000000000000FFFFFFFF000100000000000000010000000000000001000000018015B1000000000000FFFFFFFF0001000000000000000100000000000000010000000180F4B0000000000000FFFFFFFF000100000000000000010000000000000001000000018036B1000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180FF88000000000000FFFFFFFF0001000000000000000100000000000000010000000180FE88000000000000FFFFFFFF00010000000000000001000000000000000100000001800B81000000000000FFFFFFFF00010000000000000001000000000000000100000001800C81000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180F088000000000000FFFFFFFF0001000000000000000100000000000000010000000180EE7F000000000000FFFFFFFF000100000000000000010000000000000001000000018024E1000000000000FFFFFFFF00010000000000000001000000000000000100000001800A81000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001802280000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180C488000000000000FFFFFFFF0001000000000000000100000000000000010000000180C988000000000000FFFFFFFF0001000000000000000100000000000000010000000180C788000000000000FFFFFFFF0001000000000000000100000000000000010000000180C888000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180DD88000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180FB7F000000000000FFFFFFFF000100000000000000010000000000000001000000 - - - 1423 - 2800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000000004000000000000000000000000000000000100000001000000018022E100000000000005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000000000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000000000C0000000000000000000000000000000001000000010000000180F4B00000000000000D000000000000000000000000000000000100000001000000018036B10000000000000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF880000000000000F0000000000000000000000000000000001000000010000000180FE880000000000001000000000000000000000000000000000010000000100000001800B810000000000001100000000000000000000000000000000010000000100000001800C810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F088000000000000130000000000000000000000000000000001000000010000000180EE7F00000000000014000000000000000000000000000000000100000001000000018024E10000000000001500000000000000000000000000000000010000000100000001800A810000000000001600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000180000000000000000000000000000000001000000010000000180C988000000000000190000000000000000000000000000000001000000010000000180C7880000000000001A0000000000000000000000000000000001000000010000000180C8880000000000001B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180DD880000000000001C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001D000000000000000000000000000000000100000001000000 - - - - 59399 - Build - - 968 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000004626F6F749600000000000000010004626F6F74000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 - - - 583 - 1000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F000000000000FFFFFFFF0001000000000000000100000000000000010000000180D07F000000000000FFFFFFFF00010000000000000001000000000000000100000001803080000000000000FFFFFFFF00010000000000000001000000000000000100000001809E8A000000000000FFFFFFFF0001000000000000000100000000000000010000000180D17F000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001804C8A000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001806680000000000000FFFFFFFF0001000000000000000100000000000000010000000180EB88000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180C07F000000000000FFFFFFFF0001000000000000000100000000000000010000000180B08A000000000000FFFFFFFF0001000000000000000100000000000000010000000180A801000000000000FFFFFFFF00010000000000000001000000000000000100000001807202000000000000FFFFFFFF0001000000000000000100000000000000010000000180BE01000000000000FFFFFFFF000100000000000000010000000000000001000000 - - - 583 - 1000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F000000000000000000000000000000000000000000000001000000010000000180D07F00000000000001000000000000000000000000000000000100000001000000018030800000000000000200000000000000000000000000000000010000000100000001809E8A000000000000030000000000000000000000000000000001000000010000000180D17F0000000000000400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000000500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001806680000000000000060000000000000000000000000000000001000000010000000180EB880000000000000700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000080000000000000000000000000000000001000000010000000180B08A000000000000090000000000000000000000000000000001000000010000000180A8010000000000000A000000000000000000000000000000000100000001000000018072020000000000000B0000000000000000000000000000000001000000010000000180BE010000000000000C000000000000000000000000000000000100000001000000 - - - - 59400 - Debug - - 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 - - - 898 - 1900FFFF01001100434D4643546F6F6C426172427574746F6ECC88000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001801780000000000000FFFFFFFF00010000000000000001000000000000000100000001801D80000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001801A80000000000000FFFFFFFF00010000000000000001000000000000000100000001801B80000000000000FFFFFFFF0001000000000000000100000000000000010000000180E57F000000000000FFFFFFFF00010000000000000001000000000000000100000001801C80000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001800089000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180E48B000000000000FFFFFFFF0001000000000000000100000000000000010000000180F07F000000000000FFFFFFFF0001000000000000000100000000000000010000000180E888000000000000FFFFFFFF00010000000000000001000000000000000100000001803B01000000000000FFFFFFFF0001000000000000000100000000000000010000000180BB8A000000000000FFFFFFFF0001000000000000000100000000000000010000000180D88B000000000000FFFFFFFF0001000000000000000100000000000000010000000180D28B000000000000FFFFFFFF00010000000000000001000000000000000100000001809307000000000000FFFFFFFF0001000000000000000100000000000000010000000180658A000000000000FFFFFFFF0001000000000000000100000000000000010000000180C18A000000000000FFFFFFFF0001000000000000000100000000000000010000000180EE8B000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001800189000000000000FFFFFFFF000100000000000000010000000000000001000000 - - - 898 - 1900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000000000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000000100000000000000000000000000000000010000000100000001801D800000000000000200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000000300000000000000000000000000000000010000000100000001801B80000000000000040000000000000000000000000000000001000000010000000180E57F0000000000000500000000000000000000000000000000010000000100000001801C800000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000000700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B000000000000080000000000000000000000000000000001000000010000000180F07F000000000000090000000000000000000000000000000001000000010000000180E8880000000000000A00000000000000000000000000000000010000000100000001803B010000000000000B0000000000000000000000000000000001000000010000000180BB8A0000000000000C0000000000000000000000000000000001000000010000000180D88B0000000000000D0000000000000000000000000000000001000000010000000180D28B0000000000000E000000000000000000000000000000000100000001000000018093070000000000000F0000000000000000000000000000000001000000010000000180658A000000000000100000000000000000000000000000000001000000010000000180C18A000000000000110000000000000000000000000000000001000000010000000180EE8B0000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180018900000000000013000000000000000000000000000000000100000001000000 - - - - 0 - 1920 - 1080 - - - - - diff --git a/mdks/chrg.uvprojx b/mdks/chrg.uvprojx index c20dccf..ad437b5 100644 --- a/mdks/chrg.uvprojx +++ b/mdks/chrg.uvprojx @@ -53,7 +53,7 @@ 1 0 1 - 0 + 1 0 .\Objects\ 1 @@ -159,11 +159,11 @@ 1 1 0 - 0 + 1 1 0 0 - 0 + 1 1 1 1 @@ -211,7 +211,7 @@ 0 0 1 - 1 + 0 0 @@ -275,7 +275,7 @@ 1 - 0x8010000 + 0x8040000 0x40000 @@ -313,7 +313,7 @@ 1 - 1 + 3 0 0 1 @@ -337,9 +337,9 @@ 0 - RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC, USE_HAL_DRIVER, __RTTHREAD__, STM32F405xx, __STDC_LIMIT_MACROS,USER_VECT_TAB_ADDRESS=0x10000 + STM32F405xx, RT_USING_ARMLIBC, RT_USING_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, USE_HAL_DRIVER, __STDC_LIMIT_MACROS - ..\lib\freemodbus\modbus\include;..\rt-thread\components\drivers\phy;..\lib\stm32f4\STM32F4_HAL\Inc;..\lib\freemodbus\modbus\rtu;..\rt-thread\components\drivers\include;..\lib\freemodbus\port;..\apps\chrg;..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers;..\rt-thread\components\net\netdev\include;..\rt-thread\components\drivers\smp_call;..\rt-thread\components\net\sal\include\socket;..\lib\cmsis-core\Include;..\lib\stm32f4\STM32F4_CMSIS\Include;..\rt-thread\libcpu\arm\cortex-m4;..\apps\chrg\board\CubeMX_Config\Inc;..\rt-thread\components\libc\compilers\common\extension\fcntl\octal;..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\config;..\rt-thread\libcpu\arm\common;..\rt-thread\include;..\rt-thread\components\libc\posix\io\epoll;..\lib\stm32f4\STM32F4_HAL\Inc\Legacy;..\rt-thread\components\libc\posix\ipc;..\rt-thread\components\libc\posix\io\poll;..\rt-thread\components\drivers\include;..\rt-thread\components\libc\compilers\common\extension;..\rt-thread\components\libc\compilers\common\include;..\rt-thread\bsp\stm32\libraries\HAL_Drivers;..\lib\freemodbus\modbus\ascii;..\apps\chrg\board;..\rt-thread\components\drivers\include;..\apps\chrg\applications;..\lib\freemodbus\modbus\tcp;..\rt-thread\components\finsh;..\rt-thread\components\drivers\include;..\rt-thread\components\net\sal\include\socket\sys_socket;..\rt-thread\components\net\sal\include;..\rt-thread\components\libc\posix\io\eventfd;..\rt-thread\components\drivers\include + ..\rt-thread\components\drivers\include;..\apps\chrg\board\ports;..\rt-thread\components\drivers\include;..\apps\chrg\board\CubeMX_Config\Inc;..\rt-thread\components\finsh;..\rt-thread\components\drivers\include;..\rt-thread\components\drivers\include;..\rt-thread\components\drivers\include;..\libs\freemodbus\port;..\apps\chrg\applications;..\rt-thread\libcpu\arm\cortex-m4;..\rt-thread\components\libc\posix\ipc;..\apps\chrg\;..\libs\cmsis-core\Include;..\rt-thread\components\libc\posix\io\epoll;..\libs\stm32f4\STM32F4_HAL\Inc\Legacy;..\rt-thread\components\drivers\include;..\rt-thread\components\drivers\include;..\rt-thread\bsp\stm32\libraries\HAL_Drivers;..\rt-thread\components\libc\posix\io\poll;..\rt-thread\components\libc\posix\io\eventfd;..\rt-thread\components\drivers\include;..\apps\chrg\applications\bsp;..\apps\chrg\board;..\rt-thread\components\drivers\include;..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers;..\rt-thread\libcpu\arm\common;..\libs\freemodbus\modbus\rtu;..\libs\freemodbus\modbus\include;..\rt-thread\components\fal\inc;..\libs\stm32f4\STM32F4_CMSIS\Include;..\rt-thread\components\drivers\smp_call;..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_flash;..\rt-thread\components\drivers\include;..\rt-thread\components\drivers\phy;..\rt-thread\include;..\libs\freemodbus\modbus\ascii;..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\config;..\libs\stm32f4\STM32F4_HAL\Inc;..\rt-thread\components\libc\compilers\common\extension\fcntl\octal;..\rt-thread\components\libc\compilers\common\extension;..\libs\freemodbus\modbus\tcp;..\rt-thread\components\libc\compilers\common\include;..\apps\chrg\applications\thread @@ -365,7 +365,7 @@ 0 0 0 - 0 + 1 0 0x08000000 0x20000000 @@ -383,11 +383,71 @@ Applications + + chrg_wdt.c + 1 + ..\apps\chrg\applications\bsp\chrg_wdt.c + + + chrg_fal.c + 1 + ..\apps\chrg\applications\bsp\chrg_fal.c + + + chrg_tty.c + 1 + ..\apps\chrg\applications\bsp\chrg_tty.c + + + chrg_can.c + 1 + ..\apps\chrg\applications\bsp\chrg_can.c + + + chrg_intr.c + 1 + ..\apps\chrg\applications\bsp\chrg_intr.c + + + chrg_i2c.c + 1 + ..\apps\chrg\applications\bsp\chrg_i2c.c + + + chrg_pin.c + 1 + ..\apps\chrg\applications\bsp\chrg_pin.c + + + chrg_tmr.c + 1 + ..\apps\chrg\applications\bsp\chrg_tmr.c + + + chrg_switch.c + 1 + ..\apps\chrg\applications\bsp\chrg_switch.c + main.c 1 ..\apps\chrg\applications\main.c + + chrg_clk.c + 1 + ..\apps\chrg\applications\bsp\chrg_clk.c + + + chrg_north.c + 1 + ..\apps\chrg\applications\thread\chrg_north.c + + + chrg_south.c + 1 + ..\apps\chrg\applications\thread\chrg_south.c + @@ -438,6 +498,62 @@ DeviceDrivers + + dev_can.c + 1 + ..\rt-thread\components\drivers\can\dev_can.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_IPC_SOURCE__ + + + + + + + device.c 1 @@ -494,6 +610,230 @@ + + hwtimer.c + 1 + ..\rt-thread\components\drivers\hwtimer\hwtimer.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_IPC_SOURCE__ + + + + + + + + + dev_i2c_bit_ops.c + 1 + ..\rt-thread\components\drivers\i2c\dev_i2c_bit_ops.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_IPC_SOURCE__ + + + + + + + + + dev_i2c_core.c + 1 + ..\rt-thread\components\drivers\i2c\dev_i2c_core.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_IPC_SOURCE__ + + + + + + + + + dev_i2c_dev.c + 1 + ..\rt-thread\components\drivers\i2c\dev_i2c_dev.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_IPC_SOURCE__ + + + + + + + completion_comm.c 1 @@ -1054,6 +1394,62 @@ + + dev_rtc.c + 1 + ..\rt-thread\components\drivers\rtc\dev_rtc.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_IPC_SOURCE__ + + + + + + + dev_serial.c 1 @@ -1110,6 +1506,62 @@ + + dev_watchdog.c + 1 + ..\rt-thread\components\drivers\watchdog\dev_watchdog.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_IPC_SOURCE__ + + + + + + + @@ -1125,16 +1577,46 @@ 1 ..\apps\chrg\board\board.c + + drv_can.c + 1 + ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_can.c + + + drv_flash_f4.c + 1 + ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_flash\drv_flash_f4.c + drv_gpio.c 1 ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_gpio.c + + drv_rtc.c + 1 + ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_rtc.c + + + drv_soft_i2c.c + 1 + ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_soft_i2c.c + + + drv_tim.c + 1 + ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_tim.c + drv_usart.c 1 ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_usart.c + + drv_wdt.c + 1 + ..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\drv_wdt.c + drv_common.c 1 @@ -1143,13 +1625,33 @@ - Finsh + Fal - cmd.c + fal_partition.c 1 - ..\rt-thread\components\finsh\cmd.c + ..\rt-thread\components\fal\src\fal_partition.c + + fal_flash.c + 1 + ..\rt-thread\components\fal\src\fal_flash.c + + + fal_rtt.c + 1 + ..\rt-thread\components\fal\src\fal_rtt.c + + + fal.c + 1 + ..\rt-thread\components\fal\src\fal.c + + + + + Finsh + msh_parse.c 1 @@ -1165,150 +1667,155 @@ 1 ..\rt-thread\components\finsh\shell.c + + cmd.c + 1 + ..\rt-thread\components\finsh\cmd.c + FreeModbus - user_mb_app_m.c + user_mb_app.c 1 - ..\lib\freemodbus\port\user_mb_app_m.c - - - mbfuncdisc.c - 1 - ..\lib\freemodbus\modbus\functions\mbfuncdisc.c + ..\libs\freemodbus\port\user_mb_app.c mbfunccoils_m.c 1 - ..\lib\freemodbus\modbus\functions\mbfunccoils_m.c - - - portevent.c - 1 - ..\lib\freemodbus\port\portevent.c - - - mb_m.c - 1 - ..\lib\freemodbus\modbus\mb_m.c - - - mb.c - 1 - ..\lib\freemodbus\modbus\mb.c - - - mbfuncinput_m.c - 1 - ..\lib\freemodbus\modbus\functions\mbfuncinput_m.c - - - port.c - 1 - ..\lib\freemodbus\port\port.c - - - portserial.c - 1 - ..\lib\freemodbus\port\portserial.c - - - porttimer_m.c - 1 - ..\lib\freemodbus\port\porttimer_m.c + ..\libs\freemodbus\modbus\functions\mbfunccoils_m.c mbutils.c 1 - ..\lib\freemodbus\modbus\functions\mbutils.c - - - sample_mb_slave.c - 1 - ..\lib\freemodbus\samples\sample_mb_slave.c - - - portevent_m.c - 1 - ..\lib\freemodbus\port\portevent_m.c - - - mbfuncdiag.c - 1 - ..\lib\freemodbus\modbus\functions\mbfuncdiag.c - - - mbfuncholding.c - 1 - ..\lib\freemodbus\modbus\functions\mbfuncholding.c - - - portserial_m.c - 1 - ..\lib\freemodbus\port\portserial_m.c - - - mbrtu.c - 1 - ..\lib\freemodbus\modbus\rtu\mbrtu.c + ..\libs\freemodbus\modbus\functions\mbutils.c mbfuncdisc_m.c 1 - ..\lib\freemodbus\modbus\functions\mbfuncdisc_m.c + ..\libs\freemodbus\modbus\functions\mbfuncdisc_m.c porttcp.c 1 - ..\lib\freemodbus\port\porttcp.c + ..\libs\freemodbus\port\porttcp.c - user_mb_app.c + sample_mb_slave.c 1 - ..\lib\freemodbus\port\user_mb_app.c - - - mbfunccoils.c - 1 - ..\lib\freemodbus\modbus\functions\mbfunccoils.c - - - mbfuncinput.c - 1 - ..\lib\freemodbus\modbus\functions\mbfuncinput.c + ..\libs\freemodbus\samples\sample_mb_slave.c mbfuncholding_m.c 1 - ..\lib\freemodbus\modbus\functions\mbfuncholding_m.c + ..\libs\freemodbus\modbus\functions\mbfuncholding_m.c - porttimer.c + porttimer_m.c 1 - ..\lib\freemodbus\port\porttimer.c + ..\libs\freemodbus\port\porttimer_m.c mbcrc.c 1 - ..\lib\freemodbus\modbus\rtu\mbcrc.c + ..\libs\freemodbus\modbus\rtu\mbcrc.c - mbfuncother.c + mbfuncinput_m.c 1 - ..\lib\freemodbus\modbus\functions\mbfuncother.c + ..\libs\freemodbus\modbus\functions\mbfuncinput_m.c + + + user_mb_app_m.c + 1 + ..\libs\freemodbus\port\user_mb_app_m.c + + + mb_m.c + 1 + ..\libs\freemodbus\modbus\mb_m.c + + + portevent.c + 1 + ..\libs\freemodbus\port\portevent.c sample_mb_master.c 1 - ..\lib\freemodbus\samples\sample_mb_master.c + ..\libs\freemodbus\samples\sample_mb_master.c + + + mbfuncother.c + 1 + ..\libs\freemodbus\modbus\functions\mbfuncother.c + + + port.c + 1 + ..\libs\freemodbus\port\port.c + + + portserial.c + 1 + ..\libs\freemodbus\port\portserial.c + + + mbrtu.c + 1 + ..\libs\freemodbus\modbus\rtu\mbrtu.c + + + mbfuncdiag.c + 1 + ..\libs\freemodbus\modbus\functions\mbfuncdiag.c + + + portserial_m.c + 1 + ..\libs\freemodbus\port\portserial_m.c + + + portevent_m.c + 1 + ..\libs\freemodbus\port\portevent_m.c + + + mbfuncinput.c + 1 + ..\libs\freemodbus\modbus\functions\mbfuncinput.c + + + mbfunccoils.c + 1 + ..\libs\freemodbus\modbus\functions\mbfunccoils.c + + + porttimer.c + 1 + ..\libs\freemodbus\port\porttimer.c + + + mb.c + 1 + ..\libs\freemodbus\modbus\mb.c + + + mbfuncdisc.c + 1 + ..\libs\freemodbus\modbus\functions\mbfuncdisc.c mbrtu_m.c 1 - ..\lib\freemodbus\modbus\rtu\mbrtu_m.c + ..\libs\freemodbus\modbus\rtu\mbrtu_m.c + + + mbfuncholding.c + 1 + ..\libs\freemodbus\modbus\functions\mbfuncholding.c @@ -2161,9 +2668,9 @@ klibc - kerrno.c + kstdio.c 1 - ..\rt-thread\src\klibc\kerrno.c + ..\rt-thread\src\klibc\kstdio.c rt_vsnprintf_tiny.c @@ -2171,20 +2678,20 @@ ..\rt-thread\src\klibc\rt_vsnprintf_tiny.c - kstdio.c + kerrno.c 1 - ..\rt-thread\src\klibc\kstdio.c - - - rt_vsscanf.c - 1 - ..\rt-thread\src\klibc\rt_vsscanf.c + ..\rt-thread\src\klibc\kerrno.c kstring.c 1 ..\rt-thread\src\klibc\kstring.c + + rt_vsscanf.c + 1 + ..\rt-thread\src\klibc\rt_vsscanf.c + @@ -2217,43 +2724,18 @@ - - SAL - - - netdev.c - 1 - ..\rt-thread\components\net\netdev\src\netdev.c - - - netdev_ipaddr.c - 1 - ..\rt-thread\components\net\netdev\src\netdev_ipaddr.c - - - net_netdb.c - 1 - ..\rt-thread\components\net\sal\socket\net_netdb.c - - - sal_socket.c - 1 - ..\rt-thread\components\net\sal\src\sal_socket.c - - - STM32F4-CMSIS startup_stm32f405xx.s 2 - ..\lib\stm32f4\STM32F4_CMSIS\Source\Templates\arm\startup_stm32f405xx.s + ..\libs\stm32f4\STM32F4_CMSIS\Source\Templates\arm\startup_stm32f405xx.s system_stm32f4xx.c 1 - ..\lib\stm32f4\STM32F4_CMSIS\Source\Templates\system_stm32f4xx.c + ..\libs\stm32f4\STM32F4_CMSIS\Source\Templates\system_stm32f4xx.c @@ -2261,84 +2743,149 @@ STM32F4-HAL - stm32f4xx_hal.c + stm32f4xx_hal_gpio.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_gpio.c - stm32f4xx_hal_rcc_ex.c + stm32f4xx_hal_rtc.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc_ex.c - - - stm32f4xx_hal_pwr_ex.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr_ex.c - - - stm32f4xx_hal_uart.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_uart.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rtc.c stm32f4xx_hal_cryp.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp.c - - - stm32f4xx_hal_gpio.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_gpio.c - - - stm32f4xx_hal_dma_ex.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma_ex.c - - - stm32f4xx_hal_crc.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_crc.c - - - stm32f4xx_hal_usart.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_usart.c - - - stm32f4xx_hal_rng.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rng.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp.c stm32f4xx_hal_rcc.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc.c + + + stm32f4xx_hal_can.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_can.c stm32f4xx_hal_cortex.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cortex.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cortex.c + + + stm32f4xx_hal_rng.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rng.c stm32f4xx_hal_cryp_ex.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp_ex.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp_ex.c + + + stm32f4xx_hal_wwdg.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_wwdg.c + + + stm32f4xx_hal_flash.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash.c + + + stm32f4xx_hal_tim_ex.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_tim_ex.c + + + stm32f4xx_hal_pwr_ex.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr_ex.c + + + stm32f4xx_hal_iwdg.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_iwdg.c + + + stm32f4xx_hal_uart.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_uart.c + + + stm32f4xx_hal_flash_ramfunc.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash_ramfunc.c + + + stm32f4xx_hal_tim.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_tim.c + + + stm32f4xx_hal_crc.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_crc.c + + + stm32f4xx_hal_rcc_ex.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc_ex.c + + + stm32f4xx_hal_dma_ex.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma_ex.c + + + stm32f4xx_hal_usart.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_usart.c + + + stm32f4xx_hal_lptim.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_lptim.c + + + stm32f4xx_hal_i2c_ex.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_i2c_ex.c + + + stm32f4xx_hal_rtc_ex.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rtc_ex.c stm32f4xx_hal_cec.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cec.c - - - stm32f4xx_hal_dma.c - 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cec.c stm32f4xx_hal_pwr.c 1 - ..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr.c + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr.c + + + stm32f4xx_hal_i2c.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_i2c.c + + + stm32f4xx_hal_dma.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma.c + + + stm32f4xx_hal_flash_ex.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_flash_ex.c + + + stm32f4xx_hal.c + 1 + ..\libs\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal.c