From 0d5e605f75b5aa64dee595d1ea8b63248d98847a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 19 Oct 2021 20:04:03 -0400 Subject: [PATCH] Aux analog inputs via CAN #3378 --- firmware/controllers/core/fsio_impl.cpp | 2 +- firmware/controllers/engine_controller.cpp | 4 ++-- firmware/init/sensor/init_aux.cpp | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index fab71dede6..70cec1d56e 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -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)); } diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 58dd819e81..6e4bf02fff 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -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); diff --git a/firmware/init/sensor/init_aux.cpp b/firmware/init/sensor/init_aux.cpp index 8e82e8dcf4..231b433151 100644 --- a/firmware/init/sensor/init_aux.cpp +++ b/firmware/init/sensor/init_aux.cpp @@ -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)) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 35c60cb900..34808c29f8 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -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