refactoring

2018-09-16 22:25:17 -04:00 · 2018-09-16 22:25:17 -04:00 · 4868a9fd82
parent 4d27109a8d
commit 4868a9fd82
36 changed files with 36 additions and 41 deletions
--- a/firmware/bootloader/src/dfu.cpp
+++ b/firmware/bootloader/src/dfu.cpp
@ -1,7 +1,6 @@
-#include "main.h"
+#include "global.h"
 #include "hardware.h"
 #include "efiGpio.h"
-#include "global.h"

 #include "flash.h"

--- a/firmware/bootloader/src/main.cpp
+++ b/firmware/bootloader/src/main.cpp
@ -1,8 +1,7 @@

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

 #ifdef __cplusplus
 extern "C"
--- a/firmware/bootloader/src/rusefi_stubs.cpp
+++ b/firmware/bootloader/src/rusefi_stubs.cpp
@ -1,7 +1,6 @@
-#include "main.h"
+#include "global.h"
 #include "hardware.h"
 #include "efiGpio.h"
-#include "global.h"

 /*
 * We need only a small portion of code from rusEFI codebase in the bootloader.
--- a/firmware/config/boards/Prometheus/board_configuration.cpp
+++ b/firmware/config/boards/Prometheus/board_configuration.cpp
@ -7,7 +7,7 @@
 * @author andreika, (c) 2017
 */

-#include "main.h"
+#include "global.h"
 #include "engine.h"
 #include "engine_math.h"
 #include "allsensors.h"
--- a/firmware/config/engines/GY6_139QMB.cpp
+++ b/firmware/config/engines/GY6_139QMB.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "GY6_139QMB.h"
 #include "engine_math.h"
 #include "engine_configuration.h"
--- a/firmware/config/engines/MiniCooperR50.h
+++ b/firmware/config/engines/MiniCooperR50.h
@ -8,7 +8,7 @@
 #ifndef MINICOOPERR50_H_
 #define MINICOOPERR50_H_

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

 void setMiniCooperR50(engine_configuration_s *engineConfiguration);
