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

Aux analog inputs via CAN #3378

This commit is contained in:
rusefillc 2021-10-19 20:04:03 -04:00
parent 9b5d7e24eb
commit 0d5e605f75
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ static void setFsioAnalogInputPin(const char *indexStr, const char *pinName) {
efiPrintf("invalid pin name [%s]", pinName);
return;
}
engineConfiguration->fsioAdc[index] = (adc_channel_e) pin;
engineConfiguration->auxAnalogInputs[index] = (adc_channel_e) pin;
efiPrintf("FSIO analog input pin #%d [%s]", (index + 1), hwPortname(pin));
}

4
firmware/controllers/engine_controller.cpp
View File

@ -311,8 +311,8 @@ static void printAnalogInfo(void) {
printAnalogChannelInfo("AuxT2", engineConfiguration->auxTempSensor2.adcChannel);
printAnalogChannelInfo("MAF", engineConfiguration->mafAdcChannel);
for (int i = 0; i < AUX_ANALOG_INPUT_COUNT ; i++) {
adc_channel_e ch = engineConfiguration->fsioAdc[i];
printAnalogChannelInfo("FSIO analog", ch);
adc_channel_e ch = engineConfiguration->auxAnalogInputs[i];
printAnalogChannelInfo("Aux analog", ch);
}
printAnalogChannelInfo("AFR", engineConfiguration->afr.hwChannel);

4
firmware/init/sensor/init_aux.cpp
View File

@ -21,8 +21,8 @@ static FunctionalSensor auxSensors[] = {
static_assert(efi::size(auxSensors) == AUX_ANALOG_INPUT_COUNT);
void initAuxSensors(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
for (size_t i = 0; i < efi::size(CONFIG(fsioAdc)); i++) {
auto channel = CONFIG(fsioAdc)[i];
for (size_t i = 0; i < efi::size(CONFIG(auxAnalogInputs)); i++) {
auto channel = CONFIG(auxAnalogInputs)[i];
// Skip unconfigured channels
if (!isAdcChannelValid(channel)) {

2
firmware/integration/rusefi_config.txt
View File

@ -1410,7 +1410,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0, 300, 2
uint8_t[CAMS_PER_BANK_padding] vvtModePadding;;
uint8_t fan2ExtraIdle;+Additional idle % when fan #2 is active;"%", 1, 0, 0, 100, 0
uint8_t[1] unusedOldBiquad;;"units", 1, 0, -20, 100, 0
adc_channel_e[AUX_ANALOG_INPUT_COUNT iterate] auxAnalogInputs;todo: rename to fsioAnalogInputs
adc_channel_e[AUX_ANALOG_INPUT_COUNT iterate] auxAnalogInputs;
output_pin_e[MAX_CYLINDER_COUNT iterate] trailingCoilPins;
float[CLT_TIMING_CURVE_SIZE] cltTimingBins;CLT-based timing correction;"C", 1, 0, -100, 250, 1