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

---
 firmware/console/binary/output_channels.txt   | 17 ++++++
 .../console/binary/ts_outputs_generated.h     | 54 +++++++++++++++++--
 firmware/console/binary/tunerstudio_outputs.h | 19 -------
 3 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt
index 498c28d332..ce4fb04775 100644
--- a/firmware/console/binary/output_channels.txt
+++ b/firmware/console/binary/output_channels.txt
@@ -96,5 +96,22 @@ uint16_t rpmAcceleration;;"",1, 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
 
+	uint16_t autoscale unused80;;"",{1/1}, 0, 0, 0, 0
+	uint16_t autoscale tpsAccelFuel;;"",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
+! Ignition
+	uint16_t autoscale ignitionAdvance;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
+	uint16_t autoscale sparkDwell;;"",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
+
+	uint16_t autoscale coilDutyCycle;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+! Idle & ETB
+	uint16_t autoscale idlePosition;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+	uint16_t autoscale etbTarget;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+	uint16_t autoscale etb1DutyCycle;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+	uint16_t autoscale etb1Error;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+! Fuel system
+	uint16_t autoscale fuelTankLevel;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+
+	uint16_t autoscale totalFuelConsumption;;"",{1/1}, 0, 0, 0, 0
+	uint16_t autoscale fuelFlowRate;;"",{1/@@PACK_MULT_FUEL_FLOW@@}, 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 1da72038b3..4a3e11ec88 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:25:20 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:48:47 EST 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -270,8 +270,56 @@ struct ts_outputs_s {
 	 * offset 78
 	 */
 	scaled_channel<uint16_t, 100, 1> deltaTps = (uint16_t)0;
-	/** total size 80*/
+	/**
+	 * offset 80
+	 */
+	scaled_channel<uint16_t, 1, 1> unused80 = (uint16_t)0;
+	/**
+	 * offset 82
+	 */
+	scaled_channel<uint16_t, 300, 1> tpsAccelFuel = (uint16_t)0;
+	/**
+	 * offset 84
+	 */
+	scaled_channel<uint16_t, 50, 1> ignitionAdvance = (uint16_t)0;
+	/**
+	 * offset 86
+	 */
+	scaled_channel<uint16_t, 300, 1> sparkDwell = (uint16_t)0;
+	/**
+	 * offset 88
+	 */
+	scaled_channel<uint16_t, 100, 1> coilDutyCycle = (uint16_t)0;
+	/**
+	 * offset 90
+	 */
+	scaled_channel<uint16_t, 100, 1> idlePosition = (uint16_t)0;
+	/**
+	 * offset 92
+	 */
+	scaled_channel<uint16_t, 100, 1> etbTarget = (uint16_t)0;
+	/**
+	 * offset 94
+	 */
+	scaled_channel<uint16_t, 100, 1> etb1DutyCycle = (uint16_t)0;
+	/**
+	 * offset 96
+	 */
+	scaled_channel<uint16_t, 100, 1> etb1Error = (uint16_t)0;
+	/**
+	 * offset 98
+	 */
+	scaled_channel<uint16_t, 100, 1> fuelTankLevel = (uint16_t)0;
+	/**
+	 * offset 100
+	 */
+	scaled_channel<uint16_t, 1, 1> totalFuelConsumption = (uint16_t)0;
+	/**
+	 * offset 102
+	 */
+	scaled_channel<uint16_t, 200, 1> fuelFlowRate = (uint16_t)0;
+	/** total size 104*/
 };
 
 // end
-// 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
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 18:48:47 EST 2021
diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h
index fc30cd528d..8ea4a02388 100644
--- a/firmware/console/binary/tunerstudio_outputs.h
+++ b/firmware/console/binary/tunerstudio_outputs.h
@@ -44,25 +44,6 @@ enum class TsCalMode : uint8_t {
 struct TunerStudioOutputChannels : ts_outputs_s {
 	/* see also [OutputChannels] in rusefi.input */
 
-	scaled_percent unused80; // 80
-	scaled_ms tpsAccelFuel; // 82
-
-	// Ignition
-	scaled_angle ignitionAdvance; // 84
-	scaled_ms sparkDwell; // 86
-	scaled_percent coilDutyCycle; // 88
-
-	// Idle & ETB
-	scaled_percent idlePosition; // 90
-	scaled_percent etbTarget; // 92
-	scaled_percent etb1DutyCycle; // 94
-	scaled_percent etb1Error; // 96
-
-	// Fuel system
-	scaled_percent fuelTankLevel; // 98
-	scaled_channel<uint16_t> totalFuelConsumption; // 100
-	scaled_channel<uint16_t, PACK_MULT_FUEL_FLOW> fuelFlowRate; // 102
-
 	// Y axis values for selectable tables
 	scaled_channel<uint16_t, 100> veTableYAxis;  // 104
 	scaled_channel<uint16_t, 100> afrTableYAxis; // 106