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

Various fixes for demos

This commit is contained in:
Fabien Poussin 2020-04-08 20:09:22 +02:00
parent f6f1185a10
commit 5a124c7e36
8 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/MSP430X/NIL-EXP430FR5969/Makefile
View File

@ -108,12 +108,12 @@ include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_ms
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/EXP430FR5969/board.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/MSP430X/platform.mk
include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS_CONTRIB)/os/common/ports/MSP430X/compilers/GCC/mk/port.mk
# Other files (optional).
include $(CHIBIOS)/test/nil/test.mk
include $(CHIBIOS)/test/nil/nil_test.mk
# Define linker script file here
LDSCRIPT = $(STARTUPLD)/msp430fr5969.ld

4
demos/MSP430X/NIL-EXP430FR6989/Makefile
View File

@ -108,12 +108,12 @@ include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_ms
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/EXP430FR6989/board.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/MSP430X/platform.mk
include $(CHIBIOS)/os/hal/osal/nil/osal.mk
include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS_CONTRIB)/os/common/ports/MSP430X/compilers/GCC/mk/port.mk
# Other files (optional).
include $(CHIBIOS)/test/nil/test.mk
include $(CHIBIOS)/test/nil/nil_test.mk
# Define linker script file here
LDSCRIPT = $(STARTUPLD)/msp430fr6989.ld

21
demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/chconf.h
View File

@ -656,7 +656,7 @@
* @note It is invoked from within @p _thread_init() and implicitly from all
* the threads creation APIs.
*/
#define CH_CFG_THREAD_INIT_HOOK(tp) { \
#define _CH_CFG_THREAD_INIT_HOOK(tp) { \
/* Add threads initialization code here.*/ \
}
@ -664,7 +664,7 @@
* @brief Threads finalization hook.
* @details User finalization code added to the @p chThdExit() API.
*/
#define CH_CFG_THREAD_EXIT_HOOK(tp) { \
#define _CH_CFG_THREAD_EXIT_HOOK(tp) { \
/* Add threads finalization code here.*/ \
}
@ -672,21 +672,21 @@
* @brief Context switch hook.
* @details This hook is invoked just before switching between threads.
*/
#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \
#define _CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \
/* Context switch code here.*/ \
}
/**
* @brief ISR enter hook.
*/
#define CH_CFG_IRQ_PROLOGUE_HOOK() { \
#define _CH_CFG_IRQ_PROLOGUE_HOOK() { \
/* IRQ prologue code here.*/ \
}
/**
* @brief ISR exit hook.
*/
#define CH_CFG_IRQ_EPILOGUE_HOOK() { \
#define _CH_CFG_IRQ_EPILOGUE_HOOK() { \
/* IRQ epilogue code here.*/ \
}
@ -732,7 +732,7 @@
* @details This hook is invoked in case to a system halting error before
* the system is halted.
*/
#define CH_CFG_SYSTEM_HALT_HOOK(reason) { \
#define _CH_CFG_SYSTEM_HALT_HOOK(reason) { \
/* System halt code here.*/ \
}
@ -752,6 +752,15 @@
/* Port-specific settings (override port settings defaulted in chcore.h). */
/*===========================================================================*/
/*===========================================================================*/
/* Other configurations */
/*===========================================================================*/
#if !defined(_FROM_ASM_)
#include "SEGGER_SYSVIEW_ChibiOS.h"
#endif
#endif /* CHCONF_H */
/** @} */

2
demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/halconf.h
View File

@ -526,8 +526,6 @@
#define WSPI_USE_MUTUAL_EXCLUSION TRUE
#endif
#include "halconf_community.h"
#endif /* HALCONF_H */
/** @} */

1
demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/cfg/mcuconf.h
View File

@ -33,6 +33,7 @@
#define STM32F4xx_MCUCONF
#define STM32F405_MCUCONF
#define STM32F407_MCUCONF
#define STM32F415_MCUCONF
#define STM32F407_MCUCONF
#define STM32F417_MCUCONF

2
demos/STM32/RT-STM32F407-DISCOVERY-fault_handlers/cfg/halconf.h
View File

@ -526,8 +526,6 @@
#define WSPI_USE_MUTUAL_EXCLUSION TRUE
#endif
#include "halconf_community.h"
#endif /* HALCONF_H */
/** @} */

1
demos/STM32/RT-STM32F407-DISCOVERY-fault_handlers/cfg/mcuconf.h
View File

@ -32,6 +32,7 @@
*/
#define STM32F4xx_MCUCONF
#define STM32F407_MCUCONF
/*
* HAL driver system settings.

2
demos/STM32/RT-STM32F411-DISCOVERY-blinker/cfg/halconf.h
View File

@ -526,8 +526,6 @@
#define WSPI_USE_MUTUAL_EXCLUSION TRUE
#endif
#include "halconf_community.h"
#endif /* HALCONF_H */
/** @} */