From e90d6b9ce7ad79c7ce43fd89fcb79413473582a5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 26 Nov 2021 21:10:09 -0500 Subject: [PATCH] automation around outputs section #197 --- firmware/console/binary/output_channels.txt | 33 +++++++ .../console/binary/ts_outputs_generated.h | 98 ++++++++++++++++++- firmware/console/binary/tunerstudio_outputs.h | 34 ------- 3 files changed, 128 insertions(+), 37 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 071dfcc19a..378757f2f1 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -197,4 +197,37 @@ uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0 uint8_t autoscale tcuDesiredGear;;"",{1/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 + uint16_t autoscale rawWastegatePositionSensor;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 + + uint16_t autoscale wastegatePosition;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + uint16_t autoscale idlePositionSensor;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + + uint16_t autoscale rawLowFuelPressure;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 + uint16_t autoscale rawHighFuelPressure;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 + + uint16_t autoscale lowFuelPressure;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 + uint16_t autoscale highFuelPressure;;"",{1/@@PACK_MULT_HIGH_PRESSURE@@}, 0, 0, 0, 0 + + uint16_t autoscale targetLambda;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0 + uint16_t autoscale airFuelRatio;;"",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0 + + uint16_t autoscale VssAcceleration;;"",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 + uint16_t autoscale lambda2;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0 + + uint16_t autoscale airFuelRatio2;;"",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0 + uint16_t autoscale vvtPositionB1E;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + uint16_t autoscale vvtPositionB2I;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + uint16_t autoscale vvtPositionB2E;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + + uint16_t[2] autoscale fuelTrim;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + + uint16_t autoscale rawTps1Secondary;;"",{1/@@PACK_MULT_VOLTAGE@@}, 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 autoscale accelerationZ;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + uint16_t autoscale accelerationRoll;;"",{1/@@PACK_MULT_PERCENT@@}, 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 3004f767d3..680a02c37c 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:02:55 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 21:09:57 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -502,8 +502,100 @@ struct ts_outputs_s { * offset 263 */ scaled_channel flexPercent = (uint8_t)0; - /** total size 264*/ + /** + * offset 264 + */ + scaled_channel rawIdlePositionSensor = (uint16_t)0; + /** + * offset 266 + */ + scaled_channel rawWastegatePositionSensor = (uint16_t)0; + /** + * offset 268 + */ + scaled_channel wastegatePosition = (uint16_t)0; + /** + * offset 270 + */ + scaled_channel idlePositionSensor = (uint16_t)0; + /** + * offset 272 + */ + scaled_channel rawLowFuelPressure = (uint16_t)0; + /** + * offset 274 + */ + scaled_channel rawHighFuelPressure = (uint16_t)0; + /** + * offset 276 + */ + scaled_channel lowFuelPressure = (uint16_t)0; + /** + * offset 278 + */ + scaled_channel highFuelPressure = (uint16_t)0; + /** + * offset 280 + */ + scaled_channel targetLambda = (uint16_t)0; + /** + * offset 282 + */ + scaled_channel airFuelRatio = (uint16_t)0; + /** + * offset 284 + */ + scaled_channel VssAcceleration = (uint16_t)0; + /** + * offset 286 + */ + scaled_channel lambda2 = (uint16_t)0; + /** + * offset 288 + */ + scaled_channel airFuelRatio2 = (uint16_t)0; + /** + * offset 290 + */ + scaled_channel vvtPositionB1E = (uint16_t)0; + /** + * offset 292 + */ + scaled_channel vvtPositionB2I = (uint16_t)0; + /** + * offset 294 + */ + scaled_channel vvtPositionB2E = (uint16_t)0; + /** + * offset 296 + */ + scaled_channel fuelTrim[2]; + /** + * offset 300 + */ + scaled_channel rawTps1Secondary = (uint16_t)0; + /** + * offset 302 + */ + scaled_channel rawTps2Primary = (uint16_t)0; + /** + * offset 304 + */ + scaled_channel rawTps2Secondary = (uint16_t)0; + /** + * offset 306 + */ + scaled_channel knockCount = (uint16_t)0; + /** + * offset 308 + */ + scaled_channel accelerationZ = (uint16_t)0; + /** + * offset 310 + */ + scaled_channel accelerationRoll = (uint16_t)0; + /** total size 312*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 21:02:55 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 21:09:57 EST 2021 diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index f20a851515..14ca9e2267 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -44,40 +44,6 @@ enum class TsCalMode : uint8_t { struct TunerStudioOutputChannels : ts_outputs_s { /* see also [OutputChannels] in rusefi.input */ - scaled_voltage rawIdlePositionSensor; // 264 - scaled_voltage rawWastegatePositionSensor; // 266 - - scaled_percent wastegatePosition; // 268 - scaled_percent idlePositionSensor; // 270 - - scaled_voltage rawLowFuelPressure; // 272 - scaled_voltage rawHighFuelPressure; // 274 - - scaled_pressure lowFuelPressure; // 276 - scaled_high_pressure highFuelPressure; // 278 - - scaled_lambda targetLambda; // 280 - scaled_afr airFuelRatio; // 282 - - scaled_ms VssAcceleration; //284 - - scaled_lambda lambda2; // 286 - scaled_afr airFuelRatio2; // 288 - - scaled_angle vvtPositionB1E; // 290 - scaled_angle vvtPositionB2I; // 292 - scaled_angle vvtPositionB2E; // 294 - - scaled_percent fuelTrim[2]; // 296 & 298 - - scaled_voltage rawTps1Secondary; // 300 - scaled_voltage rawTps2Primary; // 302 - scaled_voltage rawTps2Secondary; // 304 - - scaled_channel knockCount;// 306 - - scaled_percent accelerationZ; // 308 - scaled_percent accelerationRoll; // 310 scaled_percent accelerationYaw; // 312 scaled_channel vvtTargets[4]; // 314