diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-20 14:49:49 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-20 14:49:49 +0000 |
| commit | 371ef2afb5b7045d8293dd5a393a7783b025f8a8 (patch) | |
| tree | d28a31a6d32d6d02cead54a8438556235635f0d6 /testhal/STM32F0xx/EXT | |
| parent | 8d0dc4bfd67857f376a2aa67424e9e8697342025 (diff) | |
| download | ChibiOS-371ef2afb5b7045d8293dd5a393a7783b025f8a8.tar.gz ChibiOS-371ef2afb5b7045d8293dd5a393a7783b025f8a8.tar.bz2 ChibiOS-371ef2afb5b7045d8293dd5a393a7783b025f8a8.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6191 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32F0xx/EXT')
| -rw-r--r-- | testhal/STM32F0xx/EXT/.project | 2 | ||||
| -rw-r--r-- | testhal/STM32F0xx/EXT/chconf.h | 6 | ||||
| -rw-r--r-- | testhal/STM32F0xx/EXT/main.c | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/testhal/STM32F0xx/EXT/.project b/testhal/STM32F0xx/EXT/.project index 301651983..bae993cd8 100644 --- a/testhal/STM32F0xx/EXT/.project +++ b/testhal/STM32F0xx/EXT/.project @@ -27,7 +27,7 @@ <link>
<name>board</name>
<type>2</type>
- <locationURI>CHIBIOS/boards/ST_STM32F0_DISCOVERY</locationURI>
+ <locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>
</link>
<link>
<name>os</name>
diff --git a/testhal/STM32F0xx/EXT/chconf.h b/testhal/STM32F0xx/EXT/chconf.h index 9864162ac..7275caff4 100644 --- a/testhal/STM32F0xx/EXT/chconf.h +++ b/testhal/STM32F0xx/EXT/chconf.h @@ -41,7 +41,7 @@ * setting also defines the system tick time unit.
*/
#if !defined(CH_CFG_ST_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_CFG_ST_FREQUENCY 1000
+#define CH_CFG_ST_FREQUENCY 10000
#endif
/**
@@ -62,7 +62,7 @@ * this value.
*/
#if !defined(CH_CFG_TIMEDELTA) || defined(__DOXYGEN__)
-#define CH_CFG_TIMEDELTA 0
+#define CH_CFG_TIMEDELTA 2
#endif
/**
@@ -357,7 +357,7 @@ * @note The default is @p FALSE.
*/
#if !defined(CH_DBG_STATISTICS) || defined(__DOXYGEN__)
-#define CH_DBG_STATISTICS TRUE
+#define CH_DBG_STATISTICS FALSE
#endif
/**
diff --git a/testhal/STM32F0xx/EXT/main.c b/testhal/STM32F0xx/EXT/main.c index cdba37eff..2fdcc247e 100644 --- a/testhal/STM32F0xx/EXT/main.c +++ b/testhal/STM32F0xx/EXT/main.c @@ -25,17 +25,16 @@ static void led4off(void *arg) { /* Triggered when the button is pressed or released. The LED4 is set to ON.*/
static void extcb1(EXTDriver *extp, expchannel_t channel) {
- static VirtualTimer vt4;
+ static virtual_timer_t vt4;
(void)extp;
(void)channel;
palSetPad(GPIOC, GPIOC_LED4);
- chSysLockFromIsr();
- if (chVTIsArmedI(&vt4))
- chVTResetI(&vt4);
+ chSysLockFromISR();
+ chVTResetI(&vt4);
/* LED4 set to OFF after 200mS.*/
chVTSetI(&vt4, MS2ST(200), led4off, NULL);
- chSysUnlockFromIsr();
+ chSysUnlockFromISR();
}
static const EXTConfig extcfg = {
|