diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 7be3619ea4..6199799100 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -178,6 +178,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 6612c7f3f3..cc4c1e9126 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -436,14 +436,8 @@ unusedAtTheEnd249Gauge = unusedAtTheEnd249,"unusedAtTheEnd249", "", 0.0,0.0, 0.0 unusedAtTheEnd250Gauge = unusedAtTheEnd250,"unusedAtTheEnd250", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd251Gauge = unusedAtTheEnd251,"unusedAtTheEnd251", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd252Gauge = unusedAtTheEnd252,"unusedAtTheEnd252", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd253Gauge = unusedAtTheEnd253,"unusedAtTheEnd253", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd254Gauge = unusedAtTheEnd254,"unusedAtTheEnd254", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd255Gauge = unusedAtTheEnd255,"unusedAtTheEnd255", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd256Gauge = unusedAtTheEnd256,"unusedAtTheEnd256", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd257Gauge = unusedAtTheEnd257,"unusedAtTheEnd257", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd258Gauge = unusedAtTheEnd258,"unusedAtTheEnd258", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd259Gauge = unusedAtTheEnd259,"unusedAtTheEnd259", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd260Gauge = unusedAtTheEnd260,"unusedAtTheEnd260", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +etbIntegralErrorGauge = etbIntegralError,"etbIntegralError", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +etbCurrentTargetGauge = etbCurrentTarget,"etbCurrentTarget", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 alternatorStatus_iTermGauge = alternatorStatus_iTerm,"alternatorStatus_ iTerm", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 alternatorStatus_dTermGauge = alternatorStatus_dTerm,"alternatorStatus_ dTerm", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 alternatorStatus_outputGauge = alternatorStatus_output,"alternatorStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index d2b377d056..73f70342dc 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -436,14 +436,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index c210eb2e6e..77e31668bb 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 Mon Nov 29 04:25:02 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 05:25:21 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -824,7 +824,15 @@ struct ts_outputs_s { /** * offset 320 */ - uint8_t unusedAtTheEnd[260]; + uint8_t unusedAtTheEnd[252]; + /** + * offset 572 + */ + float etbIntegralError = (float)0; + /** + * offset 576 + */ + float etbCurrentTarget = (float)0; /** * offset 580 */ @@ -841,4 +849,4 @@ struct ts_outputs_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 04:25:02 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 05:25:21 UTC 2021 diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index b562b9161e..ab72bb9379 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