automation around outputs section #197

firmware/console/binary/output_channels.txt

@@ -64,5 +64,8 @@ uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0
 
 	uint16_t autoscale vBatt;;"",{1/@@PACK_MULT_VOLTAGE@@}, 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
+
 
 end_struct

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 Sun Nov 21 09:35:08 EST 2021
+// 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
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -181,8 +181,16 @@ struct ts_outputs_s {
 	 * offset 38
 	 */
 	scaled_channel<uint16_t, 1000, 1> vBatt = (uint16_t)0;
-	/** total size 40*/
+	/**
+	 * offset 40
+	 */
+	scaled_channel<uint16_t, 30, 1> oilPressure = (uint16_t)0;
+	/**
+	 * offset 42
+	 */
+	scaled_channel<uint16_t, 50, 1> vvtPositionB1I = (uint16_t)0;
+	/** total size 44*/
 };
 
 // end
-// 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
+// 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

firmware/console/binary/tunerstudio_outputs.h

@@ -44,9 +44,6 @@ enum class TsCalMode : uint8_t {
 struct TunerStudioOutputChannels : ts_outputs_s {
 	/* see also [OutputChannels] in rusefi.input */
 
-	scaled_pressure oilPressure; // 40
-	scaled_angle vvtPositionB1I; // 42
-
 	// Fuel math
 	scaled_channel<uint16_t, 1000> chargeAirMass; // 44  cylinder airmass in mg, 0-65 grams
 	scaled_fuel_mass_mg crankingFuelMass; // 46

firmware/gen_output_channels.sh

@@ -8,7 +8,7 @@ java -DSystemOut.name=logs/gen_output_channels \
  -jar ../java_tools/ConfigDefinition.jar \
  -cache_zip_file tunerstudio/generated/cache.zip \
  -prepend integration/rusefi_config.txt \
- -definition integration/output_channels.txt \
+ -definition console/binary/output_channels.txt \
  -cache . \
  -with_c_defines false \
  -c_destination console/binary/ts_outputs_generated.h