aboutsummaryrefslogtreecommitdiffstats
path: root/demos/ARMCM3-STM32F103ZG-FATFS
diff options
context:
space:
mode:
Diffstat (limited to 'demos/ARMCM3-STM32F103ZG-FATFS')
-rw-r--r--demos/ARMCM3-STM32F103ZG-FATFS/Makefile11
-rw-r--r--demos/ARMCM3-STM32F103ZG-FATFS/halconf.h34
-rw-r--r--demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp258
-rw-r--r--demos/ARMCM3-STM32F103ZG-FATFS/main.c18
-rw-r--r--demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h18
5 files changed, 200 insertions, 139 deletions
diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/Makefile b/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
index 2485c272c..cf05df7c9 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
@@ -8,6 +8,11 @@ ifeq ($(USE_OPT),)
USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
endif
+# C specific options here (added to USE_OPT).
+ifeq ($(USE_COPT),)
+ USE_COPT =
+endif
+
# C++ specific options here (added to USE_OPT).
ifeq ($(USE_CPPOPT),)
USE_CPPOPT = -fno-rtti
@@ -23,9 +28,9 @@ ifeq ($(USE_THUMB),)
USE_THUMB = yes
endif
-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
- USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+ USE_VERBOSE_COMPILE = no
endif
#
diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/halconf.h b/demos/ARMCM3-STM32F103ZG-FATFS/halconf.h
index 682167d84..978dbc65c 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/halconf.h
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/halconf.h
@@ -56,6 +56,13 @@
#endif
/**
+ * @brief Enables the EXT subsystem.
+ */
+#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
+#define HAL_USE_EXT FALSE
+#endif
+
+/**
* @brief Enables the GPT subsystem.
*/
#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
@@ -98,6 +105,13 @@
#endif
/**
+ * @brief Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC FALSE
+#endif
+
+/**
* @brief Enables the SDC subsystem.
*/
#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
@@ -185,6 +199,13 @@
/* MAC driver related settings. */
/*===========================================================================*/
+/**
+ * @brief Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS TRUE
+#endif
+
/*===========================================================================*/
/* MMC_SPI driver related settings. */
/*===========================================================================*/
@@ -235,16 +256,9 @@
#endif
/*===========================================================================*/
-/* PAL driver related settings. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* PWM driver related settings. */
-/*===========================================================================*/
-
-/*===========================================================================*/
/* SDC driver related settings. */
/*===========================================================================*/
+
/**
* @brief Number of initialization attempts before rejecting the card.
* @note Attempts are performed at 10mS intevals.
@@ -316,10 +330,6 @@
#define SPI_USE_MUTUAL_EXCLUSION TRUE
#endif
-/*===========================================================================*/
-/* UART driver related settings. */
-/*===========================================================================*/
-
#endif /* _HALCONF_H_ */
/** @} */
diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp b/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp
index a66a70295..a21502c93 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp
@@ -12,7 +12,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -29,7 +29,7 @@
</option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -38,8 +38,8 @@
</option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -47,8 +47,8 @@
</option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -60,7 +60,7 @@
</option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -87,7 +87,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -135,18 +135,36 @@
<name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>CCDefines</name>
- <state>SHELL_USE_IPRINTF=FALSE</state>
+ <state></state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -277,13 +295,18 @@
<name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
- <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\ext\fatfs\src</state>
+ <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
<option>
@@ -366,11 +389,15 @@
<state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -525,8 +552,8 @@
</option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
</option>
<option>
@@ -594,7 +621,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -840,6 +867,22 @@
<name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -879,7 +922,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -896,7 +939,7 @@
</option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -905,8 +948,8 @@
</option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -914,8 +957,8 @@
</option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -927,7 +970,7 @@
</option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -954,7 +997,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.21.4.52945</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -1002,19 +1045,36 @@
<name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
<name>CCDefines</name>
<state>NDEBUG</state>
- <state>SHELL_USE_IPRINTF=FALSE</state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -1145,13 +1205,18 @@
<name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
- <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\ext\fatfs\src</state>
+ <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
<option>
@@ -1177,7 +1242,7 @@
<option>
<name>CCOptStrategy</name>
<version>0</version>
- <state>1</state>
+ <state>2</state>
</option>
<option>
<name>CCOptLevelSlave</name>
@@ -1234,11 +1299,15 @@
<state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -1393,8 +1462,8 @@
</option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
</option>
<option>
@@ -1462,7 +1531,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1708,6 +1777,22 @@
<name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -1783,6 +1868,9 @@
<name>$PROJ_DIR$\..\..\..\os\hal\include\can.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\ext.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\gpt.h</name>
</file>
<file>
@@ -1810,6 +1898,9 @@
<name>$PROJ_DIR$\..\..\..\os\hal\include\pwm.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\rtc.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\sdc.h</name>
</file>
<file>
@@ -1840,6 +1931,9 @@
<name>$PROJ_DIR$\..\..\..\os\hal\src\can.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\ext.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\gpt.c</name>
</file>
<file>
@@ -1864,6 +1958,9 @@
<name>$PROJ_DIR$\..\..\..\os\hal\src\pwm.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\rtc.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\sdc.c</name>
</file>
<file>
@@ -1891,9 +1988,6 @@
<name>$PROJ_DIR$\..\..\..\os\kernel\include\ch.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\kernel\include\chbsem.h</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\os\kernel\include\chcond.h</name>
</file>
<file>
@@ -1906,9 +2000,6 @@
<name>$PROJ_DIR$\..\..\..\os\kernel\include\chevents.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\kernel\include\chfiles.h</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\os\kernel\include\chheap.h</name>
</file>
<file>
@@ -2021,58 +2112,25 @@
<group>
<name>platform</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\core_cm3.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\gpt_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f100.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\gpt_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f103.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f105_f107.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f100.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f103.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f105_f107.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\icu_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\icu_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\sdc_lld.c</name>
@@ -2087,45 +2145,27 @@
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32_dma.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32_rcc.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_usb.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32f10x.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\usb_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\usb_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32f10x.h</name>
</file>
</group>
<group>
<name>port</name>
<group>
- <name>STM32</name>
+ <name>STM32F1xx</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\cmparams.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\cmparams.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\vectors.s</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\vectors.s</name>
</file>
</group>
<file>
@@ -2159,6 +2199,12 @@
<group>
<name>various</name>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\various\chprintf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\various\chprintf.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\various\shell.c</name>
</file>
<file>
diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/main.c b/demos/ARMCM3-STM32F103ZG-FATFS/main.c
index 258b1f007..0b9020dcf 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/main.c
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/main.c
@@ -194,23 +194,7 @@ static void cmd_mem(BaseChannel *chp, int argc, char *argv[]) {
}
static void cmd_threads(BaseChannel *chp, int argc, char *argv[]) {
- static const char *states[] = {
- "READY",
- "CURRENT",
- "SUSPENDED",
- "WTSEM",
- "WTMTX",
- "WTCOND",
- "SLEEPING",
- "WTEXIT",
- "WTOREVT",
- "WTANDEVT",
- "SNDMSGQ",
- "SNDMSG",
- "WTMSG",
- "WTQUEUE",
- "FINAL"
- };
+ static const char *states[] = {THD_STATE_NAMES};
Thread *tp;
(void)argv;
diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h b/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
index aeee83a56..b0dedacac 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
@@ -52,7 +52,6 @@
#define STM32_ADC_USE_ADC1 TRUE
#define STM32_ADC_ADC1_DMA_PRIORITY 2
#define STM32_ADC_ADC1_IRQ_PRIORITY 5
-#define STM32_ADC_DMA_ERROR_HOOK(adcp) chSysHalt()
/*
* CAN driver system settings.
@@ -61,6 +60,21 @@
#define STM32_CAN_CAN1_IRQ_PRIORITY 11
/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI1_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI2_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI3_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI4_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI16_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI17_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI18_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI19_IRQ_PRIORITY 6
+
+/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
@@ -124,11 +138,13 @@
#define STM32_SERIAL_USE_USART3 FALSE
#define STM32_SERIAL_USE_UART4 FALSE
#define STM32_SERIAL_USE_UART5 FALSE
+#define STM32_SERIAL_USE_USART6 FALSE
#define STM32_SERIAL_USART1_PRIORITY 12
#define STM32_SERIAL_USART2_PRIORITY 12
#define STM32_SERIAL_USART3_PRIORITY 12
#define STM32_SERIAL_UART4_PRIORITY 12
#define STM32_SERIAL_UART5_PRIORITY 12
+#define STM32_SERIAL_USART6_PRIORITY 12
/*
* SPI driver system settings.