From c3a57b6a77f0284af79ef3c3a212719f91ed6787 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 16 Sep 2018 22:39:46 -0400 Subject: [PATCH] refactoring --- firmware/bootloader/bootloader_storage.c | 2 +- firmware/controllers/flash_main.cpp | 2 +- firmware/controllers/obd2viaCAN.c | 2 +- firmware/development/test/test.c | 2 +- firmware/development/test/testbmk.c | 2 +- firmware/hw_layer/flash.c | 2 +- firmware/hw_layer/mcp3208.c | 2 +- firmware/hw_layer/serial_over_usb/usbcfg.c | 2 +- firmware/hw_layer/serial_over_usb/usbconsole.c | 2 +- firmware/util/data_buffer.c | 2 +- firmware/util/histogram.c | 2 +- firmware/util/rfiutil.c | 2 +- simulator/main.c | 2 +- simulator/simulator/boards.cpp | 2 +- simulator/simulator/framework.cpp | 2 +- unit_tests/main.cpp | 2 +- unit_tests/map_resize.cpp | 2 +- unit_tests/test_accel_enrichment.cpp | 2 +- unit_tests/test_basic_math/test_find_index.cpp | 2 +- unit_tests/test_basic_math/test_interpolation_3d.cpp | 2 +- unit_tests/test_engine_math.cpp | 2 +- unit_tests/test_fasterEngineSpinningUp.h | 2 +- unit_tests/test_fuelCut.h | 2 +- unit_tests/test_fuel_map.cpp | 2 +- unit_tests/test_logic_expression.cpp | 2 +- unit_tests/test_pid_auto.cpp | 2 +- unit_tests/test_sensors.cpp | 2 +- unit_tests/test_signal_executor.cpp | 2 +- unit_tests/test_speed_density.cpp | 2 +- unit_tests/test_startOfCrankingPrimingPulse.h | 2 +- unit_tests/test_trigger_decoder.cpp | 2 +- unit_tests/test_trigger_noiseless.cpp | 2 +- unit_tests/test_util.cpp | 2 +- unit_tests/unit_test_framework.cpp | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/firmware/bootloader/bootloader_storage.c b/firmware/bootloader/bootloader_storage.c index a19ebdd251..cef68edded 100644 --- a/firmware/bootloader/bootloader_storage.c +++ b/firmware/bootloader/bootloader_storage.c @@ -1,5 +1,5 @@ -#include "main.h" +#include "global.h" #include "bootloader/bootloader.h" #if defined(EFI_BOOTLOADER_INCLUDE_CODE) || defined(__DOXYGEN__) diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp index 4c034abb4f..7a41493f24 100644 --- a/firmware/controllers/flash_main.cpp +++ b/firmware/controllers/flash_main.cpp @@ -7,7 +7,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include +#include "global.h" #include "flash_main.h" #include "eficonsole.h" diff --git a/firmware/controllers/obd2viaCAN.c b/firmware/controllers/obd2viaCAN.c index 9c0e6350cd..1882965ce5 100644 --- a/firmware/controllers/obd2viaCAN.c +++ b/firmware/controllers/obd2viaCAN.c @@ -9,6 +9,6 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "can_hw.h" diff --git a/firmware/development/test/test.c b/firmware/development/test/test.c index a93c69f99d..ffd1c2e17f 100644 --- a/firmware/development/test/test.c +++ b/firmware/development/test/test.c @@ -22,7 +22,7 @@ * @{ */ -#include "main.h" +#include "global.h" #if EFI_PERF_METRICS || defined(__DOXYGEN__) diff --git a/firmware/development/test/testbmk.c b/firmware/development/test/testbmk.c index 069dff0590..d0ed2eef88 100644 --- a/firmware/development/test/testbmk.c +++ b/firmware/development/test/testbmk.c @@ -14,7 +14,7 @@ limitations under the License. */ -#include "main.h" +#include "global.h" #if EFI_PERF_METRICS #include "test.h" diff --git a/firmware/hw_layer/flash.c b/firmware/hw_layer/flash.c index 84c154cab4..2ef1235616 100644 --- a/firmware/hw_layer/flash.c +++ b/firmware/hw_layer/flash.c @@ -3,7 +3,7 @@ * @brief Lower-level code related to internal flash memory */ -#include "main.h" +#include "global.h" #if EFI_INTERNAL_FLASH || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/mcp3208.c b/firmware/hw_layer/mcp3208.c index b1240d1f70..d59ae4dd7f 100644 --- a/firmware/hw_layer/mcp3208.c +++ b/firmware/hw_layer/mcp3208.c @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_MCP_3208 || defined(__DOXYGEN__) #include "mcp3208.h" diff --git a/firmware/hw_layer/serial_over_usb/usbcfg.c b/firmware/hw_layer/serial_over_usb/usbcfg.c index efbf374605..33a70cdf9f 100644 --- a/firmware/hw_layer/serial_over_usb/usbcfg.c +++ b/firmware/hw_layer/serial_over_usb/usbcfg.c @@ -14,7 +14,7 @@ limitations under the License. */ -#include "main.h" +#include "global.h" #if HAL_USE_SERIAL_USB || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/serial_over_usb/usbconsole.c b/firmware/hw_layer/serial_over_usb/usbconsole.c index 44c343aca4..d0d105e2ef 100644 --- a/firmware/hw_layer/serial_over_usb/usbconsole.c +++ b/firmware/hw_layer/serial_over_usb/usbconsole.c @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_USB_SERIAL || defined(__DOXYGEN__) diff --git a/firmware/util/data_buffer.c b/firmware/util/data_buffer.c index fab789fa7b..ba9ab6c9cd 100644 --- a/firmware/util/data_buffer.c +++ b/firmware/util/data_buffer.c @@ -6,7 +6,7 @@ */ #include "data_buffer.h" -#include "main.h" +#include "global.h" #if EFI_PROD_CODE //#include "eficonsole.h" #endif /* EFI_PROD_CODE */ diff --git a/firmware/util/histogram.c b/firmware/util/histogram.c index cb8d38c800..3dda5136a9 100644 --- a/firmware/util/histogram.c +++ b/firmware/util/histogram.c @@ -11,7 +11,7 @@ #include #include "histogram.h" -#include "main.h" +#include "global.h" #if EFI_HISTOGRAMS || EFI_UNIT_TEST diff --git a/firmware/util/rfiutil.c b/firmware/util/rfiutil.c index f9a8e3b9e1..c9a7b21616 100644 --- a/firmware/util/rfiutil.c +++ b/firmware/util/rfiutil.c @@ -20,7 +20,7 @@ */ #include -#include "main.h" +#include "global.h" #include "rfiutil.h" /* diff --git a/simulator/main.c b/simulator/main.c index ec8de46201..2cdc23992d 100644 --- a/simulator/main.c +++ b/simulator/main.c @@ -14,7 +14,7 @@ limitations under the License. */ -#include "main.h" +#include "global.h" #include "chprintf.h" #include "rusEfiFunctionalTest.h" #include "framework.h" diff --git a/simulator/simulator/boards.cpp b/simulator/simulator/boards.cpp index 67293759f8..0f9e25dfaf 100644 --- a/simulator/simulator/boards.cpp +++ b/simulator/simulator/boards.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "boards.h" #include "engine.h" #include "adc_math.h" diff --git a/simulator/simulator/framework.cpp b/simulator/simulator/framework.cpp index 0fef53b0ef..a4fd573f04 100644 --- a/simulator/simulator/framework.cpp +++ b/simulator/simulator/framework.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "framework.h" efitick_t getTimeNowNt(void) { diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index a7c0f9076f..20c96e3546 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -10,7 +10,7 @@ #include -#include "main.h" +#include "global.h" #include "error_handling.h" #include "test_accel_enrichment.h" #include "test_interpolation_3d.h" diff --git a/unit_tests/map_resize.cpp b/unit_tests/map_resize.cpp index db5728002a..9cd59d3e8d 100644 --- a/unit_tests/map_resize.cpp +++ b/unit_tests/map_resize.cpp @@ -9,7 +9,7 @@ #include "fuel_math.h" #include "interpolation.h" #include "engine_configuration.h" -#include "main.h" +#include "global.h" #if 1 diff --git a/unit_tests/test_accel_enrichment.cpp b/unit_tests/test_accel_enrichment.cpp index ac8839431a..889f36cf45 100644 --- a/unit_tests/test_accel_enrichment.cpp +++ b/unit_tests/test_accel_enrichment.cpp @@ -6,7 +6,7 @@ * Author: Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "accel_enrichment.h" #include "test_accel_enrichment.h" #include "engine_configuration.h" diff --git a/unit_tests/test_basic_math/test_find_index.cpp b/unit_tests/test_basic_math/test_find_index.cpp index 1ebd80c907..79f9152737 100644 --- a/unit_tests/test_basic_math/test_find_index.cpp +++ b/unit_tests/test_basic_math/test_find_index.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine_math.h" #include "interpolation.h" #include "unit_test_framework.h" diff --git a/unit_tests/test_basic_math/test_interpolation_3d.cpp b/unit_tests/test_basic_math/test_interpolation_3d.cpp index 2f125e261e..7704c01897 100644 --- a/unit_tests/test_basic_math/test_interpolation_3d.cpp +++ b/unit_tests/test_basic_math/test_interpolation_3d.cpp @@ -9,7 +9,7 @@ #include #include "interpolation.h" -#include "main.h" +#include "global.h" #include "unit_test_framework.h" float rpmBins[5] = { 100, 200, 300, 400, 500 }; diff --git a/unit_tests/test_engine_math.cpp b/unit_tests/test_engine_math.cpp index dc7bdfda97..fecafd996e 100644 --- a/unit_tests/test_engine_math.cpp +++ b/unit_tests/test_engine_math.cpp @@ -6,7 +6,7 @@ */ #include "test_engine_math.h" -#include "main.h" +#include "global.h" #include "engine_math.h" #include "engine_configuration.h" #include "map.h" diff --git a/unit_tests/test_fasterEngineSpinningUp.h b/unit_tests/test_fasterEngineSpinningUp.h index 05a7897754..fd89f7768f 100644 --- a/unit_tests/test_fasterEngineSpinningUp.h +++ b/unit_tests/test_fasterEngineSpinningUp.h @@ -7,7 +7,7 @@ #ifndef TEST_FASTERENGINESPINNINGUP_H_ #define TEST_FASTERENGINESPINNINGUP_H_ -#include "main.h" +#include "global.h" void testFasterEngineSpinningUp(); diff --git a/unit_tests/test_fuelCut.h b/unit_tests/test_fuelCut.h index 034221dab6..ae924b53cb 100644 --- a/unit_tests/test_fuelCut.h +++ b/unit_tests/test_fuelCut.h @@ -7,7 +7,7 @@ #ifndef TEST_FUELCUT_H_ #define TEST_FUELCUT_H_ -#include "main.h" +#include "global.h" void testFuelCut(); diff --git a/unit_tests/test_fuel_map.cpp b/unit_tests/test_fuel_map.cpp index e9cde7d199..388addccc8 100644 --- a/unit_tests/test_fuel_map.cpp +++ b/unit_tests/test_fuel_map.cpp @@ -6,7 +6,7 @@ */ #include "test_fuel_map.h" -#include "main.h" +#include "global.h" #include "engine_configuration.h" #include "fuel_math.h" #include "trigger_structure.h" diff --git a/unit_tests/test_logic_expression.cpp b/unit_tests/test_logic_expression.cpp index dea0ac7a58..545be4810d 100644 --- a/unit_tests/test_logic_expression.cpp +++ b/unit_tests/test_logic_expression.cpp @@ -7,7 +7,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "test_logic_expression.h" #include "fsio_impl.h" #include "cli_registry.h" diff --git a/unit_tests/test_pid_auto.cpp b/unit_tests/test_pid_auto.cpp index c3f6ec7d24..f1b1152d1c 100644 --- a/unit_tests/test_pid_auto.cpp +++ b/unit_tests/test_pid_auto.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "test_pid_auto.h" #include "pid_auto_tune.h" #include "unit_test_framework.h" diff --git a/unit_tests/test_sensors.cpp b/unit_tests/test_sensors.cpp index 691e68cba9..b8ef5bedc1 100644 --- a/unit_tests/test_sensors.cpp +++ b/unit_tests/test_sensors.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "thermistors.h" #include "allsensors.h" #include "hip9011_lookup.h" diff --git a/unit_tests/test_signal_executor.cpp b/unit_tests/test_signal_executor.cpp index 61cf8d9939..10438e9deb 100644 --- a/unit_tests/test_signal_executor.cpp +++ b/unit_tests/test_signal_executor.cpp @@ -6,7 +6,7 @@ */ #include -#include "main.h" +#include "global.h" #include "signal_executor.h" #include "test_signal_executor.h" diff --git a/unit_tests/test_speed_density.cpp b/unit_tests/test_speed_density.cpp index c9bc292b18..124c84b59e 100644 --- a/unit_tests/test_speed_density.cpp +++ b/unit_tests/test_speed_density.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine_test_helper.h" #include "speed_density.h" #include "test_speed_density.h" diff --git a/unit_tests/test_startOfCrankingPrimingPulse.h b/unit_tests/test_startOfCrankingPrimingPulse.h index 6a8ae43ac7..c1d6b65dd0 100644 --- a/unit_tests/test_startOfCrankingPrimingPulse.h +++ b/unit_tests/test_startOfCrankingPrimingPulse.h @@ -8,7 +8,7 @@ #ifndef TEST_STARTOFCRANKINGPRIMINGPULSE_H_ #define TEST_STARTOFCRANKINGPRIMINGPULSE_H_ -#include "main.h" +#include "global.h" void testPlainCrankingWithoutAdvancedFeatures(); void testStartOfCrankingPrimingPulse(); diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp index 287db3133d..ab7abf97b3 100644 --- a/unit_tests/test_trigger_decoder.cpp +++ b/unit_tests/test_trigger_decoder.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "test_trigger_decoder.h" #include "trigger_decoder.h" #include "engine_math.h" diff --git a/unit_tests/test_trigger_noiseless.cpp b/unit_tests/test_trigger_noiseless.cpp index 2cf442cc06..9c46af0c0c 100644 --- a/unit_tests/test_trigger_noiseless.cpp +++ b/unit_tests/test_trigger_noiseless.cpp @@ -4,7 +4,7 @@ * @date Apr 20, 2018 */ -#include "main.h" +#include "global.h" #include "test_trigger_decoder.h" #include "trigger_decoder.h" #include "engine_math.h" diff --git a/unit_tests/test_util.cpp b/unit_tests/test_util.cpp index 0823ac1cdb..35c05990bf 100644 --- a/unit_tests/test_util.cpp +++ b/unit_tests/test_util.cpp @@ -9,7 +9,7 @@ #include "test_util.h" #include "cyclic_buffer.h" -#include "main.h" +#include "global.h" #include "histogram.h" #include "malfunction_central.h" diff --git a/unit_tests/unit_test_framework.cpp b/unit_tests/unit_test_framework.cpp index 2f040bb0d5..7a53a30b55 100644 --- a/unit_tests/unit_test_framework.cpp +++ b/unit_tests/unit_test_framework.cpp @@ -6,7 +6,7 @@ */ #include -#include "main.h" +#include "global.h" void assertEqualsM5(const char *prefix, const char *message, float expected, float actual, float EPS) { char msg[100];