diff options
| author | zhangjun1996 <[email protected]> | 2019-06-17 02:48:01 +0800 |
|---|---|---|
| committer | zhangjun1996 <[email protected]> | 2019-06-17 02:48:01 +0800 |
| commit | c4b527a7381ca388f84b1a5e64ca2ffce341de21 (patch) | |
| tree | a3d95784f85ddd11d2329d0279d9d6450914a762 | |
| parent | 778199f8762b797c07853ca6fa9054da6e2a2677 (diff) | |
| parent | a6a01da3be80cc9f5e598ddef01f6d2b8efcb3ea (diff) | |
Merge branch 'master' of https://github.com/rt-thread/rt-thread
| -rw-r--r-- | bsp/stm32/stm32f469-st-disco/.config | 2 | ||||
| -rw-r--r-- | bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c | 10 | ||||
| -rw-r--r-- | bsp/stm32/stm32f469-st-disco/rtconfig.h | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/bsp/stm32/stm32f469-st-disco/.config b/bsp/stm32/stm32f469-st-disco/.config index 8bd3069cd8..d7911a61fc 100644 --- a/bsp/stm32/stm32f469-st-disco/.config +++ b/bsp/stm32/stm32f469-st-disco/.config @@ -24,7 +24,7 @@ CONFIG_RT_USING_TIMER_SOFT=y CONFIG_RT_TIMER_THREAD_PRIO=4 CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 CONFIG_RT_DEBUG=y -# CONFIG_RT_DEBUG_COLOR is not set +CONFIG_RT_DEBUG_COLOR=y # CONFIG_RT_DEBUG_INIT_CONFIG is not set # CONFIG_RT_DEBUG_THREAD_CONFIG is not set # CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c b/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c index 350dddef85..cfe6f59e1e 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c +++ b/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c @@ -64,20 +64,20 @@ static void _sdcard_unmount(void) static void sd_mount(void *parameter) { - rt_uint8_t re_sd_check = 1; + rt_uint8_t re_sd_check_pin = 1; while (1) { rt_thread_mdelay(200); - if(re_sd_check && !rt_pin_read(SD_CHECK_PIN)) + if(re_sd_check_pin && (re_sd_check_pin = rt_pin_read(SD_CHECK_PIN)) == 0) { _sdcard_mount(); } - if (!re_sd_check && rt_pin_read(SD_CHECK_PIN)) + + if (!re_sd_check_pin && (re_sd_check_pin = rt_pin_read(SD_CHECK_PIN)) != 0) { _sdcard_unmount(); } - re_sd_check = rt_pin_read(SD_CHECK_PIN); } } @@ -88,7 +88,7 @@ int stm32_sdcard_mount(void) rt_pin_mode(SD_CHECK_PIN, PIN_MODE_INPUT_PULLUP); tid = rt_thread_create("sd_mount", sd_mount, RT_NULL, - 1024, RT_THREAD_PRIORITY_MAX - 1, 20); + 1024, RT_THREAD_PRIORITY_MAX - 2, 20); if (tid != RT_NULL) { rt_thread_startup(tid); diff --git a/bsp/stm32/stm32f469-st-disco/rtconfig.h b/bsp/stm32/stm32f469-st-disco/rtconfig.h index 7292221d2f..3788ae2c58 100644 --- a/bsp/stm32/stm32f469-st-disco/rtconfig.h +++ b/bsp/stm32/stm32f469-st-disco/rtconfig.h @@ -20,6 +20,7 @@ #define RT_TIMER_THREAD_PRIO 4 #define RT_TIMER_THREAD_STACK_SIZE 512 #define RT_DEBUG +#define RT_DEBUG_COLOR /* Inter-Thread communication */ |