Skip to content

Commit

Permalink
1、【升级】RT-Thread至1.2.2版本。
Browse files Browse the repository at this point in the history 
Signed-off-by: armink <[email protected]>
  • Loading branch information
@armink
armink committed Oct 27, 2014
1 parent 54460c7 commit 75cac11
Show file tree
Hide file tree
Showing 541 changed files with 31,814 additions and 28,005 deletions.
28 changes: 15 additions & 13 deletions .cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<option id="iar.arm.toolchain.option.scanfFormatter.v5.4.0.1333512851" name="Scanf formatter:" superClass="iar.arm.toolchain.option.scanfFormatter.v5.4.0"/>
<option id="iar.arm.toolchain.option.bufferedOutput.v6.1.0.1081877709" name="Buffered terminal output" superClass="iar.arm.toolchain.option.bufferedOutput.v6.1.0"/>
<option id="iar.arm.toolchain.option.mfc.v5.5.2.350476392" name="Enable multi-file compilation" superClass="iar.arm.toolchain.option.mfc.v5.5.2"/>
<option id="iar.arm.toolchain.option.useCMSIS.v6.2.2.2073987179" name="Use CMSIS" superClass="iar.arm.toolchain.option.useCMSIS.v6.2.2"/>
<option id="iar.arm.toolchain.option.useCMSIS.v6.2.2.2073987179" name="Use CMSIS" superClass="iar.arm.toolchain.option.useCMSIS.v6.2.2" value="true" valueType="boolean"/>
<option id="iar.arm.toolchain.option.fpu.v5.4.0.1040445596" name="FPU:" superClass="iar.arm.toolchain.option.fpu.v5.4.0"/>
<option id="iar.arm.toolchain.option.libraryConfig.v5.4.0.499458224" name="Library:" superClass="iar.arm.toolchain.option.libraryConfig.v5.4.0"/>
<option id="iar.arm.toolchain.option.libraryConfig.v5.4.0.499458224" name="Library:" superClass="iar.arm.toolchain.option.libraryConfig.v5.4.0" value="iar.arm.toolchain.option.libraryConfig.full.v5.4.0" valueType="enumerated"/>
<option id="iar.arm.toolchain.option.misra-c.enable.2008219477" name="Enable MISRA-C" superClass="iar.arm.toolchain.option.misra-c.enable"/>
<option id="iar.arm.toolchain.option.deviceInfo.v5.4.3.941423123" name="Device info storage option" superClass="iar.arm.toolchain.option.deviceInfo.v5.4.3" value="config/devices/ST/STM32F103/STM32F103xB.menu" valueType="string"/>
<option id="iar.arm.toolchain.option.deviceName.v5.5.0.1112848931" name="Device (change with Project &gt; Select Device...)" superClass="iar.arm.toolchain.option.deviceName.v5.5.0" value="ST STM32F103xB" valueType="string"/>
Expand All @@ -46,15 +46,17 @@
<option id="iar.arm.toolchain.compiler.option.cppdialect.v6.1.0.1638054484" name="C++ dialect" superClass="iar.arm.toolchain.compiler.option.cppdialect.v6.1.0"/>
<option id="iar.arm.toolchain.compiler.option.cpuMode.v5.4.0.1177576854" name="Processor mode:" superClass="iar.arm.toolchain.compiler.option.cpuMode.v5.4.0" value="iar.arm.toolchain.compiler.option.cpuMode.thumb.v5.4.0" valueType="enumerated"/>
<option id="iar.arm.toolchain.compiler.option.incPaths.v5.4.0.219050810" name="Additional include directories" superClass="iar.arm.toolchain.compiler.option.incPaths.v5.4.0" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/APP/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/BSP/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/Libaries/STM32F10x_StdPeriph_Driver/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/RT-Thread-1.1.1/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/Libaries/CMSIS_EWARM/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/FreeModbus/modbus/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/FreeModbus/modbus/rtu}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeModbus_Slave&amp;Master+RTT+STM32/FreeModbus/port}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/APP/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/BSP/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Libaries/STM32F10x_StdPeriph_Driver/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/RT-Thread-1.2.2/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/RT-Thread-1.2.2/components/drivers/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/RT-Thread-1.2.2/components/drivers/include/drivers}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Libaries/CMSIS_EWARM/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeModbus/modbus/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeModbus/modbus/rtu}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeModbus/port}&quot;"/>
</option>
<option id="iar.arm.toolchain.compiler.option.defines.v5.4.0.1280497388" name="Defined Symbols:" superClass="iar.arm.toolchain.compiler.option.defines.v5.4.0" valueType="definedSymbols">
<listOptionValue builtIn="false" value="STM32F10X_MD"/>
Expand Down Expand Up @@ -108,7 +110,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="RT-Thread-1.2.2/components/drivers/usb|RT-Thread-1.2.2/components/drivers/spi|RT-Thread-1.2.2/components/drivers/serial|RT-Thread-1.2.2/components/drivers/sdio|RT-Thread-1.2.2/components/drivers/rtc|RT-Thread-1.2.2/components/drivers/mtd|RT-Thread-1.2.2/components/drivers/i2c|RT-Thread-1.2.2/libcpu/arm/sep4020|RT-Thread-1.2.2/libcpu/arm/s3c44b0|RT-Thread-1.2.2/libcpu/arm/s3c24x0|RT-Thread-1.2.2/libcpu/arm/lpc24xx|RT-Thread-1.2.2/libcpu/arm/lpc214x|RT-Thread-1.2.2/libcpu/arm/cortex-r4|RT-Thread-1.2.2/libcpu/arm/cortex-m4|RT-Thread-1.2.2/libcpu/arm/cortex-m0|RT-Thread-1.2.2/libcpu/arm/common|RT-Thread-1.2.2/libcpu/arm/AT91SAM7X|RT-Thread-1.2.2/libcpu/arm/AT91SAM7S|RT-Thread-1.2.2/libcpu/arm/arm926|RT-Thread-1.2.2/libcpu/arm/am335x|RT-Thread-1.2.2/components/utilities|RT-Thread-1.2.2/components/pthreads|RT-Thread-1.2.2/components/libdl|RT-Thread-1.2.2/components/libc|RT-Thread-1.2.2/components/init|RT-Thread-1.2.2/components/finsh|RT-Thread-1.2.2/components/CMSIS|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.2.2/libcpu/xilinx|RT-Thread-1.2.2/libcpu/v850|RT-Thread-1.2.2/libcpu/unicore32|RT-Thread-1.2.2/libcpu/sim|RT-Thread-1.2.2/libcpu/ppc|RT-Thread-1.2.2/libcpu/nios|RT-Thread-1.2.2/libcpu/mips|RT-Thread-1.2.2/libcpu/m16c|RT-Thread-1.2.2/libcpu/ia32|RT-Thread-1.2.2/libcpu/blackfin|RT-Thread-1.2.2/libcpu/avr32|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down Expand Up @@ -173,7 +175,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="RT-Thread-1.2.2/components/drivers/usb|RT-Thread-1.2.2/components/drivers/spi|RT-Thread-1.2.2/components/drivers/serial|RT-Thread-1.2.2/components/drivers/sdio|RT-Thread-1.2.2/components/drivers/rtc|RT-Thread-1.2.2/components/drivers/mtd|RT-Thread-1.2.2/components/drivers/i2c|RT-Thread-1.2.2/libcpu/arm/sep4020|RT-Thread-1.2.2/libcpu/arm/s3c44b0|RT-Thread-1.2.2/libcpu/arm/s3c24x0|RT-Thread-1.2.2/libcpu/arm/lpc24xx|RT-Thread-1.2.2/libcpu/arm/lpc214x|RT-Thread-1.2.2/libcpu/arm/cortex-r4|RT-Thread-1.2.2/libcpu/arm/cortex-m4|RT-Thread-1.2.2/libcpu/arm/cortex-m0|RT-Thread-1.2.2/libcpu/arm/common|RT-Thread-1.2.2/libcpu/arm/AT91SAM7X|RT-Thread-1.2.2/libcpu/arm/AT91SAM7S|RT-Thread-1.2.2/libcpu/arm/arm926|RT-Thread-1.2.2/libcpu/arm/am335x|RT-Thread-1.2.2/components/utilities|RT-Thread-1.2.2/components/pthreads|RT-Thread-1.2.2/components/libdl|RT-Thread-1.2.2/components/libc|RT-Thread-1.2.2/components/init|RT-Thread-1.2.2/components/finsh|RT-Thread-1.2.2/components/CMSIS|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.2.2/libcpu/xilinx|RT-Thread-1.2.2/libcpu/v850|RT-Thread-1.2.2/libcpu/unicore32|RT-Thread-1.2.2/libcpu/sim|RT-Thread-1.2.2/libcpu/ppc|RT-Thread-1.2.2/libcpu/nios|RT-Thread-1.2.2/libcpu/mips|RT-Thread-1.2.2/libcpu/m16c|RT-Thread-1.2.2/libcpu/ia32|RT-Thread-1.2.2/libcpu/blackfin|RT-Thread-1.2.2/libcpu/avr32|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down
4 changes: 2 additions & 2 deletions APP/inc/rtconfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
//#define RT_USING_MEMPOOL

/* Using Dynamic Heap Management */
//#define RT_USING_HEAP
#define RT_USING_HEAP

/* Using Small MM */
//#define RT_USING_SMALL_MEM
#define RT_USING_SMALL_MEM

/* SECTION: Device System */
/* Using Device System */
Expand Down
71 changes: 0 additions & 71 deletions APP/src/cpuusage.c
View file

This file was deleted.

Loading

0 comments on commit 75cac11

Please sign in to comment.