From 183fbbc2e26761297eb5fa897615d42820a98649 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sun, 12 Oct 2014 17:02:54 -0500
Subject: [PATCH] auto-sync

---
 firmware/console/status_loop.cpp           |  2 +-
 firmware/controllers/algo/enum_strings.cpp |  7 ++++---
 firmware/controllers/settings.cpp          | 12 ++++++------
 firmware/util/cli_registry.h               |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index 270c2be45a..2e8a128826 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -308,7 +308,7 @@ void updateDevConsoleState(void) {
 static void showFuelInfo2(float rpm, float engineLoad) {
 	float baseFuel = getBaseTableFuel(engineConfiguration, (int) rpm, engineLoad);
 
-	scheduleMsg(&logger2, "algo=%s/pump=%s", algorithmToString(engineConfiguration->algorithm), boolToString(getOutputPinValue(FUEL_PUMP_RELAY)));
+	scheduleMsg(&logger2, "algo=%s/pump=%s", getEngine_load_mode_e(engineConfiguration->algorithm), boolToString(getOutputPinValue(FUEL_PUMP_RELAY)));
 
 	scheduleMsg(&logger2, "cranking fuel: %f", getCrankingFuel(&engine));
 
diff --git a/firmware/controllers/algo/enum_strings.cpp b/firmware/controllers/algo/enum_strings.cpp
index 14086ddc0f..84676b9caf 100644
--- a/firmware/controllers/algo/enum_strings.cpp
+++ b/firmware/controllers/algo/enum_strings.cpp
@@ -69,7 +69,7 @@ const char* getConfigurationName(engine_type_e engineType) {
 		return NULL;
 	}
 }
-
+/*
 const char * ignitionModeToString(ignition_mode_e mode) {
 	switch (mode) {
 	case IM_ONE_COIL:
@@ -82,7 +82,7 @@ const char * ignitionModeToString(ignition_mode_e mode) {
 		return "unexpected";
 	}
 }
-
+*/
 const char * pinModeToString(pin_output_mode_e mode) {
 	switch (mode) {
 	case OM_DEFAULT:
@@ -97,7 +97,7 @@ const char * pinModeToString(pin_output_mode_e mode) {
 		return "unexpected";
 	}
 }
-
+/*
 const char * algorithmToString(engine_load_mode_e mode) {
 	switch(mode) {
 	case LM_ALPHA_N:
@@ -112,3 +112,4 @@ const char * algorithmToString(engine_load_mode_e mode) {
 		return "unexpected";
 	}
 }
+*/
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index c396fe402d..d4a77cd6f0 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -66,8 +66,8 @@ extern board_configuration_s *boardConfiguration;
  */
 void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2) {
 
-	scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration->engineType),
-			engineConfiguration->engineType, engineConfiguration->triggerConfig.triggerType);
+	scheduleMsg(&logger, "Template %s/%d trigger %s", getConfigurationName(engineConfiguration->engineType),
+			engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->triggerConfig.triggerType));
 
 	scheduleMsg(&logger, "configurationVersion=%d", getGlobalConfigurationVersion());
 
@@ -99,9 +99,9 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
 
 	scheduleMsg(&logger, "tpsMin: %d/tpsMax: %d", engineConfiguration->tpsMin, engineConfiguration->tpsMax);
 
-	scheduleMsg(&logger, "ignitionMode: %s/enabled=%s", ignitionModeToString(engineConfiguration->ignitionMode),
+	scheduleMsg(&logger, "ignitionMode: %s/enabled=%s", getIgnition_mode_e(engineConfiguration->ignitionMode),
 			boolToString(engineConfiguration->isIgnitionEnabled));
-	scheduleMsg(&logger, "timingMode: %d", engineConfiguration->timingMode);
+	scheduleMsg(&logger, "timingMode: %d", /*getTiming_mode_etodo*/(engineConfiguration->timingMode));
 	scheduleMsg(&logger, "fixedModeTiming: %d", (int) engineConfiguration->fixedModeTiming);
 	scheduleMsg(&logger, "ignitionOffset=%f", engineConfiguration->ignitionOffset);
 	scheduleMsg(&logger, "injectionOffset=%f/enabled=%s", (double) engineConfiguration->injectionOffset,
@@ -125,12 +125,12 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
 	scheduleMsg(&logger, "analogInputDividerCoefficient: %f", engineConfiguration->analogInputDividerCoefficient);
 
 #if EFI_PROD_CODE
-	scheduleMsg(&logger, "idlePin: mode %s @ %s", pinModeToString(boardConfiguration->idleValvePinMode),
+	scheduleMsg(&logger, "idlePin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->idleValvePinMode),
 			hwPortname(boardConfiguration->idleValvePin));
 	scheduleMsg(&logger, "malfunctionIndicatorPinMode: %s",
 			pinModeToString(boardConfiguration->malfunctionIndicatorPinMode));
 
-	scheduleMsg(&logger, "fuelPumpPin: mode %s @ %s", pinModeToString(boardConfiguration->fuelPumpPinMode),
+	scheduleMsg(&logger, "fuelPumpPin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->fuelPumpPinMode),
 			hwPortname(boardConfiguration->fuelPumpPin));
 
 	scheduleMsg(&logger, "injectionPins: mode %s", pinModeToString(boardConfiguration->injectionPinMode));
diff --git a/firmware/util/cli_registry.h b/firmware/util/cli_registry.h
index b2d3808b1c..fba9c4d721 100644
--- a/firmware/util/cli_registry.h
+++ b/firmware/util/cli_registry.h
@@ -65,7 +65,7 @@ void helpCommand(void);
 void initConsoleLogic(void);
 void handleConsoleLine(char *line);
 int findEndOfToken(const char *line);
-
+char *unquote(char *line);
 
 void addConsoleAction(const char *token, Void callback);
 void addConsoleActionP(const char *token, VoidPtr callback, void *param);