From 2158eb56d58ad603298aa69260acdabef461aada Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 3 Dec 2017 15:31:11 -0500 Subject: [PATCH] code style --- .../controllers/algo/engine_configuration.cpp | 23 ++++++++----------- firmware/development/trigger_emulator.cpp | 11 +++++---- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 9bfa452b93..9c2d1d96f6 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -29,20 +29,8 @@ #include "engine_math.h" #include "speed_density.h" #include "advance_map.h" -#if EFI_PROD_CODE || defined(__DOXYGEN__) -#include "electronic_throttle.h" -#include "idle_thread.h" -#include "alternatorController.h" -#include "hardware.h" -#include "board.h" -#endif /* EFI_PROD_CODE */ #include "hip9011_lookup.h" - -#if EFI_PROD_CODE -#include "HIP9011.h" -#endif - #include "accelerometer.h" #include "custom_engine.h" @@ -93,12 +81,21 @@ #include "zil130.h" #include "honda_600.h" -EXTERN_ENGINE; +#if EFI_PROD_CODE || defined(__DOXYGEN__) +#include "electronic_throttle.h" +#include "idle_thread.h" +#include "alternatorController.h" +#include "hardware.h" +#include "board.h" +#include "HIP9011.h" +#endif /* EFI_PROD_CODE */ #if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #include "tunerstudio.h" #endif +EXTERN_ENGINE; + //#define TS_DEFAULT_SPEED 115200 #define TS_DEFAULT_SPEED 38400 diff --git a/firmware/development/trigger_emulator.cpp b/firmware/development/trigger_emulator.cpp index df68a3d322..49a19bb34b 100644 --- a/firmware/development/trigger_emulator.cpp +++ b/firmware/development/trigger_emulator.cpp @@ -14,15 +14,16 @@ #include "main_trigger_callback.h" #include "datalogging.h" #include "engine_configuration.h" -#if EFI_PROD_CODE -#include "pwm_generator.h" -#include "pin_repository.h" -#endif #include "io_pins.h" #include "trigger_emulator_algo.h" #include "trigger_central.h" #include "settings.h" +#if EFI_PROD_CODE || defined(__DOXYGEN__) +#include "pwm_generator.h" +#include "pin_repository.h" +#endif /* EFI_PROD_CODE */ + extern PwmConfig triggerSignal; static OutputPin emulatorOutputs[3]; @@ -39,7 +40,7 @@ void initTriggerEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) triggerSignal.outputPins[1] = &emulatorOutputs[1]; triggerSignal.outputPins[2] = &emulatorOutputs[2]; -#if EFI_PROD_CODE +#if EFI_PROD_CODE || defined(__DOXYGEN__) // todo: refactor, make this a loop triggerSignal.outputPins[0]->initPin("trg emulator ch1", boardConfiguration->triggerSimulatorPins[0], &boardConfiguration->triggerSimulatorPinModes[0]);