rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code style

This commit is contained in:
rusEfi 2017-12-03 15:31:11 -05:00
parent c9b9d3ae9e
commit 2158eb56d5
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/controllers/algo/engine_configuration.cpp
View File

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

11
firmware/development/trigger_emulator.cpp
View File

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