From a73744a96456fcc4e667d659ef21aecc23928340 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 2 Jan 2017 14:03:17 -0500 Subject: [PATCH] auto-sync --- firmware/Makefile | 2 - firmware/controllers/algo/error_handling.h | 2 - firmware/controllers/alternatorController.cpp | 6 +-- firmware/controllers/core/EfiWave.h | 7 +-- firmware/controllers/electronic_throttle.cpp | 4 +- firmware/controllers/tachometer.cpp | 2 - firmware/controllers/trigger/trigger.mk | 2 - unit_tests/.cproject | 53 ++++++++++--------- unit_tests/makelinks.bat | 7 +-- win32_functional_tests/Makefile | 2 - 10 files changed, 35 insertions(+), 52 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index a533871c26..e296ef7be1 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -137,12 +137,10 @@ CSRC = $(PORTSRC) \ $(CONTROLLERSSRC) \ $(CONTROLLERS_ALGO_SRC) \ $(CONTROLLERS_CORE_SRC) \ - $(CONTROLLERS_MATH_SRC) \ $(CONTROLLERS_SENSORS_SRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(FATFSSRC) \ - $(TRIGGER_SRC) \ $(SYSTEMSRC) # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/firmware/controllers/algo/error_handling.h b/firmware/controllers/algo/error_handling.h index 671a5d7f4c..fbb144ecb1 100644 --- a/firmware/controllers/algo/error_handling.h +++ b/firmware/controllers/algo/error_handling.h @@ -13,8 +13,6 @@ extern "C" { #endif /* __cplusplus */ -int getVtSizeEstimate(void); - #include "obd_error_codes.h" #include "efifeatures.h" #include "stdbool.h" diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index f9f73116f2..89270ee6a0 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -10,15 +10,15 @@ #include "main.h" #include "engine.h" #include "rpm_calculator.h" -#include "pwm_generator.h" #include "alternatorController.h" -#include "pin_repository.h" #include "voltage.h" #include "pid.h" #include "LocalVersionHolder.h" -#include "tunerstudio_configuration.h" #if EFI_ALTERNATOR_CONTROL || defined(__DOXYGEN__) +#include "pwm_generator.h" +#include "pin_repository.h" +#include "tunerstudio_configuration.h" EXTERN_ENGINE ; diff --git a/firmware/controllers/core/EfiWave.h b/firmware/controllers/core/EfiWave.h index 2f3c60ad04..f13341b818 100644 --- a/firmware/controllers/core/EfiWave.h +++ b/firmware/controllers/core/EfiWave.h @@ -9,9 +9,6 @@ #include "engine_configuration.h" -/** - * this value should be dividable by four, see FuelSchedule.hasEvents - */ #define PWM_PHASE_MAX_COUNT 252 #define PWM_PHASE_MAX_WAVE_PER_PWM 3 @@ -19,8 +16,8 @@ * int8_t is probably less efficient then int32_t but we need * to reduce memory footprint * - * todo: migrate to bit-array to same memory? but this would - * this would some CPU cycles. see std::vector + * todo: migrate to bit-array to save memory? + * this would cost some CPU cycles. see std::vector */ typedef int8_t pin_state_t; diff --git a/firmware/controllers/electronic_throttle.cpp b/firmware/controllers/electronic_throttle.cpp index 05402defe6..52ffd23ac6 100644 --- a/firmware/controllers/electronic_throttle.cpp +++ b/firmware/controllers/electronic_throttle.cpp @@ -23,17 +23,17 @@ #include "main.h" #include "electronic_throttle.h" -#include "pin_repository.h" #include "idle_controller.h" #include "tps.h" #include "io_pins.h" #include "engine_configuration.h" -#include "pwm_generator.h" #include "pwm_generator_logic.h" #include "pid.h" #include "engine_controller.h" #if EFI_ELECTRONIC_THROTTLE_BODY || defined(__DOXYGEN__) +#include "pin_repository.h" +#include "pwm_generator.h" #define ETB_FREQ 400 extern pin_output_mode_e DEFAULT_OUTPUT; diff --git a/firmware/controllers/tachometer.cpp b/firmware/controllers/tachometer.cpp index 632500b385..5e19a4a14c 100644 --- a/firmware/controllers/tachometer.cpp +++ b/firmware/controllers/tachometer.cpp @@ -38,6 +38,4 @@ void initTachometer(void) { outputPinRegisterExt2("analog tach output", &enginePins.tachOut, boardConfiguration->tachOutputPin, &boardConfiguration->tachOutputPinMode); addTriggerEventListener(tachSignalCallback, "tach", engine); - - } diff --git a/firmware/controllers/trigger/trigger.mk b/firmware/controllers/trigger/trigger.mk index 0b298a1435..26131f4144 100644 --- a/firmware/controllers/trigger/trigger.mk +++ b/firmware/controllers/trigger/trigger.mk @@ -1,6 +1,4 @@ -TRIGGER_SRC = - TRIGGER_DECODERS_SRC_CPP = \ $(PROJECT_DIR)/controllers/trigger/trigger_bmw.cpp \ $(PROJECT_DIR)/controllers/trigger/trigger_mazda.cpp \ diff --git a/unit_tests/.cproject b/unit_tests/.cproject index f2a8c51407..b61479f604 100644 --- a/unit_tests/.cproject +++ b/unit_tests/.cproject @@ -24,10 +24,10 @@ - - @@ -77,7 +77,7 @@ - + @@ -106,13 +106,13 @@ - - @@ -125,7 +125,7 @@ - + @@ -159,4 +159,5 @@ + diff --git a/unit_tests/makelinks.bat b/unit_tests/makelinks.bat index 649ead916b..4189b5b460 100644 --- a/unit_tests/makelinks.bat +++ b/unit_tests/makelinks.bat @@ -1,11 +1,6 @@ -junction controllers_algo ..\firmware\controllers\algo -junction controllers_core ..\firmware\controllers\core -junction controllers_math ..\firmware\controllers\math -junction controllers_system ..\firmware\controllers\system -junction controllers_trigger ..\firmware\controllers\trigger +junction controllers ..\firmware\controllers junction engines ..\firmware\config\engines -junction controllers_sensors ..\firmware\controllers\sensors junction util ..\firmware\util junction ext_algo ..\firmware\ext_algo diff --git a/win32_functional_tests/Makefile b/win32_functional_tests/Makefile index 4515817df8..da5b4932c6 100644 --- a/win32_functional_tests/Makefile +++ b/win32_functional_tests/Makefile @@ -125,12 +125,10 @@ CSRC = ${PORTSRC} \ ${TESTSRC} \ ${HALSRC} \ ${PLATFORMSRC} \ - $(TRIGGER_SRC) \ $(SYSTEMSRC) \ $(CONSOLESRC) \ $(CONTROLLERS_ALGO_SRC) \ $(CONTROLLERS_CORE_SRC) \ - $(CONTROLLERS_MATH_SRC) \ $(CONTROLLERS_SENSORS_SRC) \ $(ENGINES_SRC) \ $(BOARDSRC) \