rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix master (#1134) 

* Revert "something went very wrong."

This reverts commit e0fb325d5a.

* Revert "trying to fix build broken by "Sensor reconfiguration while running (#1131)""

This reverts commit 55e8ee5052.

* Revert "partial Revert of "Stricter compile options (#1132)""

This reverts commit b0d7cc9a22.

* temp prometheus fix

* fix bootloader

* fix batch files
This commit is contained in:
Matthew Kennedy 2020-02-08 13:34:29 -08:00 committed by GitHub
parent e0fb325d5a
commit a08946c2f5
10 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/Makefile
View File

@ -37,21 +37,19 @@ endif
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
USE_OPT = $(EXTRA_PARAMS) $(DEBUG_LEVEL_OPT) $(RFLAGS) -Wno-error=implicit-fallthrough -Wno-error=bool-operation -fomit-frame-pointer -falign-functions=16 -Werror=type-limits -Wno-error=strict-aliasing -Wno-error=attributes USE_OPT = $(EXTRA_PARAMS) $(DEBUG_LEVEL_OPT) $(RFLAGS) -fomit-frame-pointer -falign-functions=16
endif endif
USE_OPT += $(RUSEFI_OPT) USE_OPT += $(RUSEFI_OPT)
# C specific options here (added to USE_OPT). # C specific options here (added to USE_OPT).
ifeq ($(USE_COPT),) ifeq ($(USE_COPT),)
USE_COPT = -fgnu89-inline -std=gnu99 -Werror-implicit-function-declaration USE_COPT = -fgnu89-inline -std=gnu99 -Wno-error=implicit-fallthrough
endif endif
# C++ specific options here (added to USE_OPT). # C++ specific options here (added to USE_OPT).
ifeq ($(USE_CPPOPT),) ifeq ($(USE_CPPOPT),)
# constexpr float expf_taylor_impl probably needs just c++14 but why not go with 17? USE_CPPOPT = -std=c++17 -Wno-register -fno-rtti -fno-threadsafe-statics -fno-exceptions -fno-use-cxa-atexit
USE_CPPOPT = -std=c++17 -Wno-register -fno-rtti -fno-threadsafe-statics -fno-exceptions -fno-use-cxa-atexit -Werror=write-strings -Werror=type-limits
endif endif
# Enable this if you want the linker to remove unused code and data # Enable this if you want the linker to remove unused code and data

2
firmware/bootloader/!compile_bootloader_405.bat
View File

@ -2,7 +2,7 @@
echo Starting compilation for Prometheus-405 echo Starting compilation for Prometheus-405
set PROJECT_BOARD=Prometheus set PROJECT_BOARD=prometheus/f405
set PROMETHEUS_BOARD=405 set PROMETHEUS_BOARD=405
set EXTRA_PARAMS=-DDUMMY -DEFI_BOOTLOADER -DSTM32F405xx -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE ^ set EXTRA_PARAMS=-DDUMMY -DEFI_BOOTLOADER -DSTM32F405xx -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE ^
-DBOARD_TLE8888_COUNT=0 ^ -DBOARD_TLE8888_COUNT=0 ^

2
firmware/bootloader/!compile_bootloader_469.bat
View File

@ -2,7 +2,7 @@
echo Starting compilation for Prometheus-469 echo Starting compilation for Prometheus-469
set PROJECT_BOARD=Prometheus set PROJECT_BOARD=prometheus/f469
set PROMETHEUS_BOARD=469 set PROMETHEUS_BOARD=469
set EXTRA_PARAMS=-DDUMMY -DEFI_BOOTLOADER -DSTM32F469xx -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE ^ set EXTRA_PARAMS=-DDUMMY -DEFI_BOOTLOADER -DSTM32F469xx -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE ^
-DBOARD_TLE8888_COUNT=0 ^ -DBOARD_TLE8888_COUNT=0 ^

2
firmware/bootloader/init.h
View File

@ -1,2 +0,0 @@
void reconfigureSensors();

2
firmware/bootloader/src/Makefile
View File

@ -133,6 +133,7 @@ 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
include $(CONFIG)/boards/$(PROJECT_BOARD)/board.mk include $(CONFIG)/boards/$(PROJECT_BOARD)/board.mk
include $(PROJECT_DIR)/init/init.mk
include $(PROJECT_DIR)/util/util.mk include $(PROJECT_DIR)/util/util.mk
include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/controllers/controllers.mk
@ -250,6 +251,7 @@ INCDIR = .. $(CHIBIOS)/os/license \
$(PROJECT_DIR)/development/test \ $(PROJECT_DIR)/development/test \
$(CONTROLLERS_INC) \ $(CONTROLLERS_INC) \
$(PROJECT_DIR)/controllers/sensors \ $(PROJECT_DIR)/controllers/sensors \
$(PROJECT_DIR)/init \
config config
BUILDDIR=blbuild BUILDDIR=blbuild

16
firmware/config/boards/prometheus/board_configuration.cpp
View File

@ -89,22 +89,22 @@ void setPinConfigurationOverrides(void) {
} }
#else #else
palSetPadMode(GPIOA, 10, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 10, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOA, 10, true); palWritePad(GPIOA, 10, 1);
palSetPadMode(GPIOA, 9, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 9, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOA, 9, true); palWritePad(GPIOA, 9, 1);
palSetPadMode(GPIOA, 8, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 8, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOA, 8, true); palWritePad(GPIOA, 8, 1);
palSetPadMode(GPIOA, 11, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 11, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOA, 11, true); palWritePad(GPIOA, 11, 1);
palSetPadMode(GPIOD, 9, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOD, 9, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOD, 9, false); palWritePad(GPIOD, 9, 0);
palSetPadMode(GPIOD, 15, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOD, 15, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOD, 15, false); palWritePad(GPIOD, 15, 0);
palSetPadMode(GPIOD, 10, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOD, 10, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOD, 10, false); palWritePad(GPIOD, 10, 0);
palSetPadMode(GPIOD, 14, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOD, 14, PAL_MODE_OUTPUT_PUSHPULL);
palWritePad(GPIOD, 14, false); palWritePad(GPIOD, 14, 0);
#endif #endif
} }

4
firmware/controllers/engine_controller.cpp
View File

@ -106,11 +106,9 @@ void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE); initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE);
} }
void initSensors0();
static void mostCommonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { static void mostCommonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if !EFI_UNIT_TEST #if !EFI_UNIT_TEST
initSensors0(); initSensors();
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */
initSensors(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); initSensors(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);

2
firmware/init/init.h
View File

@ -5,7 +5,7 @@
#pragma once #pragma once
// Call this once at startup to initialize, configure, and subscribe sensors // Call this once at startup to initialize, configure, and subscribe sensors
void initSensors0(); void initSensors();
// Call this whenever the configuration may have changed, so any sensors // Call this whenever the configuration may have changed, so any sensors
// can be reconfigured with the new settings. // can be reconfigured with the new settings.

2
firmware/init/sensor/init_sensors.cpp
View File

@ -12,7 +12,7 @@ static void initSensorCli();
void initTps(); void initTps();
void initOilPressure(); void initOilPressure();
void initSensors0() { void initSensors() {
initTps(); initTps();
initOilPressure(); initOilPressure();

8
firmware/rusefi_rules.mk
View File

@ -1,5 +1,5 @@
RUSEFI_OPT=-Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Werror=missing-field-initializers # Warnings-as-errors...
RUSEFI_OPT = -Werror
RUSEFI_OPT+=-Wno-error=missing-prototypes # ...except these few
RUSEFI_OPT += -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter
RUSEFI_OPT+=-Werror=switch