andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-08-29 19:02:52 -05:00
parent 6930487733
commit bf3c9a9646
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
firmware/controllers/settings.cpp
View File

@ -190,8 +190,7 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
pinModeToString(boardConfiguration->malfunctionIndicatorPinMode)); pinModeToString(boardConfiguration->malfunctionIndicatorPinMode));
scheduleMsg(&logger, "analogInputDividerCoefficient: %f", engineConfiguration->analogInputDividerCoefficient); scheduleMsg(&logger, "analogInputDividerCoefficient: %f", engineConfiguration->analogInputDividerCoefficient);
scheduleMsg(&logger, "needSecondTriggerInput: %s", scheduleMsg(&logger, "needSecondTriggerInput: %s", boolToString(engineConfiguration->needSecondTriggerInput));
boolToString(engineConfiguration->needSecondTriggerInput));
#if EFI_PROD_CODE #if EFI_PROD_CODE
scheduleMsg(&logger, "idleValvePin: %s", hwPortname(boardConfiguration->idleValvePin)); 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) if (index < 0 || index > 2)
return; return;
brain_pin_e pin = parseBrainPin(pinName); 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)); scheduleMsg(&logger, "setting trigger pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->triggerInputPins[index] = pin; boardConfiguration->triggerInputPins[index] = pin;
} }
@ -539,12 +543,20 @@ static void setTriggerSimulatorPin(const char *indexStr, const char *pinName) {
if (index < 0 || index > 2) if (index < 0 || index > 2)
return; return;
brain_pin_e pin = parseBrainPin(pinName); 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)); scheduleMsg(&logger, "setting trigger simulator pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->triggerSimulatorPins[index] = pin; boardConfiguration->triggerSimulatorPins[index] = pin;
} }
static void setAnalogInputPin(const char *sensorStr, const char *pinName) { static void setAnalogInputPin(const char *sensorStr, const char *pinName) {
brain_pin_e pin = parseBrainPin(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); adc_channel_e channel = getAdcChannel(pin);
if (channel == EFI_ADC_ERROR) { if (channel == EFI_ADC_ERROR) {
scheduleMsg(&logger, "Error with [%s]", pinName); 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) { static void setLogicInputPin(const char *indexStr, const char *pinName) {
int index = atoi(indexStr); int index = atoi(indexStr);
if (index < 0 || index > 2) if (index < 0 || index > 2) {
return; return;
}
brain_pin_e pin = parseBrainPin(pinName); 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)); scheduleMsg(&logger, "setting logic input pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->logicAnalyzerPins[index] = 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) { static void setSpiMode(int index, bool mode) {
switch(index) { switch (index) {
case 1: case 1:
boardConfiguration->is_enabled_spi_1 = mode; boardConfiguration->is_enabled_spi_1 = mode;
break; break;
@ -737,7 +754,6 @@ void initSettings(void) {
addConsoleActionII("set_toothed_wheel", setToothedWheel); addConsoleActionII("set_toothed_wheel", setToothedWheel);
addConsoleActionI("set_trigger_type", setTriggerType); addConsoleActionI("set_trigger_type", setTriggerType);
addConsoleActionF("set_vbatt_divider", setVBattDivider); addConsoleActionF("set_vbatt_divider", setVBattDivider);
#if EFI_PROD_CODE #if EFI_PROD_CODE

5
firmware/hw_layer/pin_repository.c
View File

@ -76,6 +76,11 @@ static void reportPins(void) {
static MemoryStream portNameStream; static MemoryStream portNameStream;
static char portNameBuffer[20]; 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) { brain_pin_e parseBrainPin(const char *str) {
if (strEqual(str, "none")) if (strEqual(str, "none"))
return GPIO_NONE; return GPIO_NONE;