diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 64729b87d7..dfb8da7935 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 Sun Nov 06 00:27:04 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 26 16:22:20 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -392,42 +392,42 @@ struct output_channels_s { * offset 86 */ scaled_channel etb1DutyCycle = (int16_t)0; - /** - * ETB Error - % - * offset 88 - */ - scaled_channel etb1Error = (int16_t)0; /** * Fuel level % - * offset 90 + * offset 88 */ scaled_channel fuelTankLevel = (int16_t)0; /** * @@GAUGE_NAME_FUEL_CONSUMPTION@@ grams - * offset 92 + * offset 90 */ uint16_t totalFuelConsumption = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_FLOW@@ gram/s - * offset 94 + * offset 92 */ scaled_channel fuelFlowRate = (uint16_t)0; /** * @@GAUGE_NAME_TPS2@@ % - * offset 96 + * offset 94 */ scaled_channel TPS2Value = (int16_t)0; /** * @@GAUGE_NAME_TUNE_CRC16@@ crc16 - * offset 98 + * offset 96 */ uint16_t tuneCrc16 = (uint16_t)0; + /** + * need 4 byte alignment + units + * offset 98 + */ + uint8_t alignmentFill_at_98[2]; /** * @@GAUGE_NAME_KNOCK_LEVEL@@ Volts @@ -1375,4 +1375,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 748); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 06 00:27:04 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 26 16:22:20 UTC 2022 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 1d0659020c..6172966252 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -45,7 +45,6 @@ static constexpr LogField fields[] = { {engine->outputChannels.idleAirValvePosition, "Idle Air Valve", "%", 1}, {engine->outputChannels.etbTarget, "ETB Target", "%", 2}, {engine->outputChannels.etb1DutyCycle, "ETB Duty", "%", 1}, - {engine->outputChannels.etb1Error, "ETB Error", "%", 3}, {engine->outputChannels.fuelTankLevel, "Fuel level", "%", 0}, {engine->outputChannels.totalFuelConsumption, "fuel: Total consumed", "grams", 1}, {engine->outputChannels.fuelFlowRate, "fuel: Flow rate", "gram/s", 3}, diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 36bc60537a..814c86e363 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -133,8 +133,6 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.etbTarget; if (strEqualCaseInsensitive(name, "etb1DutyCycle")) return engine->outputChannels.etb1DutyCycle; - if (strEqualCaseInsensitive(name, "etb1Error")) - return engine->outputChannels.etb1Error; if (strEqualCaseInsensitive(name, "fuelTankLevel")) return engine->outputChannels.fuelTankLevel; if (strEqualCaseInsensitive(name, "totalFuelConsumption")) 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 7380c2404a..ca86070df4 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 Sat Nov 26 05:37:37 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 26 16:22:20 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -461,12 +461,12 @@ public class TsOutputs { public static final Field IDLEAIRVALVEPOSITION = Field.create("IDLEAIRVALVEPOSITION", 82, FieldType.INT16).setScale(0.01).setBaseOffset(0); public static final Field ETBTARGET = Field.create("ETBTARGET", 84, FieldType.INT16).setScale(0.01).setBaseOffset(0); public static final Field ETB1DUTYCYCLE = Field.create("ETB1DUTYCYCLE", 86, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field ETB1ERROR = Field.create("ETB1ERROR", 88, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field FUELTANKLEVEL = Field.create("FUELTANKLEVEL", 90, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field TOTALFUELCONSUMPTION = Field.create("TOTALFUELCONSUMPTION", 92, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field FUELFLOWRATE = Field.create("FUELFLOWRATE", 94, FieldType.INT16).setScale(0.005).setBaseOffset(0); - public static final Field TPS2VALUE = Field.create("TPS2VALUE", 96, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field TUNECRC16 = Field.create("TUNECRC16", 98, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field FUELTANKLEVEL = Field.create("FUELTANKLEVEL", 88, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field TOTALFUELCONSUMPTION = Field.create("TOTALFUELCONSUMPTION", 90, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field FUELFLOWRATE = Field.create("FUELFLOWRATE", 92, FieldType.INT16).setScale(0.005).setBaseOffset(0); + public static final Field TPS2VALUE = Field.create("TPS2VALUE", 94, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field TUNECRC16 = Field.create("TUNECRC16", 96, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_98 = Field.create("ALIGNMENTFILL_AT_98", 98, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field KNOCKLEVEL = Field.create("KNOCKLEVEL", 100, FieldType.FLOAT).setBaseOffset(0); public static final Field SECONDS = Field.create("SECONDS", 104, FieldType.INT).setScale(1.0).setBaseOffset(0); public static final Field ENGINEMODE = Field.create("ENGINEMODE", 108, FieldType.INT).setScale(1.0).setBaseOffset(0); @@ -923,12 +923,12 @@ public class TsOutputs { IDLEAIRVALVEPOSITION, ETBTARGET, ETB1DUTYCYCLE, - ETB1ERROR, FUELTANKLEVEL, TOTALFUELCONSUMPTION, FUELFLOWRATE, TPS2VALUE, TUNECRC16, + ALIGNMENTFILL_AT_98, KNOCKLEVEL, SECONDS, ENGINEMODE,