diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp index 6b45ffea87..8fdcdee4ea 100644 --- a/firmware/console/eficonsole.cpp +++ b/firmware/console/eficonsole.cpp @@ -23,7 +23,7 @@ #include #include -#include "main.h" +#include "global.h" #include #include "eficonsole.h" #include "console_io.h" diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index b7f3e610d1..d4df9f5df9 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -24,7 +24,7 @@ * */ -#include "main.h" +#include "global.h" #include "status_loop.h" #include "adc_inputs.h" diff --git a/firmware/controllers/PwmTester.cpp b/firmware/controllers/PwmTester.cpp index 1bff95773a..87db9d1505 100644 --- a/firmware/controllers/PwmTester.cpp +++ b/firmware/controllers/PwmTester.cpp @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_PWM_TESTER || defined(__DOXYGEN__) diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp index 0e08b92fe7..7409dd5217 100644 --- a/firmware/controllers/algo/accel_enrichment.cpp +++ b/firmware/controllers/algo/accel_enrichment.cpp @@ -20,7 +20,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "trigger_central.h" #include "accel_enrichment.h" #include "engine_state.h" diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp index f3247f9d4f..846843d54f 100644 --- a/firmware/controllers/algo/advance_map.cpp +++ b/firmware/controllers/algo/advance_map.cpp @@ -18,7 +18,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "advance_map.h" #include "interpolation.h" #include "efilib2.h" diff --git a/firmware/controllers/algo/algo.h b/firmware/controllers/algo/algo.h index a01ae779b3..2444b99040 100644 --- a/firmware/controllers/algo/algo.h +++ b/firmware/controllers/algo/algo.h @@ -8,7 +8,7 @@ #ifndef ALGO_H_ #define ALGO_H_ -#include "main.h" +#include "global.h" #include "engine_configuration.h" void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE); void initAlgo(Logging *sharedLogger); diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index c968ab5ec9..cf403b2977 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -5,7 +5,7 @@ -#include "main.h" +#include "global.h" #include "rusefi_enums.h" const char *getEngine_type_e(engine_type_e value){ switch(value) { diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index b488314e5c..010d92c891 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -9,7 +9,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine.h" #include "engine_state.h" #include "efiGpio.h" diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 1094ef5de2..b0aa826fe9 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -8,7 +8,6 @@ #define H_ENGINE_H_ #include "global.h" -#include "main.h" #include "pid.h" #include "engine_configuration.h" #include "rpm_calculator.h" diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 782cceec1d..1b847ccd37 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -20,7 +20,7 @@ * */ -#include "main.h" +#include "global.h" #include "engine_configuration.h" #include "fsio_impl.h" #include "allsensors.h" diff --git a/firmware/controllers/algo/event_registry.cpp b/firmware/controllers/algo/event_registry.cpp index 75573fc7c0..836161fedd 100644 --- a/firmware/controllers/algo/event_registry.cpp +++ b/firmware/controllers/algo/event_registry.cpp @@ -21,7 +21,7 @@ */ #include "event_registry.h" -#include "main.h" +#include "global.h" #include "engine_math.h" InjectionEvent::InjectionEvent() { diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp index 70d99f9543..6351443faf 100644 --- a/firmware/controllers/algo/fuel_math.cpp +++ b/firmware/controllers/algo/fuel_math.cpp @@ -29,7 +29,7 @@ * */ -#include "main.h" +#include "global.h" #include "fuel_math.h" #include "interpolation.h" #include "engine_configuration.h" diff --git a/firmware/controllers/algo/malfunction_central.h b/firmware/controllers/algo/malfunction_central.h index 4db4e16ed7..d34fa2fb9b 100644 --- a/firmware/controllers/algo/malfunction_central.h +++ b/firmware/controllers/algo/malfunction_central.h @@ -9,7 +9,7 @@ #ifndef MALFUNCTION_CENTRAL_H_ #define MALFUNCTION_CENTRAL_H_ -#include "main.h" +#include "global.h" #ifdef __cplusplus extern "C" diff --git a/firmware/controllers/algo/signal_executor.cpp b/firmware/controllers/algo/signal_executor.cpp index a30abc2e9a..1bf3011bd1 100644 --- a/firmware/controllers/algo/signal_executor.cpp +++ b/firmware/controllers/algo/signal_executor.cpp @@ -22,7 +22,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "signal_executor.h" #include "efiGpio.h" #include "engine.h" diff --git a/firmware/controllers/core/EfiWave.cpp b/firmware/controllers/core/EfiWave.cpp index 3c4093dfab..fee387785f 100644 --- a/firmware/controllers/core/EfiWave.cpp +++ b/firmware/controllers/core/EfiWave.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "EfiWave.h" #include "trigger_structure.h" diff --git a/firmware/controllers/core/fl_stack.h b/firmware/controllers/core/fl_stack.h index b0c88e9fb8..58b8d37b88 100644 --- a/firmware/controllers/core/fl_stack.h +++ b/firmware/controllers/core/fl_stack.h @@ -9,7 +9,7 @@ #ifndef FL_STACK_H_ #define FL_STACK_H_ -#include "main.h" +#include "global.h" #include "error_handling.h" template diff --git a/firmware/controllers/core/fsio_core.cpp b/firmware/controllers/core/fsio_core.cpp index 2699fc0f27..195ac6a90a 100644 --- a/firmware/controllers/core/fsio_core.cpp +++ b/firmware/controllers/core/fsio_core.cpp @@ -13,7 +13,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_FSIO || defined(__DOXYGEN__) diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index f1a8dadc42..26206c3f7d 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -9,7 +9,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_FSIO || defined(__DOXYGEN__) diff --git a/firmware/controllers/core/interpolation.cpp b/firmware/controllers/core/interpolation.cpp index 18aa1e9c8e..9848748eb6 100644 --- a/firmware/controllers/core/interpolation.cpp +++ b/firmware/controllers/core/interpolation.cpp @@ -10,7 +10,7 @@ * @author Dmitry Sidin, (c) 2015 */ -#include "main.h" +#include "global.h" #if DEBUG_FUEL #include #endif diff --git a/firmware/controllers/electronic_throttle.cpp b/firmware/controllers/electronic_throttle.cpp index 3463e685be..8e3b107611 100644 --- a/firmware/controllers/electronic_throttle.cpp +++ b/firmware/controllers/electronic_throttle.cpp @@ -48,7 +48,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "electronic_throttle.h" #include "tps.h" #include "io_pins.h" diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 00fd357b83..3c19f7e35a 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -22,7 +22,7 @@ */ #include "sensor_chart.h" -#include "main.h" +#include "global.h" #include "engine_configuration.h" #include "trigger_central.h" #include "engine_controller.h" diff --git a/firmware/controllers/error_handling.cpp b/firmware/controllers/error_handling.cpp index 1850ba2ade..e316e976f6 100644 --- a/firmware/controllers/error_handling.cpp +++ b/firmware/controllers/error_handling.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "error_handling.h" #include "io_pins.h" #include "efilib2.h" diff --git a/firmware/controllers/idle_thread.cpp b/firmware/controllers/idle_thread.cpp index 4d119e3278..7c6589c0f7 100644 --- a/firmware/controllers/idle_thread.cpp +++ b/firmware/controllers/idle_thread.cpp @@ -24,7 +24,7 @@ * */ -#include "main.h" +#include "global.h" #include "rpm_calculator.h" #include "pwm_generator.h" #include "idle_thread.h" diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp index a946676d9c..c42ca2526e 100644 --- a/firmware/controllers/injector_central.cpp +++ b/firmware/controllers/injector_central.cpp @@ -21,7 +21,7 @@ */ // todo: rename this file -#include "main.h" +#include "global.h" #if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) diff --git a/firmware/controllers/lcd_controller.cpp b/firmware/controllers/lcd_controller.cpp index 9b01fae5a9..169c1faff2 100644 --- a/firmware/controllers/lcd_controller.cpp +++ b/firmware/controllers/lcd_controller.cpp @@ -16,7 +16,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "lcd_controller.h" #include "lcd_HD44780.h" #include "efilib.h" diff --git a/firmware/controllers/malfunction_indicator.cpp b/firmware/controllers/malfunction_indicator.cpp index 45fda595e9..0c5049e9fc 100644 --- a/firmware/controllers/malfunction_indicator.cpp +++ b/firmware/controllers/malfunction_indicator.cpp @@ -25,7 +25,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "io_pins.h" #include "malfunction_central.h" #include "malfunction_indicator.h" diff --git a/firmware/controllers/malfunction_indicator.h b/firmware/controllers/malfunction_indicator.h index b2a32740a7..acf8cfefd5 100644 --- a/firmware/controllers/malfunction_indicator.h +++ b/firmware/controllers/malfunction_indicator.h @@ -11,7 +11,7 @@ #ifndef MALFUNCTION_INDICATOR_H_ #define MALFUNCTION_INDICATOR_H_ -#include "main.h" +#include "global.h" #include "engine.h" #if EFI_MALFUNCTION_INDICATOR || defined(__DOXYGEN__) diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp index 2110418f2a..dac8580883 100644 --- a/firmware/controllers/map_averaging.cpp +++ b/firmware/controllers/map_averaging.cpp @@ -21,7 +21,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "efilib2.h" #include "map.h" diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index d87a53168d..095b1b802b 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -19,7 +19,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "engine_math.h" #include "engine_configuration.h" #include "interpolation.h" diff --git a/firmware/controllers/math/pid.h b/firmware/controllers/math/pid.h index af7c04ad27..5d59a36d64 100644 --- a/firmware/controllers/math/pid.h +++ b/firmware/controllers/math/pid.h @@ -8,7 +8,7 @@ #ifndef PID_H_ #define PID_H_ -#include "main.h" +#include "global.h" #include "engine_configuration_generated_structures.h" #if EFI_PROD_CODE || EFI_SIMULATOR diff --git a/firmware/controllers/math/pid_auto_tune.h b/firmware/controllers/math/pid_auto_tune.h index 3e3f324c9c..fca715d0ee 100644 --- a/firmware/controllers/math/pid_auto_tune.h +++ b/firmware/controllers/math/pid_auto_tune.h @@ -12,7 +12,7 @@ #ifndef CONTROLLERS_MATH_PID_AUTO_TUNE_H_ #define CONTROLLERS_MATH_PID_AUTO_TUNE_H_ -#include "main.h" +#include "global.h" #include "rusefi_types.h" class PID_AutoTune { diff --git a/firmware/controllers/math/speed_density.cpp b/firmware/controllers/math/speed_density.cpp index 706302b67b..d8b132ccdf 100644 --- a/firmware/controllers/math/speed_density.cpp +++ b/firmware/controllers/math/speed_density.cpp @@ -7,7 +7,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "speed_density.h" #include "interpolation.h" #include "rpm_calculator.h" diff --git a/firmware/controllers/obd2.cpp b/firmware/controllers/obd2.cpp index 30dd110fc9..4eb7d27a2b 100644 --- a/firmware/controllers/obd2.cpp +++ b/firmware/controllers/obd2.cpp @@ -21,7 +21,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "engine.h" #include "obd2.h" #include "can_hw.h" diff --git a/firmware/controllers/persistent_store.cpp b/firmware/controllers/persistent_store.cpp index a1ac27c48b..52d67a9e37 100644 --- a/firmware/controllers/persistent_store.cpp +++ b/firmware/controllers/persistent_store.cpp @@ -22,7 +22,7 @@ */ #include "sensor_chart.h" -#include "main.h" +#include "global.h" #include "engine_configuration.h" #include "trigger_central.h" #include "engine_controller.h" diff --git a/firmware/controllers/sensors/ego.h b/firmware/controllers/sensors/ego.h index 4b6e41b504..bb862acff9 100644 --- a/firmware/controllers/sensors/ego.h +++ b/firmware/controllers/sensors/ego.h @@ -10,7 +10,7 @@ #ifndef EGO_H_ #define EGO_H_ -#include "main.h" +#include "global.h" #include "rusefi_enums.h" #include "engine_configuration.h" diff --git a/firmware/controllers/sensors/maf.cpp b/firmware/controllers/sensors/maf.cpp index 8c4c775806..bc3c497dee 100644 --- a/firmware/controllers/sensors/maf.cpp +++ b/firmware/controllers/sensors/maf.cpp @@ -1,4 +1,4 @@ -#include "main.h" +#include "global.h" #include "engine.h" #include "analog_input.h" #include "maf.h" diff --git a/firmware/controllers/sensors/maf.h b/firmware/controllers/sensors/maf.h index d3e5211ffe..b39ce574e5 100644 --- a/firmware/controllers/sensors/maf.h +++ b/firmware/controllers/sensors/maf.h @@ -12,7 +12,7 @@ #ifndef MAF_H_ #define MAF_H_ -#include "main.h" +#include "global.h" #define getMafT(ec) (getVoltageDivided("maf", ec->mafAdcChannel)) float getMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/sensors/map.cpp b/firmware/controllers/sensors/map.cpp index 05fe3ba2f3..bb711551d6 100644 --- a/firmware/controllers/sensors/map.cpp +++ b/firmware/controllers/sensors/map.cpp @@ -5,7 +5,7 @@ * * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine_configuration.h" #include "engine_math.h" #include "analog_input.h" diff --git a/firmware/controllers/sensors/oil_pressure.cpp b/firmware/controllers/sensors/oil_pressure.cpp index 57b1f51924..72a301b0a5 100644 --- a/firmware/controllers/sensors/oil_pressure.cpp +++ b/firmware/controllers/sensors/oil_pressure.cpp @@ -1,7 +1,7 @@ /** * @author Matthew Kennedy, (c) 2017 */ -#include "main.h" +#include "global.h" #include "oil_pressure.h" #include "interpolation.h" #include "analog_input.h" diff --git a/firmware/controllers/sensors/oil_pressure.h b/firmware/controllers/sensors/oil_pressure.h index 603871b61a..6797cb8276 100644 --- a/firmware/controllers/sensors/oil_pressure.h +++ b/firmware/controllers/sensors/oil_pressure.h @@ -6,7 +6,7 @@ #ifndef OIL_PRESSURE_H_ #define OIL_PRESSURE_H_ -#include "main.h" +#include "global.h" #include "rusefi_enums.h" #include "engine_configuration.h" diff --git a/firmware/controllers/sensors/thermistors.cpp b/firmware/controllers/sensors/thermistors.cpp index 1b68a321dd..b8d865abb3 100644 --- a/firmware/controllers/sensors/thermistors.cpp +++ b/firmware/controllers/sensors/thermistors.cpp @@ -10,7 +10,7 @@ * http://en.wikipedia.org/wiki/Steinhart%E2%80%93Hart_equation */ -#include "main.h" +#include "global.h" #include "thermistors.h" #include "analog_input.h" #include "engine_configuration.h" diff --git a/firmware/controllers/sensors/thermistors.h b/firmware/controllers/sensors/thermistors.h index 1352699452..8ecce4dcf7 100644 --- a/firmware/controllers/sensors/thermistors.h +++ b/firmware/controllers/sensors/thermistors.h @@ -8,7 +8,7 @@ #ifndef THERMISTORS_H_ #define THERMISTORS_H_ -#include "main.h" +#include "global.h" #define KELV 273.15f diff --git a/firmware/controllers/sensors/voltage.cpp b/firmware/controllers/sensors/voltage.cpp index f56c4659e3..55fa4b3ca8 100644 --- a/firmware/controllers/sensors/voltage.cpp +++ b/firmware/controllers/sensors/voltage.cpp @@ -7,7 +7,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine.h" #include "analog_input.h" #include "voltage.h" diff --git a/firmware/controllers/sensors/voltage.h b/firmware/controllers/sensors/voltage.h index b6a7387377..ce1cd91c95 100644 --- a/firmware/controllers/sensors/voltage.h +++ b/firmware/controllers/sensors/voltage.h @@ -10,7 +10,7 @@ #ifndef VOLTAGE_H_ #define VOLTAGE_H_ -#include "main.h" +#include "global.h" #include "engine_configuration.h" float getVRef(DECLARE_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index db15968c9a..8046698223 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "settings.h" #include "eficonsole.h" #include "engine_configuration.h" diff --git a/firmware/controllers/system/efiGpio.cpp b/firmware/controllers/system/efiGpio.cpp index 955f285774..b2f8b22bc6 100644 --- a/firmware/controllers/system/efiGpio.cpp +++ b/firmware/controllers/system/efiGpio.cpp @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine.h" #include "efiGpio.h" diff --git a/firmware/controllers/system/efiGpio.h b/firmware/controllers/system/efiGpio.h index d325278e41..5a3483641c 100644 --- a/firmware/controllers/system/efiGpio.h +++ b/firmware/controllers/system/efiGpio.h @@ -10,7 +10,7 @@ #define EFIGPIO_H_ #include "io_pins.h" -#include "main.h" +#include "global.h" void initPrimaryPins(void); void initOutputPins(void); diff --git a/firmware/controllers/system/event_queue.cpp b/firmware/controllers/system/event_queue.cpp index c094052b75..adebb3c5b0 100644 --- a/firmware/controllers/system/event_queue.cpp +++ b/firmware/controllers/system/event_queue.cpp @@ -11,7 +11,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "event_queue.h" #include "efitime.h" #include "efilib2.h" diff --git a/firmware/controllers/system/pwm_generator_logic.cpp b/firmware/controllers/system/pwm_generator_logic.cpp index 1594f1ff9c..0ada70b286 100644 --- a/firmware/controllers/system/pwm_generator_logic.cpp +++ b/firmware/controllers/system/pwm_generator_logic.cpp @@ -8,7 +8,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "pwm_generator_logic.h" /** diff --git a/firmware/controllers/system/scheduler.h b/firmware/controllers/system/scheduler.h index 5f304ba49e..acd62e3688 100644 --- a/firmware/controllers/system/scheduler.h +++ b/firmware/controllers/system/scheduler.h @@ -7,7 +7,7 @@ #ifndef SCHEDULER_H_ #define SCHEDULER_H_ -#include "main.h" +#include "global.h" typedef void (*schfunc_t)(void *); diff --git a/firmware/controllers/system/signal_executor_sleep.cpp b/firmware/controllers/system/signal_executor_sleep.cpp index 203340e131..8f72f43cf1 100644 --- a/firmware/controllers/system/signal_executor_sleep.cpp +++ b/firmware/controllers/system/signal_executor_sleep.cpp @@ -22,7 +22,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "scheduler.h" #include "signal_executor.h" #include "main_trigger_callback.h" diff --git a/firmware/controllers/trigger/decoders/trigger_universal.h b/firmware/controllers/trigger/decoders/trigger_universal.h index 15321e0f61..cfbcbbaf44 100644 --- a/firmware/controllers/trigger/decoders/trigger_universal.h +++ b/firmware/controllers/trigger/decoders/trigger_universal.h @@ -9,7 +9,7 @@ #ifndef CONTROLLERS_TRIGGER_DECODERS_TRIGGER_UNIVERSAL_H_ #define CONTROLLERS_TRIGGER_DECODERS_TRIGGER_UNIVERSAL_H_ -#include "main.h" +#include "global.h" #include "trigger_structure.h" #include "engine_configuration.h" diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index cf93803414..091dc6d901 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -21,7 +21,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #if EFI_PROD_CODE || defined(__DOXYGEN__) #include #endif diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp index 16089b9864..d5444dc70e 100644 --- a/firmware/controllers/trigger/rpm_calculator.cpp +++ b/firmware/controllers/trigger/rpm_calculator.cpp @@ -10,7 +10,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "rpm_calculator.h" #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 83de986c18..f461266f8a 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index ddbe821ea4..b0996055bf 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -18,7 +18,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) diff --git a/firmware/controllers/trigger/trigger_decoder.h b/firmware/controllers/trigger/trigger_decoder.h index 2b69fe60a6..7da75c9506 100644 --- a/firmware/controllers/trigger/trigger_decoder.h +++ b/firmware/controllers/trigger/trigger_decoder.h @@ -8,7 +8,7 @@ #ifndef TRIGGER_DECODER_H_ #define TRIGGER_DECODER_H_ -#include "main.h" +#include "global.h" #include "trigger_structure.h" #include "engine_configuration.h" diff --git a/firmware/controllers/trigger/trigger_emulator_algo.cpp b/firmware/controllers/trigger/trigger_emulator_algo.cpp index ff01b99b21..1b711a111f 100644 --- a/firmware/controllers/trigger/trigger_emulator_algo.cpp +++ b/firmware/controllers/trigger/trigger_emulator_algo.cpp @@ -13,7 +13,7 @@ * @date Mar 3, 2014 * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__) diff --git a/firmware/controllers/trigger/trigger_simulator.cpp b/firmware/controllers/trigger/trigger_simulator.cpp index 672e5b6b31..18d7a75c07 100644 --- a/firmware/controllers/trigger/trigger_simulator.cpp +++ b/firmware/controllers/trigger/trigger_simulator.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine.h" #include "trigger_simulator.h" #include "trigger_emulator_algo.h" diff --git a/firmware/controllers/trigger/trigger_structure.cpp b/firmware/controllers/trigger/trigger_structure.cpp index 66db429688..826c979b3f 100644 --- a/firmware/controllers/trigger/trigger_structure.cpp +++ b/firmware/controllers/trigger/trigger_structure.cpp @@ -18,7 +18,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "trigger_structure.h" #include "error_handling.h" #include "trigger_decoder.h" diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h index 7fd4ea7b13..d68c8e4888 100644 --- a/firmware/controllers/trigger/trigger_structure.h +++ b/firmware/controllers/trigger/trigger_structure.h @@ -8,7 +8,7 @@ #ifndef TRIGGER_STRUCTURE_H_ #define TRIGGER_STRUCTURE_H_ -#include "main.h" +#include "global.h" #include "rusefi_enums.h" #include "EfiWave.h" diff --git a/firmware/development/engine_emulator.cpp b/firmware/development/engine_emulator.cpp index a2620814cb..20534155cc 100644 --- a/firmware/development/engine_emulator.cpp +++ b/firmware/development/engine_emulator.cpp @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "engine_emulator.h" #include "advance_map.h" diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp index a0b1cc3ee1..b4a319ca26 100644 --- a/firmware/development/engine_sniffer.cpp +++ b/firmware/development/engine_sniffer.cpp @@ -24,7 +24,7 @@ * If not, see . */ -#include "main.h" +#include "global.h" #include "engine_sniffer.h" #include "adc_inputs.h" diff --git a/firmware/development/hw_layer/poten.cpp b/firmware/development/hw_layer/poten.cpp index 58aa91f53a..7f46ff2e08 100644 --- a/firmware/development/hw_layer/poten.cpp +++ b/firmware/development/hw_layer/poten.cpp @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "poten.h" #include "eficonsole.h" #include "pin_repository.h" diff --git a/firmware/development/hw_layer/poten.h b/firmware/development/hw_layer/poten.h index 640c9fa44c..e09d023e59 100644 --- a/firmware/development/hw_layer/poten.h +++ b/firmware/development/hw_layer/poten.h @@ -9,7 +9,7 @@ #ifndef POTEN_H_ #define POTEN_H_ -#include "main.h" +#include "global.h" #if HAL_USE_SPI || defined(__DOXYGEN__) diff --git a/firmware/development/rfi_perftest.cpp b/firmware/development/rfi_perftest.cpp index 6aec06d251..fdd8af3e0d 100644 --- a/firmware/development/rfi_perftest.cpp +++ b/firmware/development/rfi_perftest.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "rfi_perftest.h" #include "fuel_math.h" diff --git a/firmware/development/sensor_chart.cpp b/firmware/development/sensor_chart.cpp index d88956915c..899f327956 100644 --- a/firmware/development/sensor_chart.cpp +++ b/firmware/development/sensor_chart.cpp @@ -6,7 +6,7 @@ */ #include "sensor_chart.h" -#include "main.h" +#include "global.h" #include "engine.h" #include "rpm_calculator.h" diff --git a/firmware/development/trigger_emulator.h b/firmware/development/trigger_emulator.h index 7d5d65b18b..c114dee6dd 100644 --- a/firmware/development/trigger_emulator.h +++ b/firmware/development/trigger_emulator.h @@ -9,7 +9,7 @@ #ifndef DIST_EMULATOR_H_ #define DIST_EMULATOR_H_ -#include "main.h" +#include "global.h" #include "trigger_structure.h" #include "engine.h" diff --git a/firmware/development/wave_analyzer.cpp b/firmware/development/wave_analyzer.cpp index e5460703f1..8f60675466 100644 --- a/firmware/development/wave_analyzer.cpp +++ b/firmware/development/wave_analyzer.cpp @@ -11,7 +11,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "wave_analyzer.h" #include "eficonsole.h" #include "data_buffer.h" diff --git a/firmware/development/wave_analyzer.h b/firmware/development/wave_analyzer.h index 72771ebba6..282da059b5 100644 --- a/firmware/development/wave_analyzer.h +++ b/firmware/development/wave_analyzer.h @@ -10,7 +10,7 @@ #ifndef WAVE_ANALYZER_H_ #define WAVE_ANALYZER_H_ -#include "main.h" +#include "global.h" #if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) diff --git a/firmware/egt2can.cpp b/firmware/egt2can.cpp index b4b1bd45bc..3beb95acd0 100644 --- a/firmware/egt2can.cpp +++ b/firmware/egt2can.cpp @@ -1,5 +1,5 @@ -#include "main.h" +#include "global.h" #include "engine_configuration.h" #include "max31855.h" #include "rusefi.h" diff --git a/firmware/hw_layer/HIP9011.cpp b/firmware/hw_layer/HIP9011.cpp index c7f3c85e72..c75fd92902 100644 --- a/firmware/hw_layer/HIP9011.cpp +++ b/firmware/hw_layer/HIP9011.cpp @@ -32,7 +32,7 @@ * @Spilly */ -#include "main.h" +#include "global.h" #include "engine.h" #include "settings.h" #include "pin_repository.h" diff --git a/firmware/hw_layer/accelerometer.h b/firmware/hw_layer/accelerometer.h index 21d80486bf..ca1a2efd09 100644 --- a/firmware/hw_layer/accelerometer.h +++ b/firmware/hw_layer/accelerometer.h @@ -8,7 +8,7 @@ #ifndef HW_LAYER_ACCELEROMETER_H_ #define HW_LAYER_ACCELEROMETER_H_ -#include "main.h" +#include "global.h" #include "engine.h" void configureAccelerometerPins(DECLARE_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 956f600349..6a13da2bd7 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -13,7 +13,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if HAL_USE_ADC || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/adc_inputs.h b/firmware/hw_layer/adc_inputs.h index 08f7510892..e94f4794a7 100644 --- a/firmware/hw_layer/adc_inputs.h +++ b/firmware/hw_layer/adc_inputs.h @@ -9,7 +9,7 @@ #ifndef ADC_INPUTS_H_ #define ADC_INPUTS_H_ -#include "main.h" +#include "global.h" #if HAL_USE_ADC || defined(__DOXYGEN__) #include "adc_math.h" diff --git a/firmware/hw_layer/backup_ram.h b/firmware/hw_layer/backup_ram.h index de37d6b13b..a09de3ca78 100644 --- a/firmware/hw_layer/backup_ram.h +++ b/firmware/hw_layer/backup_ram.h @@ -8,7 +8,7 @@ #ifndef BACKUP_RAM_H_ #define BACKUP_RAM_H_ -#include "main.h" +#include "global.h" #include "efiGpio.h" typedef enum { diff --git a/firmware/hw_layer/board_test.cpp b/firmware/hw_layer/board_test.cpp index a28abff73f..ce2bed6522 100644 --- a/firmware/hw_layer/board_test.cpp +++ b/firmware/hw_layer/board_test.cpp @@ -22,7 +22,7 @@ */ #include "engine.h" -#include "main.h" +#include "global.h" #include "board_test.h" #include "pin_repository.h" #include "efiGpio.h" diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index b7d1c9c3cd..6fda5fa9a5 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -9,7 +9,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "can_hw.h" #include "string.h" #include "obd2.h" diff --git a/firmware/hw_layer/digital_input_hw.h b/firmware/hw_layer/digital_input_hw.h index 62ff0e9f7c..081616ce58 100644 --- a/firmware/hw_layer/digital_input_hw.h +++ b/firmware/hw_layer/digital_input_hw.h @@ -8,7 +8,7 @@ #ifndef WAVE_ANALYZER_HW_H_ #define WAVE_ANALYZER_HW_H_ -#include "main.h" +#include "global.h" #if HAL_USE_ICU || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/flash.h b/firmware/hw_layer/flash.h index 07adaafc3c..2748b5dc82 100644 --- a/firmware/hw_layer/flash.h +++ b/firmware/hw_layer/flash.h @@ -1,7 +1,7 @@ #ifndef FLASH_H #define FLASH_H -#include "main.h" +#include "global.h" #include /** diff --git a/firmware/hw_layer/hardware.h b/firmware/hw_layer/hardware.h index 6873e0d66e..4d07825c3d 100644 --- a/firmware/hw_layer/hardware.h +++ b/firmware/hw_layer/hardware.h @@ -8,7 +8,7 @@ #ifndef HARDWARE_H_ #define HARDWARE_H_ -#include "main.h" +#include "global.h" #if HAL_USE_SPI || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/io_pins.cpp b/firmware/hw_layer/io_pins.cpp index d444041cea..a2419d9012 100644 --- a/firmware/hw_layer/io_pins.cpp +++ b/firmware/hw_layer/io_pins.cpp @@ -8,7 +8,7 @@ */ #include -#include "main.h" +#include "global.h" #include "io_pins.h" #include "efiGpio.h" diff --git a/firmware/hw_layer/io_pins.h b/firmware/hw_layer/io_pins.h index e10c1a0563..cddcb188cd 100644 --- a/firmware/hw_layer/io_pins.h +++ b/firmware/hw_layer/io_pins.h @@ -10,7 +10,7 @@ #define IO_PINS_H_ #include "rusefi_enums.h" -#include "main.h" +#include "global.h" #define INITIAL_PIN_STATE -1 #define GPIO_NULL NULL diff --git a/firmware/hw_layer/joystick.h b/firmware/hw_layer/joystick.h index 0d99d20ebe..dc5b2489dc 100644 --- a/firmware/hw_layer/joystick.h +++ b/firmware/hw_layer/joystick.h @@ -7,7 +7,7 @@ #ifndef CONTROLLERS_JOYSTICK_H_ #define CONTROLLERS_JOYSTICK_H_ -#include "main.h" +#include "global.h" typedef enum { JB_CENTER = 0, diff --git a/firmware/hw_layer/max31855.h b/firmware/hw_layer/max31855.h index 3b6d8f7e09..77b7bb98fe 100644 --- a/firmware/hw_layer/max31855.h +++ b/firmware/hw_layer/max31855.h @@ -8,7 +8,7 @@ #ifndef MAX31855_H_ #define MAX31855_H_ -#include "main.h" +#include "global.h" #include "engine_configuration.h" void initMax31855(Logging *sharedLogger, SPIDriver *drv, egt_cs_array_t max31855_cs); diff --git a/firmware/hw_layer/mcp3208.h b/firmware/hw_layer/mcp3208.h index fba1f10b0b..e8901540eb 100644 --- a/firmware/hw_layer/mcp3208.h +++ b/firmware/hw_layer/mcp3208.h @@ -16,7 +16,7 @@ #ifndef MCP3208_H_ #define MCP3208_H_ -#include "main.h" +#include "global.h" #if EFI_MCP_3208 || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer.cpp index d53c945d15..78dd9b6e77 100644 --- a/firmware/hw_layer/microsecond_timer.cpp +++ b/firmware/hw_layer/microsecond_timer.cpp @@ -11,7 +11,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "microsecond_timer.h" #include "scheduler.h" #include "rfiutil.h" diff --git a/firmware/hw_layer/mmc_card.cpp b/firmware/hw_layer/mmc_card.cpp index c5b6c25861..528fe7771f 100644 --- a/firmware/hw_layer/mmc_card.cpp +++ b/firmware/hw_layer/mmc_card.cpp @@ -12,7 +12,7 @@ * todo: extract some logic into a controller file */ -#include "main.h" +#include "global.h" #if EFI_FILE_LOGGING || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/neo6m.cpp b/firmware/hw_layer/neo6m.cpp index ed03b36ce9..f0690e2eaa 100644 --- a/firmware/hw_layer/neo6m.cpp +++ b/firmware/hw_layer/neo6m.cpp @@ -14,7 +14,7 @@ #include // todo: MISRA does not like time.h #include -#include "main.h" +#include "global.h" #if EFI_UART_GPS || defined(__DOXYGEN__) diff --git a/firmware/hw_layer/pin_repository.cpp b/firmware/hw_layer/pin_repository.cpp index 6bdc2816dc..5cca88e7b3 100644 --- a/firmware/hw_layer/pin_repository.cpp +++ b/firmware/hw_layer/pin_repository.cpp @@ -9,7 +9,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "pin_repository.h" #include "eficonsole.h" #include "memstreams.h" diff --git a/firmware/hw_layer/rtc_helper.cpp b/firmware/hw_layer/rtc_helper.cpp index a1a6dd7b4f..fb9d45474a 100644 --- a/firmware/hw_layer/rtc_helper.cpp +++ b/firmware/hw_layer/rtc_helper.cpp @@ -8,7 +8,7 @@ #include #include -#include "main.h" +#include "global.h" #include "rfiutil.h" #include "rtc_helper.h" diff --git a/firmware/hw_layer/servo.h b/firmware/hw_layer/servo.h index d6439385bd..e82c3f4a0e 100644 --- a/firmware/hw_layer/servo.h +++ b/firmware/hw_layer/servo.h @@ -7,7 +7,7 @@ #ifndef HW_LAYER_SERVO_H_ #define HW_LAYER_SERVO_H_ -#include "main.h" +#include "global.h" void initServo(void); diff --git a/firmware/hw_layer/stepper.h b/firmware/hw_layer/stepper.h index 23c1435934..f86f2991b6 100644 --- a/firmware/hw_layer/stepper.h +++ b/firmware/hw_layer/stepper.h @@ -7,7 +7,7 @@ #ifndef STEPPER_H_ #define STEPPER_H_ -#include "main.h" +#include "global.h" #include "efiGpio.h" #include "backup_ram.h" diff --git a/firmware/hw_layer/stm32f0/mpu_util.cpp b/firmware/hw_layer/stm32f0/mpu_util.cpp index c52d8c86e0..2335f5cbae 100644 --- a/firmware/hw_layer/stm32f0/mpu_util.cpp +++ b/firmware/hw_layer/stm32f0/mpu_util.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" int getRemainingStack(Thread *otp) { return 9999; diff --git a/firmware/hw_layer/stm32f1/mpu_util.h b/firmware/hw_layer/stm32f1/mpu_util.h index 3acaf330c7..374d9c011f 100644 --- a/firmware/hw_layer/stm32f1/mpu_util.h +++ b/firmware/hw_layer/stm32f1/mpu_util.h @@ -8,7 +8,7 @@ #ifndef CONFIG_STM32F1EGT_MPU_UTIL_H_ #define CONFIG_STM32F1EGT_MPU_UTIL_H_ -#include "main.h" +#include "global.h" #define baseHardwareInit() {} diff --git a/firmware/hw_layer/stm32f4/mpu_util.cpp b/firmware/hw_layer/stm32f4/mpu_util.cpp index 45bd98700b..a6710462a7 100644 --- a/firmware/hw_layer/stm32f4/mpu_util.cpp +++ b/firmware/hw_layer/stm32f4/mpu_util.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "mpu_util.h" #include "error_handling.h" #include "engine.h" diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/trigger_input.cpp index d0c53e6513..fb66757ddc 100644 --- a/firmware/hw_layer/trigger_input.cpp +++ b/firmware/hw_layer/trigger_input.cpp @@ -6,7 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) diff --git a/firmware/util/listener_array.cpp b/firmware/util/listener_array.cpp index df2f5785f1..e647997e40 100644 --- a/firmware/util/listener_array.cpp +++ b/firmware/util/listener_array.cpp @@ -5,6 +5,6 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "listener_array.h" diff --git a/firmware/util/loggingcentral.cpp b/firmware/util/loggingcentral.cpp index 54a0e94cfe..8165f0209e 100644 --- a/firmware/util/loggingcentral.cpp +++ b/firmware/util/loggingcentral.cpp @@ -5,7 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2018 */ -#include "main.h" +#include "global.h" #include "efilib.h" #if ! EFI_UNIT_TEST || defined(__DOXYGEN__)