From b917394354ec33b03503cde89c9848aa5f4ada88 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 1 Sep 2021 02:37:19 -0400 Subject: [PATCH] my first Lua --- firmware/hw_layer/adc/adc_inputs.cpp | 4 ---- firmware/integration/rusefi_config.txt | 5 +++-- firmware/tunerstudio/rusefi.input | 11 ----------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index a78207136d..5d4cfdc0e6 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -449,10 +449,6 @@ static void configureInputs(void) { addChannel("AUXF#1", engineConfiguration->auxFastSensor1_adcChannel, ADC_FAST); - for (int i = 0;i < LUA_ANALOG_INPUT_COUNT;i++) { - addChannel("LUA", engineConfiguration->luaAnalogInputs[i], ADC_FAST); - } - setAdcChannelOverrides(); } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 0a972518a1..8ee8600ff7 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -75,6 +75,7 @@ struct_no_prefix engine_configuration_s ! see 'blockingFactor' in rusefi.ini #define BLOCKING_FACTOR 256 +#define AUX_ANALOG_INPUT_COUNT 4 #define FSIO_ANALOG_INPUT_COUNT 4 #define LUA_PWM_COUNT 8 @@ -910,8 +911,8 @@ output_pin_e acFanPin;+Optional Radiator Fan used with A/C pin_output_mode_e[FSIO_COMMAND_COUNT iterate] gpioPinModes; - uint8_t[2] unusedpinModesWhereHere;;"", 1, 0, 0, 255, 0 - adc_channel_e[LUA_ANALOG_INPUT_COUNT iterate] luaAnalogInputs; + uint8_t[10] unusedpinModesWhereHere;;"", 1, 0, 0, 255, 0 + uint8_t[8] luaAnalogInputs; output_pin_e[FSIO_COMMAND_COUNT iterate] fsioOutputPins;todo: more comments uint8_t[10] unusedOutputWhereHere;;"", 1, 0, 0, 255, 0 brain_pin_e[EGT_CHANNEL_COUNT iterate] max31855_cs; diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 894437c943..f687afa020 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1542,7 +1542,6 @@ menuDialog = main subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" - subMenu = luaAnalogInputs, "Lua Analog Inputs" subMenu = std_separator subMenu = tcuControls, "Transmission Settings" @@ -3326,16 +3325,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "output #6", luaOutputPins7 field = "output #7", luaOutputPins8 - dialog = luaAnalogInputs, "Lua Analog Inputs" - field = "Input #0", luaAnalogInputs1 - field = "Input #1", luaAnalogInputs2 - field = "Input #2", luaAnalogInputs3 - field = "Input #3", luaAnalogInputs4 - field = "Input #4", luaAnalogInputs5 - field = "Input #5", luaAnalogInputs6 - field = "Input #6", luaAnalogInputs7 - field = "Input #7", luaAnalogInputs8 - dialog = transmissionPanel field = "TCU Enabled" tcuEnabled