From 32f43736fa67770d787965db47f7df922fa358db Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Fri, 26 Nov 2021 18:30:59 -0500
Subject: [PATCH] automation around outputs section #197

---
 firmware/console/binary/output_channels.txt   | 16 +++++++
 .../console/binary/ts_outputs_generated.h     | 47 +++++++++++++++++--
 firmware/console/binary/tunerstudio_outputs.h | 16 -------
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt
index b73d3863ed..498c28d332 100644
--- a/firmware/console/binary/output_channels.txt
+++ b/firmware/console/binary/output_channels.txt
@@ -81,4 +81,20 @@ uint16_t rpmAcceleration;;"",1, 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
 
+	uint16_t autoscale tCharge;;"",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0
+
+!  Corrections
+	uint16_t autoscale injectorLagMs;;"",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
+	uint16_t autoscale iatCorrection;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+	uint16_t autoscale cltCorrection;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+	uint16_t autoscale baroCorrection;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+	uint16_t autoscale currentEnginePhase;;"",1, 0, 0, 0, 0
+! Wall model AE
+	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 autoscale deltaTps;TPS acceleration enrichment;"",{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 270310ed86..1da72038b3 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 18:15:48 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:25:20 EST 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -229,8 +229,49 @@ struct ts_outputs_s {
 	 * offset 58
 	 */
 	scaled_channel<uint16_t, 50, 1> injectionOffset = (uint16_t)0;
-	/** total size 60*/
+	/**
+	 * offset 60
+	 */
+	scaled_channel<uint16_t, 100, 1> tCharge = (uint16_t)0;
+	/**
+	 * offset 62
+	 */
+	scaled_channel<uint16_t, 300, 1> injectorLagMs = (uint16_t)0;
+	/**
+	 * offset 64
+	 */
+	scaled_channel<uint16_t, 100, 1> iatCorrection = (uint16_t)0;
+	/**
+	 * offset 66
+	 */
+	scaled_channel<uint16_t, 100, 1> cltCorrection = (uint16_t)0;
+	/**
+	 * offset 68
+	 */
+	scaled_channel<uint16_t, 100, 1> baroCorrection = (uint16_t)0;
+	/**
+	 * offset 70
+	 */
+	scaled_channel<uint16_t, 1, 1> currentEnginePhase = (uint16_t)0;
+	/**
+	 * offset 72
+	 */
+	scaled_channel<uint16_t, 100, 1> wallFuelAmount = (uint16_t)0;
+	/**
+	 * offset 74
+	 */
+	scaled_channel<uint16_t, 100, 1> wallFuelCorrection = (uint16_t)0;
+	/**
+	 * offset 76
+	 */
+	scaled_channel<uint16_t, 1, 1> unused76 = (uint16_t)0;
+	/**
+	 * TPS acceleration enrichment
+	 * offset 78
+	 */
+	scaled_channel<uint16_t, 100, 1> deltaTps = (uint16_t)0;
+	/** total size 80*/
 };
 
 // end
-// 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
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 18:25:20 EST 2021
diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h
index 18fce13d92..fc30cd528d 100644
--- a/firmware/console/binary/tunerstudio_outputs.h
+++ b/firmware/console/binary/tunerstudio_outputs.h
@@ -44,22 +44,6 @@ enum class TsCalMode : uint8_t {
 struct TunerStudioOutputChannels : ts_outputs_s {
 	/* see also [OutputChannels] in rusefi.input */
 
-	scaled_temperature tCharge; // 60
-
-	// Corrections
-	scaled_ms injectorLagMs; // 62
-	scaled_percent iatCorrection; // 64
-	scaled_percent cltCorrection; // 66
-	scaled_percent baroCorrection; // 68
-	uint16_t currentEnginePhase; // 70
-
-	// Wall model AE
-	scaled_fuel_mass_mg wallFuelAmount; // 72
-	scaled_fuel_mass_mg wallFuelCorrection; // 74
-	
-	// TPS/load AE
-	scaled_percent unused76; // 76
-	scaled_percent deltaTps; // 78
 	scaled_percent unused80; // 80
 	scaled_ms tpsAccelFuel; // 82