From 4d78fd93b56d5d139201808435dbae7bda353bad Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 26 Nov 2021 18:16:06 -0500 Subject: [PATCH] automation around outputs section #197 --- firmware/console/binary/output_channels.txt | 13 ++++++ .../console/binary/ts_outputs_generated.h | 46 +++++++++++++++++-- firmware/console/binary/tunerstudio_outputs.h | 13 ------ 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index b21d349d96..b73d3863ed 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -67,5 +67,18 @@ uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0 uint16_t autoscale oilPressure;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 uint16_t autoscale vvtPositionB1I;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + uint16_t autoscale chargeAirMass;;"",{1/1000}, 0, 0, 0, 0 + uint16_t autoscale crankingFuelMass;airmass in mg, 0-65 grams;"",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 + + uint16_t autoscale currentTargetAfr;;"",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0 + uint16_t autoscale fuelBase;This is the raw value we take from the fuel map or base fuel algorithm, before the corrections;"",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 + + uint16_t autoscale fuelRunning;Total fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle;"",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 + uint16_t autoscale actualLastInjection;Actual last injection time - including all compensation and injection mode;"",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 + + + uint8_t autoscale injectorDutyCycle;;"",{1/2}, 0, 0, 0, 0 + uint8_t autoscale veValue;;"",{1/2}, 0, 0, 0, 0 + uint16_t autoscale injectionOffset;;"",{1/@@PACK_MULT_ANGLE@@}, 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 c142f43985..270310ed86 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 15:52:23 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 18:15:48 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -189,8 +189,48 @@ struct ts_outputs_s { * offset 42 */ scaled_channel vvtPositionB1I = (uint16_t)0; - /** total size 44*/ + /** + * offset 44 + */ + scaled_channel chargeAirMass = (uint16_t)0; + /** + * airmass in mg, 0-65 grams + * offset 46 + */ + scaled_channel crankingFuelMass = (uint16_t)0; + /** + * offset 48 + */ + scaled_channel currentTargetAfr = (uint16_t)0; + /** + * This is the raw value we take from the fuel map or base fuel algorithm, before the corrections + * offset 50 + */ + scaled_channel fuelBase = (uint16_t)0; + /** + * Total fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle + * offset 52 + */ + scaled_channel fuelRunning = (uint16_t)0; + /** + * Actual last injection time - including all compensation and injection mode + * offset 54 + */ + scaled_channel actualLastInjection = (uint16_t)0; + /** + * offset 56 + */ + scaled_channel injectorDutyCycle = (uint8_t)0; + /** + * offset 57 + */ + scaled_channel veValue = (uint8_t)0; + /** + * offset 58 + */ + scaled_channel injectionOffset = (uint16_t)0; + /** total size 60*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 15:52:23 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 18:15:48 EST 2021 diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index 5995dd37f0..18fce13d92 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -44,19 +44,6 @@ enum class TsCalMode : uint8_t { struct TunerStudioOutputChannels : ts_outputs_s { /* see also [OutputChannels] in rusefi.input */ - // Fuel math - scaled_channel chargeAirMass; // 44 cylinder airmass in mg, 0-65 grams - scaled_fuel_mass_mg crankingFuelMass; // 46 - scaled_afr currentTargetAfr; // 48 - // This is the raw value we take from the fuel map or base fuel algorithm, before the corrections - scaled_fuel_mass_mg fuelBase; // 50 - // Total fuel with CLT, IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle - scaled_fuel_mass_mg fuelRunning; // 52 - // Actual last injection time - including all compensation and injection mode - scaled_ms actualLastInjection; // 54 - scaled_channel injectorDutyCycle; // 56 - scaled_channel veValue; // 57 - scaled_angle injectionOffset; // 58 scaled_temperature tCharge; // 60 // Corrections