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

FSIO input progress

This commit is contained in:
rusefi 2018-08-01 23:27:22 -04:00
parent 309dd497da
commit 3d9370771b
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/core/fsio_core.cpp
View File

@ -279,7 +279,10 @@ bool LECalculator::processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SU
}
}
break;
case LE_METHOD_FSIO_DIGITAL_INPUT:
// todo: implement code for digital inout!!!
case LE_METHOD_FSIO_ANALOG_INPUT:
// todo: start taking index parameter!!!
push(element->action, getVoltage("fsio", engineConfiguration->fsioAdc[0]));
break;
case LE_METHOD_KNOCK:

21
firmware/controllers/core/fsio_impl.cpp
View File

@ -147,7 +147,25 @@ float getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
// todo: that's about bench test mode, wrong header for sure!
#include "injector_central.h"
static void setFsioAnalogInputPin(const char *indexStr, const char *pinName) {
// todo: reduce code duplication between all "set pin methods"
int index = atoi(indexStr) - 1;
if (index < 0 || index >= FSIO_COMMAND_COUNT) {
scheduleMsg(logger, "invalid FSIO index: %d", index);
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;
}
boardConfiguration->fsioAdc[index] = pin;
scheduleMsg(logger, "FSIO analog input pin #%d [%s]", (index + 1), hwPortname(pin));
}
static void setFsioDigitalInputPin(const char *indexStr, const char *pinName) {
// todo: reduce code duplication between all "set pin methods"
int index = atoi(indexStr) - 1;
if (index < 0 || index >= FSIO_COMMAND_COUNT) {
scheduleMsg(logger, "invalid FSIO index: %d", index);
@ -160,7 +178,7 @@ static void setFsioDigitalInputPin(const char *indexStr, const char *pinName) {
return;
}
boardConfiguration->fsioDigitalInputs[index] = pin;
scheduleMsg(logger, "FSIO input pin #%d [%s]", (index + 1), hwPortname(pin));
scheduleMsg(logger, "FSIO digital input pin #%d [%s]", (index + 1), hwPortname(pin));
}
static void setFsioPidOutputPin(const char *indexStr, const char *pinName) {
@ -637,6 +655,7 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
addConsoleActionSS("set_fsio_output_pin", (VoidCharPtrCharPtr) setFsioOutputPin);
addConsoleActionII("set_fsio_output_frequency", (VoidIntInt) setFsioFrequency);
addConsoleActionSS("set_fsio_digital_input_pin", (VoidCharPtrCharPtr) setFsioDigitalInputPin);
addConsoleActionSS("set_fsio_analog_input_pin", (VoidCharPtrCharPtr) setFsioAnalogInputPin);
#endif /* EFI_PROD_CODE */