From 85603a28bdf5e5b9720f904e1050be0fe3ba6570 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 26 Aug 2016 00:01:55 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/engine_controller.cpp | 8 ++++++-- firmware/rusefi.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index acd569a2fd..102b778e88 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -600,7 +600,12 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) { initRpmCalculator(sharedLogger, engine); #endif /* EFI_SHAFT_POSITION_INPUT */ +#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL) || defined(__DOXYGEN__) + initInjectorCentral(sharedLogger); +#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */ + // multiple issues with this initMapAdjusterThread(); + // periodic events need to be initialized after fuel&spark pins to avoid a warning initPeriodicEvents(PASS_ENGINE_PARAMETER_F); if (hasFirmwareError()) { @@ -610,13 +615,12 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) { chThdCreateStatic(csThreadStack, sizeof(csThreadStack), LOWPRIO, (tfunc_t) csThread, NULL); #if (EFI_PROD_CODE && EFI_ENGINE_CONTROL) || defined(__DOXYGEN__) - initInjectorCentral(sharedLogger); /** * This has to go after 'initInjectorCentral' and 'initInjectorCentral' in order to * properly detect un-assigned output pins */ prepareShapes(PASS_ENGINE_PARAMETER_F); -#endif +#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */ #if EFI_PWM_TESTER || defined(__DOXYGEN__) initPwmTester(); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 8260ef3d15..b2143eb974 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -303,5 +303,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20160823; + return 20160824; }