From 93b8121dc071b61039aca969bd5d8b00f6229f36 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 4 Dec 2022 12:45:27 -0500 Subject: [PATCH] getDigital only works for 4 specific pins. Can it be made to work with generic digital pins? #4861 --- firmware/integration/rusefi_config.txt | 8 +++++--- firmware/tunerstudio/rusefi.input | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 8036e6bb50..3e5bb3ebd9 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -112,11 +112,11 @@ struct_no_prefix engine_configuration_s ! see 'blockingFactor' in rusefi.ini #define BLOCKING_FACTOR 750 -#define AUX_ANALOG_INPUT_COUNT 8 #define SENT_INPUT_COUNT 1 #define LUA_PWM_COUNT 8 #define LUA_ANALOG_INPUT_COUNT 8 +#define LUA_DIGITAL_INPUT_COUNT 8 #define LUA_GAUGE_COUNT 2 ! V engines or flat engines would have pairs of shafts with same trigger shape and target position @@ -1267,7 +1267,8 @@ custom pwm_freq_t 2 scalar, U16, @OFFSET@, "Hz", 1, 0, 0, 3000, 0 vvt_mode_e[CAMS_PER_BANK iterate] vvtMode;set vvt_mode X uint8_t fan2ExtraIdle;Additional idle % when fan #2 is active;"%", 1, 0, 0, 100, 0 uint8_t autoscale primingDelay;Delay to allow fuel pressure to build before firing the priming pulse.;"sec", 0.01, 0, 0, 1, 2 - adc_channel_e[AUX_ANALOG_INPUT_COUNT iterate] auxAnalogInputs; +; todo: rename to luaAnalogInputs + adc_channel_e[LUA_ANALOG_INPUT_COUNT iterate] auxAnalogInputs; output_pin_e[MAX_CYLINDER_COUNT iterate] trailingCoilPins; custom tle8888_mode_e 1 bits, U08, @OFFSET@, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1539,7 +1540,8 @@ uint16_t tuneHidingKey;;"", 1, 0, 0, 20000, 0 uint16_t[HIGH_SPEED_COUNT] highSpeedOffsets;;"", 1.0000, 0.00000,0.00,65535, 0, noMsqSave float etbDutyShutdownThreshold -uint8_t[156] mainUnusedEnd;;"units", 1, 0, 0, 1, 0 +Gpio[LUA_DIGITAL_INPUT_COUNT iterate] luaDigitalInputPins; +uint8_t[140] mainUnusedEnd;;"units", 1, 0, 0, 1, 0 ! end of engine_configuration_s end_struct diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 25176bfa05..3ad4c43811 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1713,6 +1713,7 @@ menuDialog = main subMenu = std_separator subMenu = auxInputsDialog, "Lua Analog Inputs" + subMenu = luaDigitalInputsDialog, "Lua Digital Inputs" subMenu = luaOutputs, "Lua Script PWM Outputs" groupMenu = "Lua Calibrations" @@ -3720,6 +3721,16 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ dialog = scriptSettingDialog, "Script Settings", border panel = scriptSetting, East + dialog = luaDigitalInputsDialog, "Lua Digital Inputs" + field = "Digital #1", luaDigitalInputPins1 + field = "Digital #2", luaDigitalInputPins2 + field = "Digital #3", luaDigitalInputPins3 + field = "Digital #4", luaDigitalInputPins4 + field = "Digital #5", luaDigitalInputPins5 + field = "Digital #6", luaDigitalInputPins6 + field = "Digital #7", luaDigitalInputPins7 + field = "Digital #8", luaDigitalInputPins8 + dialog = auxInputsDialog, "Lua Analog Inputs" field = "ADC #1", auxAnalogInputs1 field = "ADC #2", auxAnalogInputs2