diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index a57b15648b..e83ebf7492 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -184,7 +184,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 976afd0b03..f6a9ddf49e 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -364,12 +364,9 @@ unusedAtTheEnd177Gauge = unusedAtTheEnd177,"unusedAtTheEnd177", "", 0.0,0.0, 0.0 unusedAtTheEnd178Gauge = unusedAtTheEnd178,"unusedAtTheEnd178", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd179Gauge = unusedAtTheEnd179,"unusedAtTheEnd179", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd180Gauge = unusedAtTheEnd180,"unusedAtTheEnd180", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd181Gauge = unusedAtTheEnd181,"unusedAtTheEnd181", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd182Gauge = unusedAtTheEnd182,"unusedAtTheEnd182", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd183Gauge = unusedAtTheEnd183,"unusedAtTheEnd183", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd184Gauge = unusedAtTheEnd184,"unusedAtTheEnd184", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 fallbackMapGauge = fallbackMap,"fallbackMap", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -unused111Gauge = unused111,"unused111", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 unused112Gauge = unused112,"unused112", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 unused113Gauge = unused113,"unused113", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 timingCltCorrectionGauge = timingCltCorrection,"timingCltCorrection", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 6b58098b96..474fe69dab 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -364,12 +364,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 8cb8ab4c77..5b02d58935 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 Thu Dec 02 06:53:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Dec 02 22:39:40 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -824,7 +824,11 @@ struct ts_outputs_s { /** * offset 320 */ - uint8_t unusedAtTheEnd[184]; + uint8_t unusedAtTheEnd[180]; + /** + * offset 500 + */ + scaled_channel TEMPLOG_MAP_INSTANT_AVERAGE = (float)0; /** * offset 504 */ @@ -832,7 +836,7 @@ struct ts_outputs_s { /** * offset 505 */ - uint8_t unused111 = (uint8_t)0; + uint8_t TEMPLOG_map_peak = (uint8_t)0; /** * offset 506 */ @@ -966,4 +970,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 Thu Dec 02 06:53:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Dec 02 22:39:40 UTC 2021 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index dd463505fe..4e93141dd0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:32 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:32 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4546,4 +4546,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:32 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:32 UTC 2021 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index c4a3b74677..a85beb91e2 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:32 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 72ea10e95f..7c7ef58f54 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:29 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 3a2c5db134..55cf5f7ced 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:53:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:39:41 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 64396901e1..503a0aae9f 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:15 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index bace70c4f6..a98c56b628 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:03 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index b205471064..145b6ce190 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:53:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:39:49 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 862f11ba0e..c7d2149e9d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:53:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:39:47 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 945ad34800..3dfb92f998 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:53:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:39:44 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 3aed9eadb8..df5fdf8d8c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:53:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:39:52 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c17efce043..cd1638b1c7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:53:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:39:58 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 1caee358e7..eefc2659b8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:01 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 6a3767bb45..c50135a83a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:53:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:39:55 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index b61b1d6931..8b12c45557 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:06 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 0ac7117a2d..257c3a564f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Dec 02 06:54:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Dec 02 22:40:37 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index dadee3fb28..0c4ba3bb51 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Dec 02 06:54:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Dec 02 22:40:35 UTC 2021 pageSize = 19972 page = 1 @@ -2247,12 +2247,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3385,7 +3382,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 9c881b6c7e..90555baab9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:12 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 96029f521f..db7fb449dd 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:09 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 348e2b3743..b75cdb5b0f 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:21 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:21 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 25fe89637a..72417a6c99 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:18 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 3bc418c8f6..e3bfc966ac 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:26 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 294242d65f..0badcbcea4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:24 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:23 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 7ed8722ccc..418c930a92 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:39 UTC 2021 pageSize = 20000 page = 1 @@ -2281,12 +2281,9 @@ unusedAtTheEnd177 = scalar, U08, 496, "", 1, 0 unusedAtTheEnd178 = scalar, U08, 497, "", 1, 0 unusedAtTheEnd179 = scalar, U08, 498, "", 1, 0 unusedAtTheEnd180 = scalar, U08, 499, "", 1, 0 -unusedAtTheEnd181 = scalar, U08, 500, "", 1, 0 -unusedAtTheEnd182 = scalar, U08, 501, "", 1, 0 -unusedAtTheEnd183 = scalar, U08, 502, "", 1, 0 -unusedAtTheEnd184 = scalar, U08, 503, "", 1, 0 +TEMPLOG_MAP_INSTANT_AVERAGE = scalar, F32, 500, "", 1, 0 fallbackMap = scalar, U08, 504, "", 1, 0 -unused111 = scalar, U08, 505, "", 1, 0 +TEMPLOG_map_peak = scalar, U08, 505, "", 1, 0 unused112 = scalar, U08, 506, "", 1, 0 unused113 = scalar, U08, 507, "", 1, 0 timingCltCorrection = scalar, U16, 508, "%", 0.01, 0 @@ -3419,7 +3416,9 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_INSTANT_AVERAGE, "TEMPLOG_MAP_INSTANT_AVERAGE", float, "%.3f" entry = fallbackMap, "fallbackMap", int, "%d" +entry = TEMPLOG_map_peak, "TEMPLOG_map_peak", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 02685060a7..14d4ceea6a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 06:54:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 02 22:40:32 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*;