refactoring

2018-09-16 22:39:46 -04:00 · 2018-09-16 22:39:46 -04:00 · 98c7ad808c
parent 1f90cf153d
commit 98c7ad808c
34 changed files with 34 additions and 34 deletions
--- 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__)
--- a/firmware/controllers/flash_main.cpp
+++ b/firmware/controllers/flash_main.cpp
@ -7,7 +7,7 @@
 * @author Andrey Belomutskiy, (c) 2012-2018
 */

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

 #include "flash_main.h"
 #include "eficonsole.h"
--- 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"

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

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

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

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

--- 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 */
--- a/firmware/util/histogram.c
+++ b/firmware/util/histogram.c
@ -11,7 +11,7 @@

 #include <string.h>
 #include "histogram.h"
-#include "main.h"
+#include "global.h"

 #if EFI_HISTOGRAMS || EFI_UNIT_TEST

--- a/firmware/util/rfiutil.c
+++ b/firmware/util/rfiutil.c
@ -20,7 +20,7 @@
 */

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

 /*
--- 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"
--- 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"
--- 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) {
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@ -10,7 +10,7 @@
 #include <math.h>


-#include "main.h"
+#include "global.h"
 #include "error_handling.h"
 #include "test_accel_enrichment.h"
 #include "test_interpolation_3d.h"
--- 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

--- 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"
--- 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"
--- 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 <stdlib.h>

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

 float rpmBins[5] = { 100, 200, 300, 400, 500 };
--- 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"
--- 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();

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

--- 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"
--- 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"
--- 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"
--- 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"
--- a/unit_tests/test_signal_executor.cpp
+++ b/unit_tests/test_signal_executor.cpp
@ -6,7 +6,7 @@
 */

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

 #include "signal_executor.h"
 #include "test_signal_executor.h"
--- 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"
--- 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();
--- 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"
--- 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"
--- 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"
--- a/unit_tests/unit_test_framework.cpp
+++ b/unit_tests/unit_test_framework.cpp
@ -6,7 +6,7 @@
 */

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

 void assertEqualsM5(const char *prefix, const char *message, float expected, float actual, float EPS) {
 	char msg[100];