From 800bbf38ad95a88609c5e668ab9c74f32dda9a57 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 14 Nov 2021 10:02:28 -0500 Subject: [PATCH] Lua progress --- firmware/config/engines/custom_engine.cpp | 2 +- firmware/tunerstudio/rusefi.input | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 71700113bd..c48b86eef2 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -799,7 +799,7 @@ void setHellenDefaultVrThresholds(DECLARE_CONFIG_PARAMETER_SIGNATURE) { } void proteusHarley(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - engineConfiguration->luaOutputPins[0] = PROTEUS_LS_16; + engineConfiguration->luaOutputPins[0] = PROTEUS_LS_12; #if HW_PROTEUS strncpy(config->luaScript, R"( startPwm(0, 100, 0) diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 75762f2e47..8122c681cb 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1595,23 +1595,21 @@ menuDialog = main subMenu = std_separator subMenu = auxInputsDialog, "Aux inputs" - subMenu = scriptSetting, "Script Settings" + subMenu = luaOutputs, "Lua Script PWM Outputs" + subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator subMenu = fsioTable1TblSettings, "Script Table #1" subMenu = fsioTable2TblSettings, "Script Table #2" subMenu = fsioTable3TblSettings, "Script Table #3" subMenu = fsioTable4TblSettings, "Script Table #4" - subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" subMenu = scriptCurve4Settings, "Script Curve #4" subMenu = scriptCurve5Settings, "Script Curve #5" subMenu = scriptCurve6Settings, "Script Curve #6" - subMenu = std_separator - subMenu = luaOutputs, "Lua PWM Outputs" - subMenu = std_separator subMenu = tcuControls, "Transmission Settings" subMenu = tcuSolenoidTableTbl, "TCU Solenoids" @@ -3423,6 +3421,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "" dialog = scriptSetting, "Setting" + field = "!Use rusEFI console for Lua script editing" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." field = "set #1", scriptSetting1 @@ -3435,7 +3434,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" dialog = scriptSettingDialog, "Script Settings", border panel = scriptSetting, East - dialog = auxInputsDialog, "Aux inputs" + dialog = auxInputsDialog, "Aux Analog Inputs" field = "ADC #1", auxAnalogInputs1 field = "ADC #2", auxAnalogInputs2 field = "ADC #3", auxAnalogInputs3 @@ -3446,6 +3445,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "ADC #8", auxAnalogInputs8 dialog = luaOutputs, "Lua Outputs" + field = "!Use rusEFI console for Lua script editing" field = "#Call startPwm to initialize, then call" field = "#setPwmDuty and setPwmFreq to vary duty/freq" field = "#See rusefi.com/s/lua for more info"