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

#fixed 368

This commit is contained in:
rusefi 2017-03-14 19:21:26 -04:00
parent 15e4175cdc
commit 54366ffc7b
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,9 @@ typedef struct {
float tpsAccelFuel; // offset 128 float tpsAccelFuel; // offset 128
float baroCorrection; // 132 float baroCorrection; // 132
float pedalPosition; // 138 float pedalPosition; // 138
/**
* @see coilDutyCycle
*/
float injectorDutyCycle; // 140 float injectorDutyCycle; // 140
int knockCount; // 144 int knockCount; // 144
float fuelTankGauge; // 148 float fuelTankGauge; // 148
@ -150,6 +153,9 @@ typedef struct {
float debugFloatField7; // 260 float debugFloatField7; // 260
int firmwareVersion; // 264 int firmwareVersion; // 264
float fuelPidCorrection; // 268 float fuelPidCorrection; // 268
/**
* @see injectorDutyCycle
*/
float coilDutyCycle; // 272 float coilDutyCycle; // 272
int unused3[20]; int unused3[20];
} TunerStudioOutputChannels; } TunerStudioOutputChannels;

1
firmware/console/status_loop.cpp
View File

@ -299,6 +299,7 @@ static void printSensors(Logging *log, bool fileFormat) {
} }
reportSensorF(log, fileFormat, "f: duty", "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2); reportSensorF(log, fileFormat, "f: duty", "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2);
reportSensorF(log, fileFormat, "dwell: duty", "%", getCoilDutyCycle(rpm PASS_ENGINE_PARAMETER), 2);
} }

2
firmware/rusefi.cpp
View File

@ -249,5 +249,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20170312; return 20170314;
} }

6
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -105,7 +105,7 @@ public enum Sensor {
deltaTps(SensorCategory.FUEL, FieldType.FLOAT, 116, BackgroundColor.MUD), deltaTps(SensorCategory.FUEL, FieldType.FLOAT, 116, BackgroundColor.MUD),
engineLoadAccelDelta(SensorCategory.FUEL, FieldType.FLOAT, 124, BackgroundColor.MUD), engineLoadAccelDelta(SensorCategory.FUEL, FieldType.FLOAT, 124, BackgroundColor.MUD),
tpsAccelFuel(SensorCategory.FUEL, FieldType.FLOAT, 128, BackgroundColor.MUD), tpsAccelFuel(SensorCategory.FUEL, FieldType.FLOAT, 128, BackgroundColor.MUD),
Injector_duty(SensorCategory.OPERATIONS, FieldType.FLOAT, 140, BackgroundColor.MUD), injectorDutyCycle(SensorCategory.OPERATIONS, FieldType.FLOAT, 140, BackgroundColor.MUD),
wallFuelAmount(SensorCategory.FUEL, FieldType.FLOAT, 160, BackgroundColor.MUD), wallFuelAmount(SensorCategory.FUEL, FieldType.FLOAT, 160, BackgroundColor.MUD),
iatCorrection(SensorCategory.FUEL, FieldType.FLOAT, 164, BackgroundColor.MUD, 0, 5), iatCorrection(SensorCategory.FUEL, FieldType.FLOAT, 164, BackgroundColor.MUD, 0, 5),
wallFuelCorrection(SensorCategory.FUEL, FieldType.FLOAT, 168, BackgroundColor.MUD), wallFuelCorrection(SensorCategory.FUEL, FieldType.FLOAT, 168, BackgroundColor.MUD),
@ -134,6 +134,10 @@ public enum Sensor {
vvtPosition(SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 248, BackgroundColor.MUD, 0, 5), vvtPosition(SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 248, BackgroundColor.MUD, 0, 5),
engineMode(SensorCategory.OPERATIONS, FieldType.INT, 252, BackgroundColor.MUD, 0, 5), engineMode(SensorCategory.OPERATIONS, FieldType.INT, 252, BackgroundColor.MUD, 0, 5),
debugFloatField6(SensorCategory.OPERATIONS, FieldType.FLOAT, 256, BackgroundColor.MUD, 0, 5),
debugFloatField7(SensorCategory.OPERATIONS, FieldType.FLOAT, 260, BackgroundColor.MUD, 0, 5),
coilDutyCycle(SensorCategory.OPERATIONS, FieldType.FLOAT, 272, BackgroundColor.MUD),
INJ_1_2_DELTA("inj 1-2 delta", SensorCategory.SNIFFING), INJ_1_2_DELTA("inj 1-2 delta", SensorCategory.SNIFFING),
INJ_3_4_DELTA("inj 3-4 delta", SensorCategory.SNIFFING), INJ_3_4_DELTA("inj 3-4 delta", SensorCategory.SNIFFING),
; ;

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -44,7 +44,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel * @see EngineSnifferPanel
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20170312; public static final int CONSOLE_VERSION = 20170314;
public static final boolean SHOW_STIMULATOR = false; public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab"; private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port"; protected static final String PORT_KEY = "port";

5
java_console/ui/src/com/rusefi/SensorLogger.java
View File

@ -43,7 +43,8 @@ public class SensorLogger {
Sensor.deltaTps, Sensor.deltaTps,
Sensor.tpsAccelFuel, Sensor.tpsAccelFuel,
Sensor.engineLoadAccelDelta, Sensor.engineLoadAccelDelta,
Sensor.Injector_duty, Sensor.injectorDutyCycle,
Sensor.coilDutyCycle,
Sensor.wallFuelAmount, Sensor.wallFuelAmount,
Sensor.wallFuelCorrection, Sensor.wallFuelCorrection,
@ -64,6 +65,8 @@ public class SensorLogger {
Sensor.debugFloatField3, Sensor.debugFloatField3,
Sensor.debugFloatField4, Sensor.debugFloatField4,
Sensor.debugFloatField5, Sensor.debugFloatField5,
Sensor.debugFloatField6,
Sensor.debugFloatField7,
Sensor.debugIntField1, Sensor.debugIntField1,
Sensor.debugIntField2, Sensor.debugIntField2,
Sensor.debugIntField3, Sensor.debugIntField3,