From 55a325f22b5719db0b32610a317225f0a5fcf367 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 6 Dec 2014 15:03:17 -0600 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/controllers/core/logic_expression.cpp | 1 + firmware/controllers/engine_controller.cpp | 10 ++++++++++ firmware/controllers/settings.cpp | 8 -------- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index de63fe1e84..a4d4f5a52b 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -572,7 +572,6 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType, Engine *e firmwareError("Unexpected engine type: %d", engineType); } applyNonPersistentConfiguration(logger, engine); - parseUserFsio(PASS_ENGINE_PARAMETER_F); #if EFI_TUNER_STUDIO syncTunerStudioCopy(); @@ -607,6 +606,7 @@ void applyNonPersistentConfiguration(Logging * logger, Engine *engine) { return; } engine->engineCycleEventCount = engine->triggerShape.getLength(); + parseUserFsio(PASS_ENGINE_PARAMETER_F); } void prepareShapes(Engine *engine) { diff --git a/firmware/controllers/core/logic_expression.cpp b/firmware/controllers/core/logic_expression.cpp index c1605897a7..137095748c 100644 --- a/firmware/controllers/core/logic_expression.cpp +++ b/firmware/controllers/core/logic_expression.cpp @@ -405,6 +405,7 @@ void initEval(Engine *engine) { #endif void parseUserFsio(DECLARE_ENGINE_PARAMETER_F) { + board_configuration_s * boardConfiguration = &engineConfiguration->bc; for (int i = 0; i < LE_COMMAND_COUNT; i++) { brain_pin_e brainPin = boardConfiguration->fsioPins[i]; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 1a1ab79bdd..07b5cd3894 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -340,6 +340,16 @@ static void showFsioInfo(void) { showFsio("ac", acRelayLogic); showFsio("fuel", fuelPumpLogic); + for (int i = 0; i < LE_COMMAND_COUNT; i++) { + char * exp = boardConfiguration->le_formulas[i]; + if (exp[0] != 0) { + scheduleMsg(&logger, "FSIO #%d [%s] at %s@%dHz = %f", (i + 1), exp, hwPortname(boardConfiguration->fsioPins[i]), + boardConfiguration->fsioFrequency[i], + engineConfiguration2->fsioLastValue[i]); + showFsio("user-defined", fsioLogics[i]); + } + } + } static void setFsioFrequency(int index, int frequency) { diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 21ff508293..cef24c3fba 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -177,14 +177,6 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf printSpiState(&logger, boardConfiguration); #endif /* EFI_PROD_CODE */ - for (int i = 0; i < LE_COMMAND_COUNT; i++) { - char * exp = boardConfiguration->le_formulas[i]; - if (exp[0] != 0) { - scheduleMsg(&logger, "FSIO #%d [%s] at %s@%dHz = %f", (i + 1), exp, hwPortname(boardConfiguration->fsioPins[i]), - boardConfiguration->fsioFrequency[i], - engineConfiguration2->fsioLastValue[i]); - } - } } extern engine_configuration_s *engineConfiguration;