From 280b1630b6ebae5a62ab95329ba08e857d09f8a3 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 27 Nov 2021 19:23:35 -0500 Subject: [PATCH] automation around outputs section #197 --- firmware/console/binary/output_channels.txt | 2 +- .../console/binary/ts_outputs_generated.h | 12 ++---- firmware/tunerstudio/rusefi.input | 40 ++++++++++++++----- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 0762f636bd..a89f030282 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -237,6 +237,6 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint16_t turboSpeed;;"hz",1, 0, 0, 0, 0 ! we have some unused bytes to allow compatible TS changes - uint8_t[18] unusedAtTheEnd;;"",1, 0, 0, 0, 0 + uint8_t[20 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0 end_struct diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 0ec4fc10c1..113d32cb41 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 18:34:07 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 19:22:57 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -718,15 +718,9 @@ struct ts_outputs_s { /** * offset 320 */ - uint8_t unusedAtTheEnd[18]; - /** - * need 4 byte alignment - units - * offset 338 - */ - uint8_t alignmentFill_at_338[2]; + uint8_t unusedAtTheEnd[20]; /** total size 340*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 18:34:07 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 19:22:57 EST 2021 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index e5145f96d9..6695888b05 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -370,8 +370,26 @@ vvtTargets2 = scalar, U08, 315, "deg", 1, 0 vvtTargets3 = scalar, U08, 316, "deg", 1, 0 vvtTargets4 = scalar, U08, 317, "deg", 1, 0 turboSpeed = scalar, U16, 318, "hz", 1, 0 -unusedAtTheEnd = array, U08, 320, [18], "", 1, 0 -alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +unusedAtTheEnd1 = scalar, U08, 320, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 321, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 322, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 323, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 324, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 325, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 326, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 327, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 328, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 329, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 330, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 331, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 332, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 333, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 334, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 335, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 336, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 337, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 338, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 339, "", 1, 0 ; ; see TunerStudioOutputChannels struct @@ -999,14 +1017,14 @@ gaugeCategory = ECU Status warningCounterGauge = warningCounter, @@GAUGE_NAME_WARNING_COUNT@@, "", 0, 100, 0, 0, 100, 100, 0, 0 lastErrorCodeGauge = lastErrorCode, @@GAUGE_NAME_LAST_ERROR@@, "", 0, 18000, 0, 0, 18000, 18000, 0, 0 triggerErrorsCounterGauge = totalTriggerErrorCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 - recentErrorCode0Gauge = recentErrorCode0, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 - recentErrorCode1Gauge = recentErrorCode1, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 - recentErrorCode2Gauge = recentErrorCode2, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 - recentErrorCode3Gauge = recentErrorCode3, "Error#4", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 - recentErrorCode4Gauge = recentErrorCode4, "Error#5", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 - recentErrorCode5Gauge = recentErrorCode5, "Error#6", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 - recentErrorCode6Gauge = recentErrorCode6, "Error#7", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 - recentErrorCode7Gauge = recentErrorCode7, "Error#8", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode1Gauge = recentErrorCode1, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode2Gauge = recentErrorCode2, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode3Gauge = recentErrorCode3, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode4Gauge = recentErrorCode4, "Error#4", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode5Gauge = recentErrorCode5, "Error#5", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode6Gauge = recentErrorCode6, "Error#6", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode7Gauge = recentErrorCode7, "Error#7", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + recentErrorCode8Gauge = recentErrorCode8, "Error#8", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 firmwareVersionGauge = firmwareVersion , @@GAUGE_NAME_FW_VERSION@@, "%", 0, 100, 0, 0, 100, 100, 0, 0 timeSecondsGauge = seconds, @@GAUGE_NAME_UPTIME@@, "sec", 0, 100, 0, 0, 100, 100, 0, 0 tuneCrc16Gauge = tuneCrc16, @@GAUGE_NAME_TUNE_CRC16@@, "", 0, 64000, 0, 0, 64000, 64000, 0, 0 @@ -1363,7 +1381,6 @@ gaugeCategory = DynoView entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, @@GAUGE_NAME_WARNING_COUNTER@@,int,"%d" entry = lastErrorCode, @@GAUGE_NAME_WARNING_LAST@@,int,"%d" - entry = recentErrorCode0, "error 0",int,"%d", { !enableLogErrorList } entry = recentErrorCode1, "error 1",int,"%d", { !enableLogErrorList } entry = recentErrorCode2, "error 2",int,"%d", { !enableLogErrorList } entry = recentErrorCode3, "error 3",int,"%d", { !enableLogErrorList } @@ -1371,6 +1388,7 @@ gaugeCategory = DynoView entry = recentErrorCode5, "error 5",int,"%d", { !enableLogErrorList } entry = recentErrorCode6, "error 6",int,"%d", { !enableLogErrorList } entry = recentErrorCode7, "error 7",int,"%d", { !enableLogErrorList } + entry = recentErrorCode8, "error 8",int,"%d", { !enableLogErrorList } entry = internalMcuTemperature, @@GAUGE_NAME_CPU_TEMP@@,float,"%.2f" entry = tCharge, "tCharge",float,"%.3f"