automation around outputs section #197

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 Thu Nov 18 00:04:44 EST 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Thu Nov 18 19:32:24 EST 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -109,8 +109,28 @@ struct ts_outputs_s {
 	 * offset 6
 	 */
 	uint16_t rpmAcceleration = (uint16_t)0;
-	/** total size 8*/
+	/**
+	 * offset 8
+	 */
+	uint16_t speedToRpmRatio = (uint16_t)0;
+	/**
+	 * offset 10
+	 */
+	scaled_channel<uint8_t, 1, 1> vehicleSpeedKph = (uint8_t)0;
+	/**
+	 * offset 11
+	 */
+	uint8_t internalMcuTemperature = (uint8_t)0;
+	/**
+	 * offset 12
+	 */
+	scaled_channel<uint16_t, 1, 100> coolantTemperature = (uint16_t)0;
+	/**
+	 * offset 14
+	 */
+	scaled_channel<uint16_t, 1, 100> intakeAirTemperature = (uint16_t)0;
+	/** total size 16*/
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Thu Nov 18 00:04:44 EST 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Thu Nov 18 19:32:24 EST 2021

firmware/console/binary/tunerstudio_outputs.h

@@ -43,14 +43,8 @@ enum class TsCalMode : uint8_t {
  */
 struct TunerStudioOutputChannels : ts_outputs_s {
 	/* see also [OutputChannels] in rusefi.input */
-
-	scaled_percent speedToRpmRatio; // 8
-	scaled_channel<uint8_t> vehicleSpeedKph; // 10
 	
 	// temperatures
-	scaled_channel<int8_t> internalMcuTemperature; // offset 11
-	scaled_temperature coolantTemperature;   // offset 12
-	scaled_temperature intakeAirTemperature; // offset 14
 	scaled_temperature auxTemp1;             // offset 16
 	scaled_temperature auxTemp2;             // offset 18
 

firmware/gen_output_channels.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
 
 
+source gen_config_common.sh
+echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
+
 java -DSystemOut.name=logs/gen_output_channels \
  -jar ../java_tools/ConfigDefinition.jar \
- -definition integration/output_channels.txt \
  -cache_zip_file tunerstudio/generated/cache.zip \
+ -prepend integration/rusefi_config.txt \
+ -definition integration/output_channels.txt \
  -cache . \
+ -with_c_defines false \
  -c_destination console/binary/ts_outputs_generated.h

firmware/integration/output_channels.txt

@@ -38,4 +38,11 @@ uint16_t autoscale rpm;;"",1, 0, 0, 0, 0
 
 uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0
 
+	uint16_t speedToRpmRatio;;"",{@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
+	uint8_t autoscale vehicleSpeedKph;;"",1, 0, 0, 0, 0
+	uint8_t internalMcuTemperature;;"",1, 0, 0, 0, 0
+
+	uint16_t autoscale coolantTemperature;;"",@@PACK_MULT_TEMPERATURE@@, 0, 0, 0, 0
+	uint16_t autoscale intakeAirTemperature;;"",@@PACK_MULT_TEMPERATURE@@, 0, 0, 0, 0
+
 end_struct