From 45eab7f8a092029a1fdac2a3cda1d8c464738f6b Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 21 Dec 2021 23:15:00 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/ts_outputs_generated.h | 180 ++++++++++-------- .../lua/generated/output_lookup_generated.cpp | 8 + 2 files changed, 113 insertions(+), 75 deletions(-) diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index c170e0432c..61f87f3451 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Dec 16 21:05:57 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Dec 21 23:12:40 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -160,41 +160,41 @@ struct ts_outputs_s { deg C * offset 11 */ - scaled_channel internalMcuTemperature = (uint8_t)0; + scaled_channel internalMcuTemperature = (int8_t)0; /** * @@GAUGE_NAME_CLT@@ deg C * offset 12 */ - scaled_channel coolant = (uint16_t)0; + scaled_channel coolant = (int16_t)0; /** * @@GAUGE_NAME_IAT@@ deg C * offset 14 */ - scaled_channel intake = (uint16_t)0; + scaled_channel intake = (int16_t)0; /** deg C * offset 16 */ - scaled_channel auxTemp1 = (uint16_t)0; + scaled_channel auxTemp1 = (int16_t)0; /** deg C * offset 18 */ - scaled_channel auxTemp2 = (uint16_t)0; + scaled_channel auxTemp2 = (int16_t)0; /** * @@GAUGE_NAME_TPS@@ % * offset 20 */ - scaled_channel TPSValue = (uint16_t)0; + scaled_channel TPSValue = (int16_t)0; /** * @@GAUGE_NAME_THROTTLE_PEDAL@@ % * offset 22 */ - scaled_channel throttlePedalPosition = (uint16_t)0; + scaled_channel throttlePedalPosition = (int16_t)0; /** ADC * offset 24 @@ -254,7 +254,7 @@ struct ts_outputs_s { deg * offset 42 */ - scaled_channel vvtPositionB1I = (uint16_t)0; + scaled_channel vvtPositionB1I = (int16_t)0; /** * @@GAUGE_NAME_AIR_MASS@@ g @@ -311,12 +311,12 @@ struct ts_outputs_s { deg * offset 58 */ - scaled_channel injectionOffset = (uint16_t)0; + scaled_channel injectionOffset = (int16_t)0; /** deg C * offset 60 */ - scaled_channel tCharge = (uint16_t)0; + scaled_channel tCharge = (int16_t)0; /** * @@GAUGE_NAME_INJECTOR_LAG@@ ms @@ -368,7 +368,7 @@ struct ts_outputs_s { ratio * offset 78 */ - scaled_channel deltaTps = (uint16_t)0; + scaled_channel deltaTps = (int16_t)0; /** * offset 80 */ @@ -378,13 +378,13 @@ struct ts_outputs_s { ms * offset 82 */ - scaled_channel tpsAccelFuel = (uint16_t)0; + scaled_channel tpsAccelFuel = (int16_t)0; /** * @@GAUGE_NAME_TIMING_ADVANCE@@ deg * offset 84 */ - scaled_channel ignitionAdvance = (uint16_t)0; + scaled_channel ignitionAdvance = (int16_t)0; /** * @@GAUGE_COIL_DWELL_TIME@@ ms @@ -408,25 +408,25 @@ struct ts_outputs_s { % * offset 92 */ - scaled_channel etbTarget = (uint16_t)0; + scaled_channel etbTarget = (int16_t)0; /** * @@GAUGE_NAME_ETB_DUTY@@ % * offset 94 */ - scaled_channel etb1DutyCycle = (uint16_t)0; + scaled_channel etb1DutyCycle = (int16_t)0; /** * "ETB Error" % * offset 96 */ - scaled_channel etb1Error = (uint16_t)0; + scaled_channel etb1Error = (int16_t)0; /** * "Fuel level" % * offset 98 */ - scaled_channel fuelTankLevel = (uint16_t)0; + scaled_channel fuelTankLevel = (int16_t)0; /** * @@GAUGE_NAME_FUEL_CONSUMPTION@@ grams @@ -588,24 +588,24 @@ struct ts_outputs_s { val * offset 208 */ - scaled_channel debugIntField4 = (uint16_t)0; + scaled_channel debugIntField4 = (int16_t)0; /** val * offset 210 */ - scaled_channel debugIntField5 = (uint16_t)0; + scaled_channel debugIntField5 = (int16_t)0; /** * @@GAUGE_NAME_ACCEL_X@@ G * offset 212 */ - scaled_channel accelerationX = (uint16_t)0; + scaled_channel accelerationX = (int16_t)0; /** * @@GAUGE_NAME_ACCEL_Y@@ G * offset 214 */ - scaled_channel accelerationY = (uint16_t)0; + scaled_channel accelerationY = (int16_t)0; /** deg C * offset 216 @@ -616,32 +616,32 @@ struct ts_outputs_s { % * offset 232 */ - scaled_channel TPS2Value = (uint16_t)0; + scaled_channel TPS2Value = (int16_t)0; /** V * offset 234 */ - scaled_channel rawTps1Primary = (uint16_t)0; + scaled_channel rawTps1Primary = (int16_t)0; /** V * offset 236 */ - scaled_channel rawPpsPrimary = (uint16_t)0; + scaled_channel rawPpsPrimary = (int16_t)0; /** V * offset 238 */ - scaled_channel rawClt = (uint16_t)0; + scaled_channel rawClt = (int16_t)0; /** V * offset 240 */ - scaled_channel rawIat = (uint16_t)0; + scaled_channel rawIat = (int16_t)0; /** V * offset 242 */ - scaled_channel rawOilPressure = (uint16_t)0; + scaled_channel rawOilPressure = (int16_t)0; /** * @@GAUGE_NAME_TUNE_CRC16@@ crc16 @@ -662,7 +662,7 @@ struct ts_outputs_s { V * offset 248 */ - scaled_channel rawPpsSecondary = (uint16_t)0; + scaled_channel rawPpsSecondary = (int16_t)0; /** * offset 250 */ @@ -683,46 +683,46 @@ struct ts_outputs_s { V * offset 264 */ - scaled_channel rawIdlePositionSensor = (uint16_t)0; + scaled_channel rawIdlePositionSensor = (int16_t)0; /** V * offset 266 */ - scaled_channel rawWastegatePosition = (uint16_t)0; + scaled_channel rawWastegatePosition = (int16_t)0; /** * @@GAUGE_NAME_WG_POSITION@@ % * offset 268 */ - scaled_channel wastegatePositionSensor = (uint16_t)0; + scaled_channel wastegatePositionSensor = (int16_t)0; /** * @@GAUGE_NAME_IDLE_POSITION@@ % * offset 270 */ - scaled_channel idlePositionSensor = (uint16_t)0; + scaled_channel idlePositionSensor = (int16_t)0; /** V * offset 272 */ - scaled_channel rawLowFuelPressure = (uint16_t)0; + scaled_channel rawLowFuelPressure = (int16_t)0; /** V * offset 274 */ - scaled_channel rawHighFuelPressure = (uint16_t)0; + scaled_channel rawHighFuelPressure = (int16_t)0; /** * @@GAUGE_NAME_FUEL_PRESSURE_LOW@@ kpa * offset 276 */ - scaled_channel lowFuelPressure = (uint16_t)0; + scaled_channel lowFuelPressure = (int16_t)0; /** * @@GAUGE_NAME_FUEL_PRESSURE_HIGH@@ bar * offset 278 */ - scaled_channel highFuelPressure = (uint16_t)0; + scaled_channel highFuelPressure = (int16_t)0; /** * @@GAUGE_NAME_TARGET_LAMBDA@@ * offset 280 @@ -756,39 +756,39 @@ struct ts_outputs_s { deg * offset 290 */ - scaled_channel vvtPositionB1E = (uint16_t)0; + scaled_channel vvtPositionB1E = (int16_t)0; /** * @@GAUGE_NAME_VVT_B2I@@ deg * offset 292 */ - scaled_channel vvtPositionB2I = (uint16_t)0; + scaled_channel vvtPositionB2I = (int16_t)0; /** * @@GAUGE_NAME_VVT_B2E@@ deg * offset 294 */ - scaled_channel vvtPositionB2E = (uint16_t)0; + scaled_channel vvtPositionB2E = (int16_t)0; /** % * offset 296 */ - scaled_channel fuelPidCorrection[2]; + scaled_channel fuelPidCorrection[2]; /** V * offset 300 */ - scaled_channel rawTps1Secondary = (uint16_t)0; + scaled_channel rawTps1Secondary = (int16_t)0; /** V * offset 302 */ - scaled_channel rawTps2Primary = (uint16_t)0; + scaled_channel rawTps2Primary = (int16_t)0; /** V * offset 304 */ - scaled_channel rawTps2Secondary = (uint16_t)0; + scaled_channel rawTps2Secondary = (int16_t)0; /** * "knock: count" * offset 306 @@ -799,22 +799,22 @@ struct ts_outputs_s { G * offset 308 */ - scaled_channel accelerationZ = (uint16_t)0; + scaled_channel accelerationZ = (int16_t)0; /** * @@GAUGE_NAME_ACCEL_ROLL@@ * offset 310 */ - scaled_channel accelerationRoll = (uint16_t)0; + scaled_channel accelerationRoll = (int16_t)0; /** * @@GAUGE_NAME_ACCEL_YAW@@ * offset 312 */ - scaled_channel accelerationYaw = (uint16_t)0; + scaled_channel accelerationYaw = (int16_t)0; /** deg * offset 314 */ - scaled_channel vvtTargets[4]; + scaled_channel vvtTargets[4]; /** * @@GAUGE_NAME_TURBO_SPEED@@ hz @@ -822,9 +822,39 @@ struct ts_outputs_s { */ uint16_t turboSpeed = (uint16_t)0; /** + deg C * offset 320 */ - uint8_t unusedAtTheEnd[150]; + uint16_t wbTemperature[2]; + /** + % + * offset 324 + */ + uint8_t wbHeaterDuty[2]; + /** + % + * offset 326 + */ + scaled_channel tps1Split = (int16_t)0; + /** + % + * offset 328 + */ + scaled_channel tps2Split = (int16_t)0; + /** + % + * offset 330 + */ + scaled_channel tps12Split = (int16_t)0; + /** + % + * offset 332 + */ + scaled_channel accPedalSplit = (int16_t)0; + /** + * offset 334 + */ + uint8_t unusedAtTheEnd[136]; /** offset 470 bit 0 */ bool launchSpeedCondition : 1 {}; @@ -848,79 +878,79 @@ struct ts_outputs_s { bool launchActivatePinState : 1 {}; /** offset 470 bit 7 */ - bool unusedBit_165_7 : 1 {}; + bool unusedBit_171_7 : 1 {}; /** offset 470 bit 8 */ - bool unusedBit_165_8 : 1 {}; + bool unusedBit_171_8 : 1 {}; /** offset 470 bit 9 */ - bool unusedBit_165_9 : 1 {}; + bool unusedBit_171_9 : 1 {}; /** offset 470 bit 10 */ - bool unusedBit_165_10 : 1 {}; + bool unusedBit_171_10 : 1 {}; /** offset 470 bit 11 */ - bool unusedBit_165_11 : 1 {}; + bool unusedBit_171_11 : 1 {}; /** offset 470 bit 12 */ - bool unusedBit_165_12 : 1 {}; + bool unusedBit_171_12 : 1 {}; /** offset 470 bit 13 */ - bool unusedBit_165_13 : 1 {}; + bool unusedBit_171_13 : 1 {}; /** offset 470 bit 14 */ - bool unusedBit_165_14 : 1 {}; + bool unusedBit_171_14 : 1 {}; /** offset 470 bit 15 */ - bool unusedBit_165_15 : 1 {}; + bool unusedBit_171_15 : 1 {}; /** offset 470 bit 16 */ - bool unusedBit_165_16 : 1 {}; + bool unusedBit_171_16 : 1 {}; /** offset 470 bit 17 */ - bool unusedBit_165_17 : 1 {}; + bool unusedBit_171_17 : 1 {}; /** offset 470 bit 18 */ - bool unusedBit_165_18 : 1 {}; + bool unusedBit_171_18 : 1 {}; /** offset 470 bit 19 */ - bool unusedBit_165_19 : 1 {}; + bool unusedBit_171_19 : 1 {}; /** offset 470 bit 20 */ - bool unusedBit_165_20 : 1 {}; + bool unusedBit_171_20 : 1 {}; /** offset 470 bit 21 */ - bool unusedBit_165_21 : 1 {}; + bool unusedBit_171_21 : 1 {}; /** offset 470 bit 22 */ - bool unusedBit_165_22 : 1 {}; + bool unusedBit_171_22 : 1 {}; /** offset 470 bit 23 */ - bool unusedBit_165_23 : 1 {}; + bool unusedBit_171_23 : 1 {}; /** offset 470 bit 24 */ - bool unusedBit_165_24 : 1 {}; + bool unusedBit_171_24 : 1 {}; /** offset 470 bit 25 */ - bool unusedBit_165_25 : 1 {}; + bool unusedBit_171_25 : 1 {}; /** offset 470 bit 26 */ - bool unusedBit_165_26 : 1 {}; + bool unusedBit_171_26 : 1 {}; /** offset 470 bit 27 */ - bool unusedBit_165_27 : 1 {}; + bool unusedBit_171_27 : 1 {}; /** offset 470 bit 28 */ - bool unusedBit_165_28 : 1 {}; + bool unusedBit_171_28 : 1 {}; /** offset 470 bit 29 */ - bool unusedBit_165_29 : 1 {}; + bool unusedBit_171_29 : 1 {}; /** offset 470 bit 30 */ - bool unusedBit_165_30 : 1 {}; + bool unusedBit_171_30 : 1 {}; /** offset 470 bit 31 */ - bool unusedBit_165_31 : 1 {}; + bool unusedBit_171_31 : 1 {}; /** * offset 474 */ @@ -1110,4 +1140,4 @@ struct ts_outputs_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Dec 16 21:05:57 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Dec 21 23:12:40 UTC 2021 diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 050724ed83..02f44524f8 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -304,6 +304,14 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.accelerationYaw; if (strEqualCaseInsensitive(name, "turboSpeed")) return engine->outputChannels.turboSpeed; + if (strEqualCaseInsensitive(name, "tps1Split")) + return engine->outputChannels.tps1Split; + if (strEqualCaseInsensitive(name, "tps2Split")) + return engine->outputChannels.tps2Split; + if (strEqualCaseInsensitive(name, "tps12Split")) + return engine->outputChannels.tps12Split; + if (strEqualCaseInsensitive(name, "accPedalSplit")) + return engine->outputChannels.accPedalSplit; if (strEqualCaseInsensitive(name, "launchSpeedCondition")) return engine->outputChannels.launchSpeedCondition; if (strEqualCaseInsensitive(name, "launchRpmCondition"))