refactoring

2018-09-16 22:26:57 -04:00 · 2018-09-16 22:26:57 -04:00 · 1f90cf153d
parent 3b87b725d1
commit 1f90cf153d
99 changed files with 98 additions and 99 deletions
--- a/firmware/console/eficonsole.cpp
+++ b/firmware/console/eficonsole.cpp
@ -23,7 +23,7 @@

 #include <stdarg.h>
 #include <stdbool.h>
-#include "main.h"
+#include "global.h"
 #include <chprintf.h>
 #include "eficonsole.h"
 #include "console_io.h"
--- 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"
--- 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__)

--- 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"
--- a/firmware/controllers/algo/advance_map.cpp
+++ b/firmware/controllers/algo/advance_map.cpp
@ -18,7 +18,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "advance_map.h"
 #include "interpolation.h"
 #include "efilib2.h"
--- 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);
--- 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) {
--- 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"
--- 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"
--- 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"
--- 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() {
--- 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"
--- 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"
--- a/firmware/controllers/algo/signal_executor.cpp
+++ b/firmware/controllers/algo/signal_executor.cpp
@ -22,7 +22,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "signal_executor.h"
 #include "efiGpio.h"
 #include "engine.h"
--- 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"

--- 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<typename T, int MAXSIZE>
--- 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__)

--- 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__)

--- 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 <stdio.h>
 #endif
--- a/firmware/controllers/electronic_throttle.cpp
+++ b/firmware/controllers/electronic_throttle.cpp
@ -48,7 +48,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "electronic_throttle.h"
 #include "tps.h"
 #include "io_pins.h"
--- 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"
--- 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"
--- 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"
--- 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__)

--- 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"
--- a/firmware/controllers/malfunction_indicator.cpp
+++ b/firmware/controllers/malfunction_indicator.cpp
@ -25,7 +25,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "io_pins.h"
 #include "malfunction_central.h"
 #include "malfunction_indicator.h"
--- 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__)
--- a/firmware/controllers/map_averaging.cpp
+++ b/firmware/controllers/map_averaging.cpp
@ -21,7 +21,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "efilib2.h"
 #include "map.h"

--- a/firmware/controllers/math/engine_math.cpp
+++ b/firmware/controllers/math/engine_math.cpp
@ -19,7 +19,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "engine_math.h"
 #include "engine_configuration.h"
 #include "interpolation.h"
--- 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
--- 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 {
--- 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"
--- a/firmware/controllers/obd2.cpp
+++ b/firmware/controllers/obd2.cpp
@ -21,7 +21,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "engine.h"
 #include "obd2.h"
 #include "can_hw.h"
--- 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"
--- 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"

--- 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"
--- 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);
--- 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"
--- 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"
--- 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"

--- 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"
--- 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

--- 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"
--- 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);
--- 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"
--- 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"

--- 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);
--- 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"
--- 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"

 /**
--- 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 *);

--- a/firmware/controllers/system/signal_executor_sleep.cpp
+++ b/firmware/controllers/system/signal_executor_sleep.cpp
@ -22,7 +22,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "scheduler.h"
 #include "signal_executor.h"
 #include "main_trigger_callback.h"
--- 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"

--- a/firmware/controllers/trigger/main_trigger_callback.cpp
+++ b/firmware/controllers/trigger/main_trigger_callback.cpp
@ -21,7 +21,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 #include <nvic.h>
 #endif
--- 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__)
--- 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__)

--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@ -18,7 +18,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"

 #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)

--- 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"

--- 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__)

--- 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"
--- a/firmware/controllers/trigger/trigger_structure.cpp
+++ b/firmware/controllers/trigger/trigger_structure.cpp
@ -18,7 +18,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "trigger_structure.h"
 #include "error_handling.h"
 #include "trigger_decoder.h"
--- 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"
--- 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"
--- a/firmware/development/engine_sniffer.cpp
+++ b/firmware/development/engine_sniffer.cpp
@ -24,7 +24,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "engine_sniffer.h"
 #include "adc_inputs.h"

--- 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"
--- 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__)

--- 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"

--- 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"

--- 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"
--- 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"
--- 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__)

--- 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"
--- 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"
--- 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);
--- 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__)

--- 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"
--- 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 {
--- 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"
--- 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"
--- 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__)

--- 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 <stdint.h>

 /**
--- 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__)

--- a/firmware/hw_layer/io_pins.cpp
+++ b/firmware/hw_layer/io_pins.cpp
@ -8,7 +8,7 @@
 */

 #include <board.h>
-#include "main.h"
+#include "global.h"
 #include "io_pins.h"
 #include "efiGpio.h"

--- 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
--- 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,
--- 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);
--- 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__)

--- 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"
--- 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__)

--- a/firmware/hw_layer/neo6m.cpp
+++ b/firmware/hw_layer/neo6m.cpp
@ -14,7 +14,7 @@
 #include <string.h>
 // todo: MISRA does not like time.h
 #include <time.h>
-#include "main.h"
+#include "global.h"

 #if EFI_UART_GPS || defined(__DOXYGEN__)

--- 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"
--- a/firmware/hw_layer/rtc_helper.cpp
+++ b/firmware/hw_layer/rtc_helper.cpp
@ -8,7 +8,7 @@

 #include <string.h> 
 #include <time.h>
-#include "main.h"
+#include "global.h"
 #include "rfiutil.h"
 #include "rtc_helper.h"

--- 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);

--- 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"

--- 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;
--- 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() {}

--- 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"
--- 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__)

--- 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"

--- 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__)