From bf3c9a964687484e8129e60780a877502861f720 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Fri, 29 Aug 2014 19:02:52 -0500
Subject: [PATCH] auto-sync

---
 firmware/controllers/settings.cpp  | 26 +++++++++++++++++++++-----
 firmware/hw_layer/pin_repository.c |  5 +++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 756a61082f..737a02ab29 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -190,8 +190,7 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
 			pinModeToString(boardConfiguration->malfunctionIndicatorPinMode));
 	scheduleMsg(&logger, "analogInputDividerCoefficient: %f", engineConfiguration->analogInputDividerCoefficient);
 
-	scheduleMsg(&logger, "needSecondTriggerInput: %s",
-			boolToString(engineConfiguration->needSecondTriggerInput));
+	scheduleMsg(&logger, "needSecondTriggerInput: %s", boolToString(engineConfiguration->needSecondTriggerInput));
 
 #if EFI_PROD_CODE
 	scheduleMsg(&logger, "idleValvePin: %s", hwPortname(boardConfiguration->idleValvePin));
@@ -518,6 +517,11 @@ static void setTriggerInputPin(const char *indexStr, const char *pinName) {
 	if (index < 0 || index > 2)
 		return;
 	brain_pin_e pin = parseBrainPin(pinName);
+	// todo: extract method - code duplication with other 'set_xxx_pin' methods?
+	if (pin == GPIO_INVALID) {
+		scheduleMsg(&logger, "invalid pin name [%s]", pinName);
+		return;
+	}
 	scheduleMsg(&logger, "setting trigger pin[%d] to %s please save&restart", index, hwPortname(pin));
 	boardConfiguration->triggerInputPins[index] = pin;
 }
@@ -539,12 +543,20 @@ static void setTriggerSimulatorPin(const char *indexStr, const char *pinName) {
 	if (index < 0 || index > 2)
 		return;
 	brain_pin_e pin = parseBrainPin(pinName);
+	if (pin == GPIO_INVALID) {
+		scheduleMsg(&logger, "invalid pin name [%s]", pinName);
+		return;
+	}
 	scheduleMsg(&logger, "setting trigger simulator pin[%d] to %s please save&restart", index, hwPortname(pin));
 	boardConfiguration->triggerSimulatorPins[index] = pin;
 }
 
 static void setAnalogInputPin(const char *sensorStr, const char *pinName) {
 	brain_pin_e pin = parseBrainPin(pinName);
+	if (pin == GPIO_INVALID) {
+		scheduleMsg(&logger, "invalid pin name [%s]", pinName);
+		return;
+	}
 	adc_channel_e channel = getAdcChannel(pin);
 	if (channel == EFI_ADC_ERROR) {
 		scheduleMsg(&logger, "Error with [%s]", pinName);
@@ -567,9 +579,14 @@ static void setAnalogInputPin(const char *sensorStr, const char *pinName) {
 
 static void setLogicInputPin(const char *indexStr, const char *pinName) {
 	int index = atoi(indexStr);
-	if (index < 0 || index > 2)
+	if (index < 0 || index > 2) {
 		return;
+	}
 	brain_pin_e pin = parseBrainPin(pinName);
+	if (pin == GPIO_INVALID) {
+		scheduleMsg(&logger, "invalid pin name [%s]", pinName);
+		return;
+	}
 	scheduleMsg(&logger, "setting logic input pin[%d] to %s please save&restart", index, hwPortname(pin));
 	boardConfiguration->logicAnalyzerPins[index] = pin;
 }
@@ -604,7 +621,7 @@ static void setFuelMap(const char * rpmStr, const char *loadStr, const char *val
 }
 
 static void setSpiMode(int index, bool mode) {
-	switch(index) {
+	switch (index) {
 	case 1:
 		boardConfiguration->is_enabled_spi_1 = mode;
 		break;
@@ -737,7 +754,6 @@ void initSettings(void) {
 	addConsoleActionII("set_toothed_wheel", setToothedWheel);
 	addConsoleActionI("set_trigger_type", setTriggerType);
 
-
 	addConsoleActionF("set_vbatt_divider", setVBattDivider);
 
 #if EFI_PROD_CODE
diff --git a/firmware/hw_layer/pin_repository.c b/firmware/hw_layer/pin_repository.c
index ad132dbdd4..4365f3276a 100644
--- a/firmware/hw_layer/pin_repository.c
+++ b/firmware/hw_layer/pin_repository.c
@@ -76,6 +76,11 @@ static void reportPins(void) {
 static MemoryStream portNameStream;
 static char portNameBuffer[20];
 
+/**
+ * Parse string representation of physical pin into brain_pin_e ordinal.
+ *
+ * @return GPIO_NONE for "none", GPIO_INVALID for invalid entry
+ */
 brain_pin_e parseBrainPin(const char *str) {
 	if (strEqual(str, "none"))
 		return GPIO_NONE;