rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fuelConsumptionPerHour gauge

This commit is contained in:
rusefi 2018-01-06 10:53:15 -05:00
parent 3dc9ab247a
commit e6c9d7e8e2
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio_configuration.h
View File

@ -23,6 +23,7 @@ typedef struct {
* please be aware that 'float' (F32) type requires TunerStudio version 2.6 and later * please be aware that 'float' (F32) type requires TunerStudio version 2.6 and later
*/ */
typedef struct { typedef struct {
/* see also [OutputChannels] in rusefi.input */
// primary instrument cluster gauges // primary instrument cluster gauges
int rpm; // size 4, offset 0 int rpm; // size 4, offset 0
/** /**
@ -165,6 +166,7 @@ typedef struct {
float oilPressure; // 280 float oilPressure; // 280
float fuelConsumptionPerHour; // 284 float fuelConsumptionPerHour; // 284
int unused3[17]; int unused3[17];
/* see also [OutputChannels] in rusefi.input */
} TunerStudioOutputChannels; } TunerStudioOutputChannels;
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */ #endif /* TUNERSTUDIO_CONFIGURATION_H_ */

6
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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 // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -1216,7 +1216,7 @@ typedef struct {
*/ */
spi_device_e hip9011SpiDevice; spi_device_e hip9011SpiDevice;
/** /**
* set_global_fuel_correction X * set global_fuel_correction X
* offset 552 * offset 552
*/ */
float globalFuelCorrection; float globalFuelCorrection;
@ -2317,4 +2317,4 @@ typedef struct {
#endif #endif
// end // 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

10
firmware/tunerstudio/rusefi.ini
View File

@ -63,7 +63,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1
@ -960,6 +960,9 @@ fileVersion = { 20171101 }
; see TS_OUTPUT_SIZE in console source code ; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356 ochBlockSize = 356
;
; see TunerStudioOutputChannels struct
;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "°C", 1, 0.0 coolant = scalar, F32, 4, "°C", 1, 0.0
@ -1070,6 +1073,10 @@ fileVersion = { 20171101 }
accelerationX = scalar, S16, 276, "G", 0.01, 0 accelerationX = scalar, S16, 276, "G", 0.01, 0
accelerationY = scalar, S16, 276, "G", 0.01, 0 accelerationY = scalar, S16, 276, "G", 0.01, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.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 ; todo: generate this section programatically
LM_PLAIN_MAF = {0}, LM_PLAIN_MAF = {0},
@ -1486,6 +1493,7 @@ gaugeCategory = Sensors
VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 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 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 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 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 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 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0

8
firmware/tunerstudio/rusefi.input
View File

@ -146,6 +146,9 @@ fileVersion = { 20171101 }
; see TS_OUTPUT_SIZE in console source code ; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356 ochBlockSize = 356
;
; see TunerStudioOutputChannels struct
;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "°C", 1, 0.0 coolant = scalar, F32, 4, "°C", 1, 0.0
@ -256,6 +259,10 @@ fileVersion = { 20171101 }
accelerationX = scalar, S16, 276, "G", 0.01, 0 accelerationX = scalar, S16, 276, "G", 0.01, 0
accelerationY = scalar, S16, 276, "G", 0.01, 0 accelerationY = scalar, S16, 276, "G", 0.01, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.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 ; todo: generate this section programatically
LM_PLAIN_MAF = {0}, LM_PLAIN_MAF = {0},
@ -672,6 +679,7 @@ gaugeCategory = Sensors
VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 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 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 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 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 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 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0