--- a/firmware/config/engines/acura_rsx.cpp
+++ b/firmware/config/engines/acura_rsx.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 void setAcuraRSX(engine_configuration_s *engineConfiguration) {
--- a/firmware/config/engines/audi_aan.cpp
+++ b/firmware/config/engines/audi_aan.cpp
@ -20,7 +20,7 @@
 *
 */

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

 #if EFI_ENGINE_AUDI_AAN || defined(__DOXYGEN__)

--- a/firmware/config/engines/daihatsu.cpp
+++ b/firmware/config/engines/daihatsu.cpp
@ -8,7 +8,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 EXTERN_ENGINE;
--- a/firmware/config/engines/dodge_neon.cpp
+++ b/firmware/config/engines/dodge_neon.cpp
@ -14,7 +14,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 #if EFI_SUPPORT_DODGE_NEON || defined(__DOXYGEN__)

--- a/firmware/config/engines/dodge_ram.cpp
+++ b/firmware/config/engines/dodge_ram.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "dodge_ram.h"
 #include "custom_engine.h"
 #include "allsensors.h"
--- a/firmware/config/engines/dodge_stratus.cpp
+++ b/firmware/config/engines/dodge_stratus.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

--- a/firmware/config/engines/ford_1995_inline_6.cpp
+++ b/firmware/config/engines/ford_1995_inline_6.cpp
@ -13,7 +13,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "ford_1995_inline_6.h"
 #include "engine_math.h"
 #include "allsensors.h"
--- a/firmware/config/engines/ford_aspire.cpp
+++ b/firmware/config/engines/ford_aspire.cpp
@ -9,7 +9,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 #include "ford_aspire.h"

--- a/firmware/config/engines/ford_fiesta.cpp
+++ b/firmware/config/engines/ford_fiesta.cpp
@ -9,7 +9,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 #if EFI_SUPPORT_FORD_FIESTA || defined(__DOXYGEN__)

--- a/firmware/config/engines/honda_accord.cpp
+++ b/firmware/config/engines/honda_accord.cpp
@ -27,7 +27,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "trigger_decoder.h"
 #include "thermistors.h"
 #include "honda_accord.h"
--- a/firmware/config/engines/mazda_626.cpp
+++ b/firmware/config/engines/mazda_626.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "mazda_626.h"
 #include "engine_math.h"
 #include "honda_accord.h"
--- a/firmware/config/engines/nissan_primera.cpp
+++ b/firmware/config/engines/nissan_primera.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 #if EFI_SUPPORT_NISSAN_PRIMERA || defined(__DOXYGEN__)
 #include "nissan_primera.h"
--- a/firmware/config/engines/rover_v8.cpp
+++ b/firmware/config/engines/rover_v8.cpp
@ -13,7 +13,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "rover_v8.h"
 #include "engine_math.h"
 #include "allsensors.h"
--- a/firmware/config/engines/snow_blower.cpp
+++ b/firmware/config/engines/snow_blower.cpp
@ -6,4 +6,4 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
--- a/firmware/config/engines/vw.cpp
+++ b/firmware/config/engines/vw.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "vw.h"
 #include "custom_engine.h"
 #include "ego.h"
--- a/firmware/console/binary/bluetooth.cpp
+++ b/firmware/console/binary/bluetooth.cpp
@ -1,4 +1,4 @@
-#include "main.h"
+#include "global.h"

 #include "engine_state.h"
 #include "tunerstudio.h"
--- a/firmware/console/binary/bluetooth.h
+++ b/firmware/console/binary/bluetooth.h
@ -8,7 +8,7 @@
 #ifndef BLUETOOTH_H_
 #define BLUETOOTH_H_

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


--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@ -59,7 +59,7 @@
 *
 */

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

 #include "engine_state.h"
 #include "tunerstudio.h"
--- a/firmware/console/binary/tunerstudio.h
+++ b/firmware/console/binary/tunerstudio.h
@ -8,7 +8,7 @@
 #ifndef TUNERSTUDIO_H_
 #define TUNERSTUDIO_H_

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

 #if EFI_TUNER_STUDIO
--- a/firmware/console/binary/tunerstudio_io.cpp
+++ b/firmware/console/binary/tunerstudio_io.cpp
@ -5,7 +5,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "tunerstudio_io.h"
 #include "console_io.h"
 #include "engine.h"
--- a/firmware/console/binary/tunerstudio_io.h
+++ b/firmware/console/binary/tunerstudio_io.h
@ -7,7 +7,7 @@
 #ifndef CONSOLE_TUNERSTUDIO_TUNERSTUDIO_IO_H_
 #define CONSOLE_TUNERSTUDIO_TUNERSTUDIO_IO_H_

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

 #if EFI_PROD_CODE
 #include "usbconsole.h"
--- a/firmware/console/console_io.cpp
+++ b/firmware/console/console_io.cpp
@ -18,7 +18,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */

-#include "main.h"
+#include "global.h"
 #include "console_io.h"
 #include "rfiutil.h"
 #include "tunerstudio.h"
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@ -6,7 +6,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

-#include "main.h"
+#include "global.h"
 #include "adc_inputs.h"
 #include "can_hw.h"
 #include "console_io.h"
--- a/firmware/hw_layer/lcd/lcd_HD44780.cpp
+++ b/firmware/hw_layer/lcd/lcd_HD44780.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 #if EFI_HD44780_LCD

--- a/firmware/hw_layer/max31855.cpp
+++ b/firmware/hw_layer/max31855.cpp
@ -12,7 +12,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 #include "hardware.h"
--- a/firmware/hw_layer/vehicle_speed.h
+++ b/firmware/hw_layer/vehicle_speed.h
@ -8,7 +8,7 @@
 #ifndef HW_LAYER_VEHICLE_SPEED_H_
 #define HW_LAYER_VEHICLE_SPEED_H_

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

 /**
 * @return vehicle speed, in kilometers per hour
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@ -104,13 +104,12 @@
 *
 */

-#include "main.h"
+#include "global.h"
 #include "trigger_structure.h"
 #include "hardware.h"
 #include "engine_controller.h"
 #include "efiGpio.h"

-#include "global.h"
 #include "rfi_perftest.h"
 #include "rusefi.h"
 #include "memstreams.h"
--- a/firmware/util/cli_registry.cpp
+++ b/firmware/util/cli_registry.cpp
@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdbool.h>
-#include "main.h"
+#include "global.h"
 #include "cli_registry.h"
 #include "efilib.h"

--- a/firmware/util/datalogging.cpp
+++ b/firmware/util/datalogging.cpp
@ -31,7 +31,7 @@
 */

 #include <stdbool.h>
-#include "main.h"
+#include "global.h"

 #if ! EFI_UNIT_TEST || defined(__DOXYGEN__)
 #include "chprintf.h"
--- a/firmware/util/efilib2.h
+++ b/firmware/util/efilib2.h
@ -9,7 +9,7 @@
 #define EFILIB2_H_

 #include <stdint.h>
-#include "main.h"
+#include "global.h"

 typedef struct {
 	// todo: would probably be better to keep the high bits as 32 bit field to be sure
@ -32,7 +32,6 @@ class Overflow64Counter
 	State64 state;
 };

-#include "main.h"
 #if (EFI_PROD_CODE || EFI_SIMULATOR)
 #define GET_TIMESTAMP() port_rt_get_counter_value()
 #else