diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 5d780c1c5d..42c8a9e230 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:37:54 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sun Nov 21 09:35:08 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -153,8 +153,36 @@ struct ts_outputs_s { * offset 26 */ scaled_channel massAirFlowVoltage = (uint16_t)0; - /** total size 28*/ + /** + * offset 28 + */ + scaled_channel massAirFlow = (uint16_t)0; + /** + * offset 30 + */ + scaled_channel manifoldAirPressure = (uint16_t)0; + /** + * offset 32 + */ + scaled_channel baroPressure = (uint16_t)0; + /** + * offset 34 + */ + scaled_channel lambda = (uint16_t)0; + /** + * offset 36 + */ + scaled_channel knockRetard = (uint8_t)0; + /** + * offset 37 + */ + uint8_t unused37 = (uint8_t)0; + /** + * offset 38 + */ + scaled_channel vBatt = (uint16_t)0; + /** total size 40*/ }; // end -// 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 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sun Nov 21 09:35:08 EST 2021 diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index bd982e3e57..b6a4bf7ba1 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_channel massAirFlow; // 28 - scaled_pressure manifoldAirPressure; // 30 - scaled_pressure baroPressure; // 32 - - scaled_lambda lambda; // 34 - scaled_channel knockRetard; // 36 - uint8_t unused37; - - // misc sensors - scaled_voltage vBatt; // 38 scaled_pressure oilPressure; // 40 scaled_angle vvtPositionB1I; // 42 diff --git a/firmware/integration/output_channels.txt b/firmware/integration/output_channels.txt index 93d8da9516..5a7da8e1df 100644 --- a/firmware/integration/output_channels.txt +++ b/firmware/integration/output_channels.txt @@ -54,4 +54,15 @@ uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0 uint16_t tpsADC;;"", 1, 0, 0, 0, 0 uint16_t autoscale massAirFlowVoltage;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 + uint16_t autoscale massAirFlow;;"",{1/@@PACK_MULT_MASS_FLOW@@}, 0, 0, 0, 0 + uint16_t autoscale manifoldAirPressure;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 + uint16_t autoscale baroPressure;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 + + uint16_t autoscale lambda;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0 + uint8_t autoscale knockRetard;;"",{1/10}, 0, 0, 0, 0 + uint8_t unused37;;"",1, 0, 0, 0, 0 + + uint16_t autoscale vBatt;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 + + end_struct