From fb206bb3dfa631b6282c89ec3f830580c71d8f51 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 28 Jan 2019 00:52:21 -0500 Subject: [PATCH] #657 pulling global access down --- firmware/controllers/idle_thread.cpp | 2 +- firmware/global.h | 1 - firmware/globalaccess.h | 4 +--- firmware/hw_layer/can_hw.cpp | 8 ++++---- simulator/simulator/global.h | 1 - simulator/simulator/globalaccess.h | 4 +--- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/firmware/controllers/idle_thread.cpp b/firmware/controllers/idle_thread.cpp index 429aeab93c..aa8a92f2d8 100644 --- a/firmware/controllers/idle_thread.cpp +++ b/firmware/controllers/idle_thread.cpp @@ -25,11 +25,11 @@ */ #include "global.h" +#include "engine_configuration.h" #include "rpm_calculator.h" #include "pwm_generator.h" #include "idle_thread.h" #include "pin_repository.h" -#include "engine_configuration.h" #include "engine.h" #include "stepper.h" diff --git a/firmware/global.h b/firmware/global.h index 9eaa3272e3..7044426d2a 100644 --- a/firmware/global.h +++ b/firmware/global.h @@ -36,7 +36,6 @@ typedef unsigned int time_t; #endif #include "common_headers.h" -#include "controllers/global_shared.h" #include "io_pins.h" diff --git a/firmware/globalaccess.h b/firmware/globalaccess.h index 101a8c1ef8..c231138f32 100644 --- a/firmware/globalaccess.h +++ b/firmware/globalaccess.h @@ -8,8 +8,6 @@ #ifndef GLOBALACCESS_H_ #define GLOBALACCESS_H_ - - - +#include "controllers/global_shared.h" #endif /* GLOBALACCESS_H_ */ diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index 65c537f5e1..1c17e4063b 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -10,16 +10,16 @@ */ #include "global.h" -#include "can_hw.h" -#include "string.h" -#include "obd2.h" #if EFI_CAN_SUPPORT || defined(__DOXYGEN__) +#include "engine_configuration.h" #include "pin_repository.h" +#include "can_hw.h" +#include "string.h" +#include "obd2.h" #include "mpu_util.h" #include "engine_state.h" -#include "engine_configuration.h" #include "vehicle_speed.h" EXTERN_ENGINE diff --git a/simulator/simulator/global.h b/simulator/simulator/global.h index 75d3d4ae03..e6c28df86e 100644 --- a/simulator/simulator/global.h +++ b/simulator/simulator/global.h @@ -17,7 +17,6 @@ #include #include "common_headers.h" -#include "global_shared.h" #include "boards.h" diff --git a/simulator/simulator/globalaccess.h b/simulator/simulator/globalaccess.h index db96d101a3..c5992e9254 100644 --- a/simulator/simulator/globalaccess.h +++ b/simulator/simulator/globalaccess.h @@ -8,8 +8,6 @@ #ifndef SIMULATOR_GLOBALACCESS_H_ #define SIMULATOR_GLOBALACCESS_H_ - - - +#include "global_shared.h" #endif /* SIMULATOR_GLOBALACCESS_H_ */