diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-07-08 19:24:36 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-07-08 19:24:36 +0000 |
commit | 5770d1835ff33f0b6c72ecd3ce6d2402868ed19b (patch) | |
tree | 0eeb42170710b569234c390a07076f7574ca3881 /demos/ARMCM4-STM32F407-DISCOVERY | |
parent | 3739e9d659073b757523b59b8173d46d3fa676df (diff) | |
download | ChibiOS-5770d1835ff33f0b6c72ecd3ce6d2402868ed19b.tar.gz ChibiOS-5770d1835ff33f0b6c72ecd3ce6d2402868ed19b.tar.bz2 ChibiOS-5770d1835ff33f0b6c72ecd3ce6d2402868ed19b.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4446 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARMCM4-STM32F407-DISCOVERY')
-rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp | 23 | ||||
-rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj | 10 |
2 files changed, 24 insertions, 9 deletions
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp index 2aa6b16ab..5982bc909 100644 --- a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp +++ b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp @@ -164,7 +164,7 @@ <debug>1</debug>
<option>
<name>CCDefines</name>
- <state></state>
+ <state>CORTEX_USE_FPU=FALSE</state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -305,6 +305,7 @@ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F4xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
+ <state>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32F4_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -455,7 +456,7 @@ </option>
<option>
<name>ADefines</name>
- <state></state>
+ <state>CORTEX_USE_FPU=FALSE</state>
</option>
<option>
<name>AList</name>
@@ -1085,6 +1086,7 @@ <debug>0</debug>
<option>
<name>CCDefines</name>
+ <state>CORTEX_USE_FPU=FALSE</state>
<state>NDEBUG</state>
</option>
<option>
@@ -1226,6 +1228,7 @@ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F4xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
+ <state>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32F4_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -1376,7 +1379,7 @@ </option>
<option>
<name>ADefines</name>
- <state></state>
+ <state>CORTEX_USE_FPU=FALSE</state>
</option>
<option>
<name>AList</name>
@@ -2199,11 +2202,23 @@ </group>
<group>
<name>various</name>
+ <group>
+ <name>devices_lib</name>
+ <group>
+ <name>accel</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel\lis302dl.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\various\devices_lib\accel\lis302dl.h</name>
+ </file>
+ </group>
+ </group>
<file>
<name>$PROJ_DIR$\..\..\..\os\various\chprintf.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\various\lis302dl.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\various\chprintf.h</name>
</file>
</group>
</group>
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj b/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj index c76d132ff..074e3a343 100644 --- a/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj +++ b/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj @@ -346,7 +346,7 @@ <MiscControls></MiscControls> <Define>__heap_base__=Image$$RW_IRAM1$$ZI$$Limit __heap_end__=Image$$RW_IRAM2$$Base</Define> <Undefine></Undefine> - <IncludePath>..\;..\..\..\os\kernel\include;..\..\..\os\ports\common\ARMCMx;..\..\..\os\ports\common\ARMCMx\CMSIS\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32F4xx;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\os\hal\platforms\STM32\GPIOv2;..\..\..\os\hal\platforms\STM32F4xx;..\..\..\os\various;..\..\..\boards\ST_STM32F4_DISCOVERY;..\..\..\test</IncludePath> + <IncludePath>..\;..\..\..\os\kernel\include;..\..\..\os\ports\common\ARMCMx;..\..\..\os\ports\common\ARMCMx\CMSIS\include;..\..\..\os\ports\RVCT\ARMCMx;..\..\..\os\ports\RVCT\ARMCMx\STM32F4xx;..\..\..\os\hal\include;..\..\..\os\hal\platforms\STM32;..\..\..\os\hal\platforms\STM32\GPIOv2;..\..\..\os\hal\platforms\STM32F4xx;..\..\..\os\various;..\..\..\os\various\devices_lib\accel;..\..\..\boards\ST_STM32F4_DISCOVERY;..\..\..\test</IncludePath> </VariousControls> </Cads> <Aads> @@ -977,14 +977,14 @@ <GroupName>various</GroupName> <Files> <File> - <FileName>lis302dl.c</FileName> + <FileName>chprintf.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\os\various\lis302dl.c</FilePath> + <FilePath>..\..\..\os\various\chprintf.c</FilePath> </File> <File> - <FileName>chprintf.c</FileName> + <FileName>lis302dl.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\os\various\chprintf.c</FilePath> + <FilePath>..\..\..\os\various\devices_lib\accel\lis302dl.c</FilePath> </File> </Files> </Group> |