diff options
| author | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 15:42:45 -0300 |
|---|---|---|
| committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 15:42:45 -0300 |
| commit | 3ba4c222b8250e07dc16d533b382395b5549230d (patch) | |
| tree | 87a9b9ec70f6f18912c14ddbc6eec775dfb93b58 | |
| parent | d77e8fbd524e6c3ff67769623276419f7a8d14ba (diff) | |
| download | ChibiOS-Contrib-3ba4c222b8250e07dc16d533b382395b5549230d.tar.gz ChibiOS-Contrib-3ba4c222b8250e07dc16d533b382395b5549230d.tar.bz2 ChibiOS-Contrib-3ba4c222b8250e07dc16d533b382395b5549230d.zip | |
RTT/SystemView bindings: update ChibiOS to 19.1.x
3 files changed, 10 insertions, 27 deletions
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/Makefile index 74fba6e..f9e1493 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/Makefile +++ b/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/Makefile @@ -104,7 +104,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk -include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk +include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/chconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/chconf.h index a261ef7..a593552 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/chconf.h +++ b/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_RT_CONF_ -#define _CHIBIOS_RT_CONF_VER_6_1_ +#define _CHIBIOS_RT_CONF_VER_6_0_ /*===========================================================================*/ /** @@ -382,17 +382,6 @@ #endif /** - * @brief Objects Caches APIs. - * @details If enabled then the objects caches APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_OBJ_CACHES) -#define CH_CFG_USE_OBJ_CACHES TRUE -#endif - -/** * @brief Dynamic Threads APIs. * @details If enabled then the dynamic threads creation APIs are included * in the kernel. @@ -502,7 +491,7 @@ * @note The default is @p FALSE. */ #if !defined(CH_DBG_SYSTEM_STATE_CHECK) -#define CH_DBG_SYSTEM_STATE_CHECK FALSE +#define CH_DBG_SYSTEM_STATE_CHECK TRUE #endif /** @@ -513,7 +502,7 @@ * @note The default is @p FALSE. */ #if !defined(CH_DBG_ENABLE_CHECKS) -#define CH_DBG_ENABLE_CHECKS FALSE +#define CH_DBG_ENABLE_CHECKS TRUE #endif /** @@ -525,7 +514,7 @@ * @note The default is @p FALSE. */ #if !defined(CH_DBG_ENABLE_ASSERTS) -#define CH_DBG_ENABLE_ASSERTS FALSE +#define CH_DBG_ENABLE_ASSERTS TRUE #endif /** @@ -558,7 +547,7 @@ * @p panic_msg variable set to @p NULL. */ #if !defined(CH_DBG_ENABLE_STACK_CHECK) -#define CH_DBG_ENABLE_STACK_CHECK FALSE +#define CH_DBG_ENABLE_STACK_CHECK TRUE #endif /** @@ -570,7 +559,7 @@ * @note The default is @p FALSE. */ #if !defined(CH_DBG_FILL_THREADS) -#define CH_DBG_FILL_THREADS FALSE +#define CH_DBG_FILL_THREADS TRUE #endif /** diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/halconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/halconf.h index 5e342d8..149ded3 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/halconf.h +++ b/demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/halconf.h @@ -29,7 +29,7 @@ #define HALCONF_H #define _CHIBIOS_HAL_CONF_ -#define _CHIBIOS_HAL_CONF_VER_7_1_ +#define _CHIBIOS_HAL_CONF_VER_7_0_ #include "mcuconf.h" @@ -69,13 +69,6 @@ #endif /** - * @brief Enables the EFlash subsystem. - */ -#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__) -#define HAL_USE_EFL FALSE -#endif - -/** * @brief Enables the GPT subsystem. */ #if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) @@ -412,7 +405,7 @@ * buffers. */ #if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_BUFFERS_SIZE 16 +#define SERIAL_BUFFERS_SIZE 64 #endif /*===========================================================================*/ @@ -458,6 +451,7 @@ #define SPI_USE_CIRCULAR FALSE #endif + /** * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. * @note Disabling this option saves both code and data space. |