From 84b6a744b0a67b1201512c4e8b63968d6897b1e0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 7 Nov 2021 09:58:35 -0500 Subject: [PATCH] names for tables similar to curve names --- firmware/integration/rusefi_config.txt | 4 +++- firmware/tunerstudio/rusefi.input | 24 ++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 8bf5f91574..671c3988f4 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1340,6 +1340,7 @@ custom stepper_num_micro_steps_e 1 bits, U08, @OFFSET@, [0:3], @@stepper_num_mic uint8_t fan2OnTemperature;+Cooling fan turn-on temperature threshold, in Celsius;"deg C", 1, 0, 0, 150, 0 uint8_t fan2OffTemperature;+Cooling fan turn-off temperature threshold, in Celsius;"deg C", 1, 0, 0, 150, 0 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_TABLE_COUNT 4 float[FSIO_CURVE_16] scriptCurve1Bins;;"x", 1, 0, -999, 1000, 3 float[FSIO_CURVE_16] scriptCurve1;;"y", 1, 0, -999, 1000, 3 float[FSIO_CURVE_16] scriptCurve2Bins;;"x", 1, 0, -999, 1000, 3 @@ -1385,7 +1386,8 @@ gppwm_note_t[SCRIPT_CURVE_COUNT iterate] scriptCurveName; float[FSIO_CURVE_8] scriptCurve5;;"y", 1, 0, -999, 1000, 3 float[FSIO_CURVE_8] scriptCurve6Bins;;"x", 1, 0, -999, 1000, 3 float[FSIO_CURVE_8] scriptCurve6;;"y", 1, 0, -999, 1000, 3 -uint8_t[300] unused3328;;"units", 1, 0, -20, 100, 0 +gppwm_note_t[SCRIPT_TABLE_COUNT iterate] scriptTableName; +uint8_t[236] unused3328;;"units", 1, 0, -20, 100, 0 float tChargeAirCoefMin;;"Min tCharge Coeff.", 1, 0, 0, 1, 4 float tChargeAirCoefMax;;"Max tCharge Coeff.", 1, 0, 0, 1, 4 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 5a029b26a9..3ea45ead53 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1609,10 +1609,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + 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 = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -1905,6 +1905,22 @@ cmd_set_engine_type_8888_test = "@@TS_IO_TEST_COMMAND_char@@\x00\x30\x00\x3B" cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" [UserDefined] + dialog = fsioTable1TblSettings, "", yAxis + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1