From df7ea3486424fbc771bcbbae6f0dce3ca5fa9ba5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 20 Nov 2021 14:38:50 -0500 Subject: [PATCH] automation around outputs section #197 --- .../console/binary/ts_outputs_generated.h | 30 +++++++++++++++++-- firmware/console/binary/tunerstudio_outputs.h | 10 ------- firmware/integration/output_channels.txt | 9 ++++++ 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 73a4364175..5d780c1c5d 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) integration/output_channels.txt Sat Nov 20 14:26:35 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sat Nov 20 14:37:54 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -129,8 +129,32 @@ struct ts_outputs_s { * offset 14 */ scaled_channel intakeAirTemperature = (uint16_t)0; - /** total size 16*/ + /** + * offset 16 + */ + scaled_channel auxTemp1 = (uint16_t)0; + /** + * offset 18 + */ + scaled_channel auxTemp2 = (uint16_t)0; + /** + * offset 20 + */ + scaled_channel throttlePosition = (uint16_t)0; + /** + * offset 22 + */ + scaled_channel pedalPosition = (uint16_t)0; + /** + * offset 24 + */ + uint16_t tpsADC = (uint16_t)0; + /** + * offset 26 + */ + scaled_channel massAirFlowVoltage = (uint16_t)0; + /** total size 28*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sat Nov 20 14:26:35 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sat Nov 20 14:37:54 EST 2021 diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index d3bbd8e601..bd982e3e57 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -44,16 +44,6 @@ enum class TsCalMode : uint8_t { struct TunerStudioOutputChannels : ts_outputs_s { /* see also [OutputChannels] in rusefi.input */ - scaled_temperature auxTemp1; // offset 16 - scaled_temperature auxTemp2; // offset 18 - - // throttle, pedal - scaled_percent throttlePosition; // 20 - scaled_percent pedalPosition; // 22 - uint16_t tpsADC; // 24 - - // air flow/mass measurment - scaled_voltage massAirFlowVoltage; // 26 scaled_channel massAirFlow; // 28 scaled_pressure manifoldAirPressure; // 30 scaled_pressure baroPressure; // 32 diff --git a/firmware/integration/output_channels.txt b/firmware/integration/output_channels.txt index 49dce9d977..93d8da9516 100644 --- a/firmware/integration/output_channels.txt +++ b/firmware/integration/output_channels.txt @@ -45,4 +45,13 @@ uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0 uint16_t autoscale coolantTemperature;;"",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 uint16_t autoscale intakeAirTemperature;;"",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 + uint16_t autoscale auxTemp1;;"",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 + uint16_t autoscale auxTemp2;;"",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 + + uint16_t autoscale throttlePosition;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + uint16_t autoscale pedalPosition;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + + uint16_t tpsADC;;"", 1, 0, 0, 0, 0 + uint16_t autoscale massAirFlowVoltage;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 + end_struct