diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h index 8c2f20cfd2..35ce11b038 100644 --- a/firmware/console/binary/tunerstudio_configuration.h +++ b/firmware/console/binary/tunerstudio_configuration.h @@ -23,6 +23,7 @@ typedef struct { * please be aware that 'float' (F32) type requires TunerStudio version 2.6 and later */ typedef struct { + /* see also [OutputChannels] in rusefi.input */ // primary instrument cluster gauges int rpm; // size 4, offset 0 /** @@ -165,6 +166,7 @@ typedef struct { float oilPressure; // 280 float fuelConsumptionPerHour; // 284 int unused3[17]; + /* see also [OutputChannels] in rusefi.input */ } TunerStudioOutputChannels; #endif /* TUNERSTUDIO_CONFIGURATION_H_ */ diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index c81003291d..ef7178d5c5 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 03 07:47:04 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 06 10:47:12 EST 2018 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1216,7 +1216,7 @@ typedef struct { */ spi_device_e hip9011SpiDevice; /** - * set_global_fuel_correction X + * set global_fuel_correction X * offset 552 */ float globalFuelCorrection; @@ -2317,4 +2317,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 03 07:47:04 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 06 10:47:12 EST 2018 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 7dfa62a25f..54789e9bdc 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -63,7 +63,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 03 07:47:04 EST 2018 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 06 10:47:12 EST 2018 pageSize = 20000 page = 1 @@ -960,6 +960,9 @@ fileVersion = { 20171101 } ; see TS_OUTPUT_SIZE in console source code ochBlockSize = 356 +; +; see TunerStudioOutputChannels struct +; RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS coolant = scalar, F32, 4, "°C", 1, 0.0 @@ -1070,6 +1073,10 @@ fileVersion = { 20171101 } accelerationX = scalar, S16, 276, "G", 0.01, 0 accelerationY = scalar, S16, 276, "G", 0.01, 0 oilPressure = scalar, F32, 280, "kPa", 1, 0.0 + fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 +; +; see TunerStudioOutputChannels struct +; ; todo: generate this section programatically LM_PLAIN_MAF = {0}, @@ -1486,6 +1493,7 @@ gaugeCategory = Sensors VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 + fuelConsumptionPerHourGauge=fuelConsumptionPerHour, "f","kPa", 0, 750, 35, 75, 550, 700, 0, 0 tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 atmPresCGauge = baroPressure, "Baro", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 51aab29aae..fa6febe320 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -146,6 +146,9 @@ fileVersion = { 20171101 } ; see TS_OUTPUT_SIZE in console source code ochBlockSize = 356 +; +; see TunerStudioOutputChannels struct +; RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS coolant = scalar, F32, 4, "°C", 1, 0.0 @@ -256,6 +259,10 @@ fileVersion = { 20171101 } accelerationX = scalar, S16, 276, "G", 0.01, 0 accelerationY = scalar, S16, 276, "G", 0.01, 0 oilPressure = scalar, F32, 280, "kPa", 1, 0.0 + fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 +; +; see TunerStudioOutputChannels struct +; ; todo: generate this section programatically LM_PLAIN_MAF = {0}, @@ -672,6 +679,7 @@ gaugeCategory = Sensors VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 + fuelConsumptionPerHourGauge=fuelConsumptionPerHour, "f","kPa", 0, 750, 35, 75, 550, 700, 0, 0 tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 atmPresCGauge = baroPressure, "Baro", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0