rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compile errors in demos

This commit is contained in:
marcoveeneman 2017-11-24 22:23:27 +01:00
parent 77bf52e042
commit 93dd54ecdc
6 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
View File

@ -99,7 +99,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional). # Other files (optional).
include $(CHIBIOS)/test/rt/test.mk include $(CHIBIOS)/test/lib/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here # Define linker script file here
LDSCRIPT= $(STARTUPLD)/TM4C123xH6.ld LDSCRIPT= $(STARTUPLD)/TM4C123xH6.ld

10
demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h
View File

@ -182,6 +182,16 @@
*/ */
#define CH_CFG_USE_MUTEXES TRUE #define CH_CFG_USE_MUTEXES TRUE
/**
* @brief Enables recursive behavior on mutexes.
* @note Recursive mutexes are heavier and have an increased
* memory footprint.
*
* @note The default is @p FALSE.
* @note Requires @p CH_CFG_USE_MUTEXES.
*/
#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE
/** /**
* @brief Conditional Variables APIs. * @brief Conditional Variables APIs.
* @details If enabled then the conditional variables APIs are included * @details If enabled then the conditional variables APIs are included

6
demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
View File

@ -16,7 +16,8 @@
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
#include "ch_test.h" #include "rt_test_root.h"
#include "oslib_test_root.h"
typedef struct led_config typedef struct led_config
{ {
@ -68,7 +69,8 @@ int main(void)
sdStart(&SD1, NULL); sdStart(&SD1, NULL);
if (!palReadLine(LINE_SW2)) { if (!palReadLine(LINE_SW2)) {
test_execute((BaseSequentialStream *)&SD1); test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
} }
ledRed.line = LINE_LED_RED; ledRed.line = LINE_LED_RED;

4
demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
View File

@ -99,7 +99,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional). # Other files (optional).
include $(CHIBIOS)/test/rt/test.mk include $(CHIBIOS)/test/lib/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here # Define linker script file here
LDSCRIPT= $(STARTUPLD)/TM4C129xNC.ld LDSCRIPT= $(STARTUPLD)/TM4C129xNC.ld

10
demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
View File

@ -182,6 +182,16 @@
*/ */
#define CH_CFG_USE_MUTEXES TRUE #define CH_CFG_USE_MUTEXES TRUE
/**
* @brief Enables recursive behavior on mutexes.
* @note Recursive mutexes are heavier and have an increased
* memory footprint.
*
* @note The default is @p FALSE.
* @note Requires @p CH_CFG_USE_MUTEXES.
*/
#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE
/** /**
* @brief Conditional Variables APIs. * @brief Conditional Variables APIs.
* @details If enabled then the conditional variables APIs are included * @details If enabled then the conditional variables APIs are included

6
demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
View File

@ -16,7 +16,8 @@
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
#include "ch_test.h" #include "rt_test_root.h"
#include "oslib_test_root.h"
typedef struct led_config typedef struct led_config
{ {
@ -70,7 +71,8 @@ int main(void)
sdStart(&SD1, NULL); sdStart(&SD1, NULL);
if (!palReadLine(LINE_SW1)) { if (!palReadLine(LINE_SW1)) {
test_execute((BaseSequentialStream *)&SD1); test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
} }
led1.line = LINE_LED0; led1.line = LINE_LED0;