diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 5b51dc929c..ebae805716 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -93,10 +93,10 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint16_t autoscale wallFuelAmount;;"",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 uint16_t autoscale wallFuelCorrection;;"",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 - uint16_t autoscale unused76;;"",{1/1}, 0, 0, 0, 0 + uint16_t unused76;;"",1, 0, 0, 0, 0 uint16_t autoscale deltaTps;TPS acceleration enrichment;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 - uint16_t autoscale unused80;;"",{1/1}, 0, 0, 0, 0 + uint16_t unused80;;"",1, 0, 0, 0, 0 uint16_t autoscale tpsAccelFuel;;"",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 ! Ignition uint16_t autoscale ignitionAdvance;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 @@ -111,7 +111,7 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 ! Fuel system uint16_t autoscale fuelTankLevel;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 - uint16_t autoscale totalFuelConsumption;;"",{1/1}, 0, 0, 0, 0 + uint16_t autoscale totalFuelConsumption;;"",1, 0, 0, 0, 0 uint16_t autoscale fuelFlowRate;;"",{1/@@PACK_MULT_FUEL_FLOW@@}, 0, 0, 0, 0 ! Y axis values for selectable tables @@ -149,13 +149,13 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint16_t autoscale ignitionLoad;;"",{1/100}, 0, 0, 0, 0 ! we want a hash of engineMake+engineCode+vehicleName in the log file in order to match TS logs to rusEFI Online tune - uint16_t autoscale engineMakeCodeNameCrc16;;"",{1/1}, 0, 0, 0, 0 + uint16_t autoscale engineMakeCodeNameCrc16;;"",1, 0, 0, 0, 0 ! Errors - uint32_t autoscale totalTriggerErrorCounter;;"",{1/1}, 0, 0, 0, 0 - uint32_t autoscale orderingErrorCounter;;"",{1/1}, 0, 0, 0, 0 + uint32_t autoscale totalTriggerErrorCounter;;"",1, 0, 0, 0, 0 + uint32_t orderingErrorCounter;;"",1, 0, 0, 0, 0 - uint16_t autoscale warningCounter;;"",{1/1}, 0, 0, 0, 0 - uint16_t autoscale lastErrorCode;;"",{1/1}, 0, 0, 0, 0 + uint16_t autoscale warningCounter;;"",1, 0, 0, 0, 0 + uint16_t autoscale lastErrorCode;;"",1, 0, 0, 0, 0 uint16_t[8] recentErrorCodes;;"", 1, 0, 0, 0, 0 @@ -194,7 +194,7 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint8_t[12] autoscale knockLevels;;"",1, 0, 0, 0, 0 - uint8_t autoscale tcuDesiredGear;;"",{1/1}, 0, 0, 0, 0 + uint8_t autoscale tcuDesiredGear;;"",1, 0, 0, 0, 0 uint8_t autoscale flexPercent;;"",{1/2}, 0, 0, 0, 0 uint16_t autoscale rawIdlePositionSensor;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 @@ -226,16 +226,16 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint16_t autoscale rawTps2Primary;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 uint16_t autoscale rawTps2Secondary;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 - uint16_t autoscale knockCount;;"",{1/1}, 0, 0, 0, 0 + uint16_t knockCount;;"",1, 0, 0, 0, 0 uint16_t autoscale accelerationZ;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t autoscale accelerationRoll;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t autoscale accelerationYaw;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint8_t[4] autoscale vvtTargets;;"",1, 0, 0, 0, 0 - uint16_t autoscale turboSpeed;;"",1, 0, 0, 0, 0 + uint16_t turboSpeed;;"",1, 0, 0, 0, 0 ! we have some unused bytes to allow compatible TS changes - uint8_t[18] autoscale unusedAtTheEnd;;"",1, 0, 0, 0, 0 + uint8_t[18] unusedAtTheEnd;;"",1, 0, 0, 0, 0 end_struct diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 5479aaf47c..016b036be7 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 Fri Nov 26 21:43:13 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 05:37:21 PST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -147,30 +147,37 @@ struct ts_outputs_s { */ scaled_channel auxTemp2 = (uint16_t)0; /** + % * offset 20 */ scaled_channel TPSValue = (uint16_t)0; /** + % * offset 22 */ scaled_channel throttlePedalPosition = (uint16_t)0; /** + ADC * offset 24 */ uint16_t tpsADC = (uint16_t)0; /** + V * offset 26 */ scaled_channel MAFValue = (uint16_t)0; /** + Kg/h * offset 28 */ scaled_channel massAirFlowValue = (uint16_t)0; /** + kPa * offset 30 */ scaled_channel MAPValue = (uint16_t)0; /** + kPa * offset 32 */ scaled_channel baroPressure = (uint16_t)0; @@ -195,6 +202,7 @@ struct ts_outputs_s { */ scaled_channel oilPressure = (uint16_t)0; /** + deg * offset 42 */ scaled_channel vvtPositionB1I = (uint16_t)0; @@ -273,7 +281,7 @@ struct ts_outputs_s { /** * offset 76 */ - scaled_channel unused76 = (uint16_t)0; + uint16_t unused76 = (uint16_t)0; /** * TPS acceleration enrichment * offset 78 @@ -282,7 +290,7 @@ struct ts_outputs_s { /** * offset 80 */ - scaled_channel unused80 = (uint16_t)0; + uint16_t unused80 = (uint16_t)0; /** * offset 82 */ @@ -386,7 +394,7 @@ struct ts_outputs_s { /** * offset 144 */ - scaled_channel orderingErrorCounter = (uint32_t)0; + uint32_t orderingErrorCounter = (uint32_t)0; /** * offset 148 */ @@ -564,14 +572,17 @@ struct ts_outputs_s { */ scaled_channel airFuelRatio2 = (uint16_t)0; /** + deg * offset 290 */ scaled_channel vvtPositionB1E = (uint16_t)0; /** + deg * offset 292 */ scaled_channel vvtPositionB2I = (uint16_t)0; /** + deg * offset 294 */ scaled_channel vvtPositionB2E = (uint16_t)0; @@ -594,7 +605,7 @@ struct ts_outputs_s { /** * offset 306 */ - scaled_channel knockCount = (uint16_t)0; + uint16_t knockCount = (uint16_t)0; /** * offset 308 */ @@ -614,11 +625,11 @@ struct ts_outputs_s { /** * offset 318 */ - scaled_channel turboSpeed = (uint16_t)0; + uint16_t turboSpeed = (uint16_t)0; /** * offset 320 */ - scaled_channel unusedAtTheEnd[18]; + uint8_t unusedAtTheEnd[18]; /** * need 4 byte alignment units @@ -629,4 +640,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 Fri Nov 26 21:43:13 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 05:37:21 PST 2021 diff --git a/firmware/gen_output_channels.sh b/firmware/gen_output_channels.sh old mode 100644 new mode 100755