From 82bcc9b42c2ea2adddf0bc445a2373c1caf343e2 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 5 Mar 2023 02:42:54 -0500 Subject: [PATCH] progress: run more code in simulator only:hellen-honda-k --- firmware/controllers/engine_controller.cpp | 5 +++++ firmware/hw_layer/hardware.cpp | 7 +------ simulator/simulator/rusEfiFunctionalTest.cpp | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 948b85ddf1..9fe0248747 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -617,6 +617,11 @@ void commonEarlyInit() { // Start this early - it will start LED blinking and such startStatusThreads(); +#if EFI_SHAFT_POSITION_INPUT + // todo: figure out better startup logic + initTriggerCentral(); +#endif /* EFI_SHAFT_POSITION_INPUT */ + /** * Initialize hardware drivers */ diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 171d0ee04a..c5323c01e3 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -429,11 +429,6 @@ void initHardwareNoConfig() { initFlash(); #endif -#if EFI_SHAFT_POSITION_INPUT - // todo: figure out better startup logic - initTriggerCentral(); -#endif /* EFI_SHAFT_POSITION_INPUT */ - #if EFI_FILE_LOGGING initEarlyMmcCard(); #endif // EFI_FILE_LOGGING @@ -540,7 +535,7 @@ void initHardware() { initSpiModules(engineConfiguration); #endif /* HAL_USE_SPI */ -#if (EFI_PROD_CODE || EFI_SIMULATOR) && (BOARD_EXT_GPIOCHIPS > 0) +#if (EFI_PROD_CODE && BOARD_EXT_GPIOCHIPS > 0) || EFI_SIMULATOR // initSmartGpio depends on 'initSpiModules' initSmartGpio(); #endif diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp index 5b58521cf6..c088196e7b 100644 --- a/simulator/simulator/rusEfiFunctionalTest.cpp +++ b/simulator/simulator/rusEfiFunctionalTest.cpp @@ -106,9 +106,7 @@ void rusEfiFunctionalTest(void) { commonInitEngineController(); - initTriggerCentral(); - - commonEarlyInit(); + commonEarlyInit(); enableTriggerStimulator();