From 40ff37d9b7db391a20a117e050595267561d4020 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 26 Sep 2021 23:19:31 -0400 Subject: [PATCH] GPPWM usability: no one remembers which one does what fix #3270 --- firmware/CHANGELOG.md | 1 + firmware/integration/rusefi_config.txt | 5 ++++- firmware/tunerstudio/rusefi.input | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md index d99dbb60b4..a22d748cb7 100644 --- a/firmware/CHANGELOG.md +++ b/firmware/CHANGELOG.md @@ -35,6 +35,7 @@ All notable user-facing or behavior-altering changes will be documented in this - Fix of 36/2/2/2 attributes to help rotary #3242 - SD card doesn't work on H7 - rusEFI console to validate current bundle against bundle already in ECU #3266 + - GPPWM usability: notes field #3270 ## September 2021 Release - "Iguana Awareness Day" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index dc6d4369a9..ed6eab0cba 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -253,6 +253,7 @@ custom boost_target_table_t @@BOOST_RPM_COUNT@@x@@BOOST_LOAD_COUNT@@ array, U08, #define GPPWM_LOAD_COUNT 8 #define GPPWM_RPM_COUNT 8 #define GPPWM_CHANNELS 4 +#define GPPWM_NOTE_SIZE 16 custom gppwm_table_t @@GPPWM_RPM_COUNT@@x@@GPPWM_LOAD_COUNT@@ array, U08, @OFFSET@, [@@GPPWM_RPM_COUNT@@x@@GPPWM_LOAD_COUNT@@], "duty", 1, 0, 0, 100, 0 @@ -1000,6 +1001,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@ #define ERROR_BUFFER_SIZE 120 custom vehicle_info_t @@VEHICLE_INFO_SIZE@@ string, ASCII, @OFFSET@, @@VEHICLE_INFO_SIZE@@ + custom gppwm_note_t @@GPPWM_NOTE_SIZE@@ string, ASCII, @OFFSET@, @@GPPWM_NOTE_SIZE@@ custom error_message_t @@ERROR_BUFFER_SIZE@@ string, ASCII, @OFFSET@, @@ERROR_BUFFER_SIZE@@ custom le_formula_t @@LE_COMMAND_LENGTH@@ string, ASCII, @OFFSET@, @@LE_COMMAND_LENGTH@@ @@ -1111,7 +1113,8 @@ end_struct #define VR_THRESHOLD_COUNT 2 vr_threshold_s[VR_THRESHOLD_COUNT iterate] vrThreshold; - int[45] unusedAtOldBoardConfigurationEnd;;"units", 1, 0, -20, 100, 0 + gppwm_note_t[GPPWM_CHANNELS iterate] gpPwmNote; + int[29] unusedAtOldBoardConfigurationEnd;;"units", 1, 0, -20, 100, 0 uint16_t vehicleWeight;;"kg", 1, 0, 0, 10000, 0 brain_pin_e lps25BaroSensorScl brain_pin_e lps25BaroSensorSda diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 3fc658ec88..65c2dd1c4c 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3634,6 +3634,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Duty if error", gppwm1_dutyIfError, {gppwm1_pin != 0} field = "" field = "Load Axis", gppwm1_loadAxis, {gppwm1_pin != 0} + field = "Note", gpPwmNote1 field = "" field = "" field = "" @@ -3655,6 +3656,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Duty if error", gppwm2_dutyIfError, {gppwm2_pin != 0} field = "" field = "Load Axis", gppwm2_loadAxis, {gppwm2_pin != 0} + field = "Note", gpPwmNote2 field = "" field = "" field = "" @@ -3676,6 +3678,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Duty if error", gppwm3_dutyIfError, {gppwm3_pin != 0} field = "" field = "Load Axis", gppwm3_loadAxis, {gppwm3_pin != 0} + field = "Note", gpPwmNote3 field = "" field = "" field = "" @@ -3697,6 +3700,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Duty if error", gppwm4_dutyIfError, {gppwm4_pin != 0} field = "" field = "Load Axis", gppwm4_loadAxis, {gppwm4_pin != 0} + field = "Note", gpPwmNote4 field = "" field = "" field = ""