diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index c43f0f8a58..7bfdf8c07d 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -58,6 +58,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -403,7 +404,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index a391674d19..691c3f35a0 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -66,6 +66,7 @@ injectorLagMsGauge = injectorLagMs,"fuel: injector lag", "ms", 0.0,0.0, 0.0,0.0, iatCorrectionGauge = iatCorrection,"fuel: IAT correction", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 cltCorrectionGauge = cltCorrection,"fuel: CLT correction", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +currentEnginePhaseGauge = currentEnginePhase,"Engine Phase", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 wallFuelAmountGauge = wallFuelAmount,"fuel: wall amount", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 wallFuelCorrectionGauge = wallFuelCorrection,"fuel: wall correction", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 revolutionCounterSinceStartGauge = revolutionCounterSinceStart,"revolutionCounterSinceStart", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -84,7 +85,6 @@ totalFuelConsumptionGauge = totalFuelConsumption,"fuel: Total consumed", "grams" fuelFlowRateGauge = fuelFlowRate,"fuel: Flow rate", "gram/s", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 veTableYAxisGauge = veTableYAxis,"veTableYAxis", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 afrTableYAxisGauge = afrTableYAxis,"afrTableYAxis", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -alignmentFill_at_106Gauge = alignmentFill_at_106,"need 4 byte alignment", "units", -20.0,100.0, -20.0,100.0, -20.0,100.0, 0,0 knockLevelGauge = knockLevel,"knock: current level", "Volts", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 secondsGauge = seconds,"Uptime", "sec", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 engineModeGauge = engineMode,"Engine Mode", "em", 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 f6782e9382..c060753cf9 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -66,24 +66,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index e1f39afdac..c7794fb7d1 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -34,25 +34,25 @@ injectorLagMs("fuel: injector lag", SensorCategory.SENSOR_INPUTS, FieldType.INT1 iatCorrection("fuel: IAT correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 64, 0.01, 0.0, 0.0, "%"), cltCorrection("fuel: CLT correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 66, 0.01, 0.0, 0.0, "%"), baroCorrection("fuel: Barometric pressure correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 68, 0.01, 0.0, 0.0, "%"), -wallFuelAmount("fuel: wall amount", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 70, 0.01, 0.0, 0.0, "mg"), -wallFuelCorrection("fuel: wall correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 72, 0.01, 0.0, 0.0, "mg"), -revolutionCounterSinceStart("revolutionCounterSinceStart", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 74, 1.0, 0.0, 0.0, ""), -deltaTps("fuel: TPS change", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 76, 0.01, 0.0, 0.0, "ratio"), -canReadCounter("canReadCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 78, 1.0, 0.0, 0.0, ""), -tpsAccelFuel("fuel: TPS acceleration extra fuel ms", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 80, 0.0033333333333333335, 0.0, 0.0, "ms"), -ignitionAdvance("timing", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 82, 0.02, 0.0, 0.0, "deg"), -sparkDwellValue("dwell: coil charge time", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 84, 0.0033333333333333335, 0.0, 0.0, "ms"), -coilDutyCycle("dwell: coil duty cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 86, 0.01, 0.0, 0.0, "%"), -idleAirValvePosition("Idle Air Valve", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 88, 0.01, 0.0, 0.0, "%"), -etbTarget("ETB Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 90, 0.01, 0.0, 0.0, "%"), -etb1DutyCycle("ETB Duty", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 92, 0.01, 0.0, 0.0, "%"), -etb1Error("ETB Error", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 94, 0.01, 0.0, 0.0, "%"), -fuelTankLevel("Fuel level", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 96, 0.01, 0.0, 0.0, "%"), -totalFuelConsumption("fuel: Total consumed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 98, 1.0, 0.0, 0.0, "grams"), -fuelFlowRate("fuel: Flow rate", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 100, 0.005, 0.0, 0.0, "gram/s"), -veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 102, 0.01, 0.0, 0.0, "%"), -afrTableYAxis("afrTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 104, 0.01, 0.0, 0.0, "%"), -alignmentFill_at_106("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 106, 1.0, -20.0, 100.0, "units"), +currentEnginePhase("Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 70, 1.0, 0.0, 0.0, "deg"), +wallFuelAmount("fuel: wall amount", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 72, 0.01, 0.0, 0.0, "mg"), +wallFuelCorrection("fuel: wall correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 74, 0.01, 0.0, 0.0, "mg"), +revolutionCounterSinceStart("revolutionCounterSinceStart", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 76, 1.0, 0.0, 0.0, ""), +deltaTps("fuel: TPS change", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 78, 0.01, 0.0, 0.0, "ratio"), +canReadCounter("canReadCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 80, 1.0, 0.0, 0.0, ""), +tpsAccelFuel("fuel: TPS acceleration extra fuel ms", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 82, 0.0033333333333333335, 0.0, 0.0, "ms"), +ignitionAdvance("timing", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 84, 0.02, 0.0, 0.0, "deg"), +sparkDwellValue("dwell: coil charge time", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 86, 0.0033333333333333335, 0.0, 0.0, "ms"), +coilDutyCycle("dwell: coil duty cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 88, 0.01, 0.0, 0.0, "%"), +idleAirValvePosition("Idle Air Valve", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 90, 0.01, 0.0, 0.0, "%"), +etbTarget("ETB Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 92, 0.01, 0.0, 0.0, "%"), +etb1DutyCycle("ETB Duty", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 94, 0.01, 0.0, 0.0, "%"), +etb1Error("ETB Error", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 96, 0.01, 0.0, 0.0, "%"), +fuelTankLevel("Fuel level", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 98, 0.01, 0.0, 0.0, "%"), +totalFuelConsumption("fuel: Total consumed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 100, 1.0, 0.0, 0.0, "grams"), +fuelFlowRate("fuel: Flow rate", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 102, 0.005, 0.0, 0.0, "gram/s"), +veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 104, 0.01, 0.0, 0.0, "%"), +afrTableYAxis("afrTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 106, 0.01, 0.0, 0.0, "%"), knockLevel("knock: current level", SensorCategory.SENSOR_INPUTS, FieldType.INT, 108, 1.0, 0.0, 0.0, "Volts"), seconds("Uptime", SensorCategory.SENSOR_INPUTS, FieldType.INT, 112, 1.0, 0.0, 0.0, "sec"), engineMode("Engine Mode", SensorCategory.SENSOR_INPUTS, FieldType.INT, 116, 1.0, 0.0, 0.0, "em"), @@ -453,7 +453,7 @@ mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -10000.0, 10000.0, ""), mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1104, 1.0, -10000.0, 10000.0, ""), mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1105, 1.0, -10000.0, 10000.0, ""), -currentEngineDecodedPhase("Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1106, 1.0, 0.0, 0.0, "deg"), +currentEngineDecodedPhase("Engine Phase2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1106, 1.0, 0.0, 0.0, "deg"), totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -10000.0, 10000.0, ""), vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -10000.0, 10000.0, ""), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index a357cda7d8..01334f8835 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_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 Sep 01 04:17:54 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 01 04:52:03 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -342,114 +342,114 @@ struct output_channels_s { * offset 68 */ scaled_channel baroCorrection = (uint16_t)0; + /** + * Engine Phase + deg + * offset 70 + */ + scaled_channel currentEnginePhase = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_WALL_AMOUNT@@ mg - * offset 70 + * offset 72 */ scaled_channel wallFuelAmount = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_WALL_CORRECTION@@ mg - * offset 72 + * offset 74 */ scaled_channel wallFuelCorrection = (int16_t)0; /** - * offset 74 + * offset 76 */ uint16_t revolutionCounterSinceStart = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_TPS_ROC@@ ratio - * offset 76 + * offset 78 */ scaled_channel deltaTps = (int16_t)0; /** - * offset 78 + * offset 80 */ uint16_t canReadCounter = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_TPS_EXTRA@@ ms - * offset 80 + * offset 82 */ scaled_channel tpsAccelFuel = (int16_t)0; /** * @@GAUGE_NAME_TIMING_ADVANCE@@ deg - * offset 82 + * offset 84 */ scaled_channel ignitionAdvance = (int16_t)0; /** * @@GAUGE_COIL_DWELL_TIME@@ ms - * offset 84 + * offset 86 */ scaled_channel sparkDwellValue = (uint16_t)0; /** * @@GAUGE_NAME_DWELL_DUTY@@ % - * offset 86 + * offset 88 */ scaled_channel coilDutyCycle = (uint16_t)0; /** * @@GAUGE_NAME_IAC@@ % - * offset 88 + * offset 90 */ scaled_channel idleAirValvePosition = (uint16_t)0; /** * ETB Target % - * offset 90 + * offset 92 */ scaled_channel etbTarget = (int16_t)0; /** * @@GAUGE_NAME_ETB_DUTY@@ % - * offset 92 + * offset 94 */ scaled_channel etb1DutyCycle = (int16_t)0; /** * ETB Error % - * offset 94 + * offset 96 */ scaled_channel etb1Error = (int16_t)0; /** * Fuel level % - * offset 96 + * offset 98 */ scaled_channel fuelTankLevel = (int16_t)0; /** * @@GAUGE_NAME_FUEL_CONSUMPTION@@ grams - * offset 98 + * offset 100 */ scaled_channel totalFuelConsumption = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_FLOW@@ gram/s - * offset 100 + * offset 102 */ scaled_channel fuelFlowRate = (uint16_t)0; /** % - * offset 102 + * offset 104 */ scaled_channel veTableYAxis = (uint16_t)0; /** % - * offset 104 - */ - scaled_channel afrTableYAxis = (uint16_t)0; - /** - * need 4 byte alignment - units * offset 106 */ - uint8_t alignmentFill_at_106[2]; + scaled_channel afrTableYAxis = (uint16_t)0; /** * @@GAUGE_NAME_KNOCK_LEVEL@@ Volts @@ -1318,4 +1318,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 756); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 01 04:17:54 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 01 04:52:03 UTC 2022 diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index f750f730cd..29a8744fcc 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -121,6 +121,8 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.cltCorrection; if (strEqualCaseInsensitive(name, "baroCorrection")) return engine->outputChannels.baroCorrection; + if (strEqualCaseInsensitive(name, "currentEnginePhase")) + return engine->outputChannels.currentEnginePhase; if (strEqualCaseInsensitive(name, "wallFuelAmount")) return engine->outputChannels.wallFuelAmount; if (strEqualCaseInsensitive(name, "wallFuelCorrection")) diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index 8024637856..60f7901ba5 100644 --- a/firmware/controllers/trigger/trigger_central_generated.h +++ b/firmware/controllers/trigger/trigger_central_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 04:17:54 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 04:52:03 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -32,7 +32,7 @@ struct trigger_central_s { */ uint8_t mapVvt_map_peak = (uint8_t)0; /** - * Engine Phase + * Engine Phase2 deg * offset 38 */ @@ -41,4 +41,4 @@ struct trigger_central_s { static_assert(sizeof(trigger_central_s) == 40); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 04:17:54 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 04:52:03 UTC 2022 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 79dcadfef5..ad23518065 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -86,7 +86,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 Sep 01 04:18:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:53 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 0ebf0294f1..9b19b98a93 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -86,7 +86,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 Sep 01 04:18:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:36 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 9d03963d16..1e73531ca9 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -86,7 +86,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 Sep 01 04:18:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:09 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6805738afd..6ff22176f7 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -86,7 +86,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 Sep 01 04:18:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:10 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index aef88c2f4f..5acfe27dbd 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -86,7 +86,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 Sep 01 04:18:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:50 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index bae01bcc7a..7f3c37a818 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -86,7 +86,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 Sep 01 04:18:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:35 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 52a06eebc7..3bbb0ae944 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -86,7 +86,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 Sep 01 04:17:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 01 04:52:06 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 13bf7969f4..5267242ee4 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -86,7 +86,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 Sep 01 04:18:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:47 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 5665c98320..54394fab18 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -86,7 +86,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 Sep 01 04:18:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:49 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index da67b404b1..8fe1ae86e4 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -86,7 +86,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 Sep 01 04:18:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:38 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 488de6481d..2ab97163ff 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -86,7 +86,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 Sep 01 04:18:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:12 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index bfb5936ca4..1ab2d5f9d9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -86,7 +86,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 Sep 01 04:18:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:27 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 20544b7b55..735620fe6f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -86,7 +86,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 Sep 01 04:18:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:25 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 544c323793..fa891e270f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -86,7 +86,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 Sep 01 04:18:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:17 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index d949a29a40..ed25fcb07f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -86,7 +86,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 Sep 01 04:18:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:15 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 0bb9defe9f..af1f2f826b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -86,7 +86,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 Sep 01 04:18:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:14 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index bd9fc86e48..8e35a7ba97 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -86,7 +86,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 Sep 01 04:18:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:19 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 7571ac0304..bd15588e53 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -86,7 +86,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 Sep 01 04:18:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:22 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 484cc236aa..9f2195d9ab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -86,7 +86,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 Sep 01 04:18:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:23 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 1869bd3379..a1217c1308 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -86,7 +86,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 Sep 01 04:18:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:20 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index f1a50c1e82..15de725f09 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -86,7 +86,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 Sep 01 04:18:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:28 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index f8146d759c..2436e8dc06 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -86,7 +86,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 Sep 01 04:18:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:30 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index facb48f15c..4b235d477d 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -86,7 +86,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 Sep 01 04:17:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 01 04:52:04 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 11d5de99f1..f01ec8b0ce 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -86,7 +86,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 Sep 01 04:18:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:33 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 187d03cd45..e201074d01 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -86,7 +86,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 Sep 01 04:18:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:31 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 26b6a306aa..dcd40f8dc8 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -86,7 +86,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 Sep 01 04:18:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:41 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index c322304e73..f3b0a11488 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -86,7 +86,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 Sep 01 04:18:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:39 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index f1aa5b6421..51667ce7b5 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -86,7 +86,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 Sep 01 04:18:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:44 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 65747c07be..d8a8b4bd81 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -86,7 +86,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 Sep 01 04:18:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:42 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index a7c9009efd..2c4fb0747f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -86,7 +86,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 Sep 01 04:18:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:45 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 3055ed4b01..5528341022 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -86,7 +86,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_subaru_config.sh integration/rusefi_config.txt Thu Sep 01 04:17:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:07 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index c70edaadb4..601e37de23 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -86,7 +86,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 Sep 01 04:18:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:52 UTC 2022 pageSize = 21300 page = 1 @@ -2192,24 +2192,25 @@ injectorLagMs = scalar, U16, 62, "ms", 0.0033333333333333335, 0 iatCorrection = scalar, U16, 64, "%", 0.01, 0 cltCorrection = scalar, U16, 66, "%", 0.01, 0 baroCorrection = scalar, U16, 68, "%", 0.01, 0 -wallFuelAmount = scalar, U16, 70, "mg", 0.01, 0 -wallFuelCorrection = scalar, S16, 72, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 74, "", 1, 0 -deltaTps = scalar, S16, 76, "ratio", 0.01, 0 -canReadCounter = scalar, U16, 78, "", 1, 0 -tpsAccelFuel = scalar, S16, 80, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 82, "deg", 0.02, 0 -sparkDwellValue = scalar, U16, 84, "ms", 0.0033333333333333335, 0 -coilDutyCycle = scalar, U16, 86, "%", 0.01, 0 -idleAirValvePosition = scalar, U16, 88, "%", 0.01, 0 -etbTarget = scalar, S16, 90, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 92, "%", 0.01, 0 -etb1Error = scalar, S16, 94, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 96, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 98, "grams", 1, 0 -fuelFlowRate = scalar, U16, 100, "gram/s", 0.005, 0 -veTableYAxis = scalar, U16, 102, "%", 0.01, 0 -afrTableYAxis = scalar, U16, 104, "%", 0.01, 0 +currentEnginePhase = scalar, U16, 70, "deg", 1, 0 +wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 +wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 +deltaTps = scalar, S16, 78, "ratio", 0.01, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 +tpsAccelFuel = scalar, S16, 82, "ms", 0.0033333333333333335, 0 +ignitionAdvance = scalar, S16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, S16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 +etb1Error = scalar, S16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, S16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0 seconds = scalar, U32, 112, "sec", 1, 0 engineMode = scalar, U32, 116, "em", 1, 0 @@ -4500,6 +4501,7 @@ entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float, "%.3f" entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" +entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" entry = wallFuelCorrection, "fuel: wall correction", float, "%.3f" entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" @@ -4845,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 2bc431eb40..c09820d6d4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 01 04:17:54 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 01 04:52:03 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -455,25 +455,25 @@ public class TsOutputs { public static final Field IATCORRECTION = Field.create("IATCORRECTION", 64, FieldType.INT16).setScale(0.01); public static final Field CLTCORRECTION = Field.create("CLTCORRECTION", 66, FieldType.INT16).setScale(0.01); public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 68, FieldType.INT16).setScale(0.01); - public static final Field WALLFUELAMOUNT = Field.create("WALLFUELAMOUNT", 70, FieldType.INT16).setScale(0.01); - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 72, FieldType.INT16).setScale(0.01); - public static final Field REVOLUTIONCOUNTERSINCESTART = Field.create("REVOLUTIONCOUNTERSINCESTART", 74, FieldType.INT16).setScale(1.0); - public static final Field DELTATPS = Field.create("DELTATPS", 76, FieldType.INT16).setScale(0.01); - public static final Field CANREADCOUNTER = Field.create("CANREADCOUNTER", 78, FieldType.INT16).setScale(1.0); - public static final Field TPSACCELFUEL = Field.create("TPSACCELFUEL", 80, FieldType.INT16).setScale(0.0033333333333333335); - public static final Field IGNITIONADVANCE = Field.create("IGNITIONADVANCE", 82, FieldType.INT16).setScale(0.02); - public static final Field SPARKDWELLVALUE = Field.create("SPARKDWELLVALUE", 84, FieldType.INT16).setScale(0.0033333333333333335); - public static final Field COILDUTYCYCLE = Field.create("COILDUTYCYCLE", 86, FieldType.INT16).setScale(0.01); - public static final Field IDLEAIRVALVEPOSITION = Field.create("IDLEAIRVALVEPOSITION", 88, FieldType.INT16).setScale(0.01); - public static final Field ETBTARGET = Field.create("ETBTARGET", 90, FieldType.INT16).setScale(0.01); - public static final Field ETB1DUTYCYCLE = Field.create("ETB1DUTYCYCLE", 92, FieldType.INT16).setScale(0.01); - public static final Field ETB1ERROR = Field.create("ETB1ERROR", 94, FieldType.INT16).setScale(0.01); - public static final Field FUELTANKLEVEL = Field.create("FUELTANKLEVEL", 96, FieldType.INT16).setScale(0.01); - public static final Field TOTALFUELCONSUMPTION = Field.create("TOTALFUELCONSUMPTION", 98, FieldType.INT16).setScale(1.0); - public static final Field FUELFLOWRATE = Field.create("FUELFLOWRATE", 100, FieldType.INT16).setScale(0.005); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 102, FieldType.INT16).setScale(0.01); - public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 104, FieldType.INT16).setScale(0.01); - public static final Field ALIGNMENTFILL_AT_106 = Field.create("ALIGNMENTFILL_AT_106", 106, FieldType.INT8).setScale(1.0); + public static final Field CURRENTENGINEPHASE = Field.create("CURRENTENGINEPHASE", 70, FieldType.INT16).setScale(1.0); + public static final Field WALLFUELAMOUNT = Field.create("WALLFUELAMOUNT", 72, FieldType.INT16).setScale(0.01); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 74, FieldType.INT16).setScale(0.01); + public static final Field REVOLUTIONCOUNTERSINCESTART = Field.create("REVOLUTIONCOUNTERSINCESTART", 76, FieldType.INT16).setScale(1.0); + public static final Field DELTATPS = Field.create("DELTATPS", 78, FieldType.INT16).setScale(0.01); + public static final Field CANREADCOUNTER = Field.create("CANREADCOUNTER", 80, FieldType.INT16).setScale(1.0); + public static final Field TPSACCELFUEL = Field.create("TPSACCELFUEL", 82, FieldType.INT16).setScale(0.0033333333333333335); + public static final Field IGNITIONADVANCE = Field.create("IGNITIONADVANCE", 84, FieldType.INT16).setScale(0.02); + public static final Field SPARKDWELLVALUE = Field.create("SPARKDWELLVALUE", 86, FieldType.INT16).setScale(0.0033333333333333335); + public static final Field COILDUTYCYCLE = Field.create("COILDUTYCYCLE", 88, FieldType.INT16).setScale(0.01); + public static final Field IDLEAIRVALVEPOSITION = Field.create("IDLEAIRVALVEPOSITION", 90, FieldType.INT16).setScale(0.01); + public static final Field ETBTARGET = Field.create("ETBTARGET", 92, FieldType.INT16).setScale(0.01); + public static final Field ETB1DUTYCYCLE = Field.create("ETB1DUTYCYCLE", 94, FieldType.INT16).setScale(0.01); + public static final Field ETB1ERROR = Field.create("ETB1ERROR", 96, FieldType.INT16).setScale(0.01); + public static final Field FUELTANKLEVEL = Field.create("FUELTANKLEVEL", 98, FieldType.INT16).setScale(0.01); + public static final Field TOTALFUELCONSUMPTION = Field.create("TOTALFUELCONSUMPTION", 100, FieldType.INT16).setScale(1.0); + public static final Field FUELFLOWRATE = Field.create("FUELFLOWRATE", 102, FieldType.INT16).setScale(0.005); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 104, FieldType.INT16).setScale(0.01); + public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 106, FieldType.INT16).setScale(0.01); public static final Field KNOCKLEVEL = Field.create("KNOCKLEVEL", 108, FieldType.FLOAT); public static final Field SECONDS = Field.create("SECONDS", 112, FieldType.INT).setScale(1.0); public static final Field ENGINEMODE = Field.create("ENGINEMODE", 116, FieldType.INT).setScale(1.0); @@ -979,6 +979,7 @@ public class TsOutputs { IATCORRECTION, CLTCORRECTION, BAROCORRECTION, + CURRENTENGINEPHASE, WALLFUELAMOUNT, WALLFUELCORRECTION, REVOLUTIONCOUNTERSINCESTART, @@ -997,7 +998,6 @@ public class TsOutputs { FUELFLOWRATE, VETABLEYAXIS, AFRTABLEYAXIS, - ALIGNMENTFILL_AT_106, KNOCKLEVEL, SECONDS, ENGINEMODE,