From b3d4ef545cce6d6edbc05839ef8f1d2ab599bd2f Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 13 Oct 2016 01:02:02 -0400 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio_configuration.h | 4 ++-- firmware/controllers/algo/engine.h | 3 ++- java_console/models/src/com/rusefi/core/Sensor.java | 3 +++ java_console/ui/src/com/rusefi/SensorLogger.java | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h index 271062df84..4c0e14b159 100644 --- a/firmware/console/binary/tunerstudio_configuration.h +++ b/firmware/console/binary/tunerstudio_configuration.h @@ -40,7 +40,7 @@ typedef struct { short int alignment; // size 2, offset 34 float baroPressure; // size 4, offset 36 float manifoldAirPressure; // size 4, offset 40 - float crankingFuelMs; + float crankingFuelMs; // offset 44 /** * This is the raw value we take from the fuel map or base fuel algorithm, before the corrections */ @@ -50,7 +50,7 @@ typedef struct { float sparkDwell; // 60 /** * this one contains total resulting fuel squirt time, per event - * With all corrections. See also baseFuel + * With all corrections and injector lag. See also baseFuel */ float actualLastInjection; // 64 float debugFloatField1; // 68 diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 995753e8e0..3b95f89d70 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -309,7 +309,8 @@ public: TriggerCentral triggerCentral; /** - * Fuel injection duration for current engine cycle, without wall wetting + * Each individual fuel injection duration for current engine cycle, without wall wetting + * including everything including injector lag, both cranking and running */ floatms_t fuelMs; /** diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index 67b77dd158..d981194737 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -13,6 +13,7 @@ public enum Sensor { MAP("MAP", SensorCategory.SENSOR_INPUTS), MAP_RAW("MAP_RAW", SensorCategory.SENSOR_INPUTS), BARO("Baro", SensorCategory.SENSOR_INPUTS), + // todo: unify with ignitionAdvance TIMING("Timing Advance", SensorCategory.OPERATIONS, "deg", -180, 180), /** @@ -92,6 +93,8 @@ public enum Sensor { TPS(SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 12, BackgroundColor.MUD, 0, 100, "%"), FUEL_BASE(SensorCategory.FUEL, FieldType.FLOAT, 48, BackgroundColor.MUD, 0, 30, "ms"), T_CHARGE(SensorCategory.FUEL, FieldType.FLOAT, 52, BackgroundColor.MUD, 30, 140), + // todo: unify with TIMING + ignitionAdvance(SensorCategory.OPERATIONS, FieldType.FLOAT, 56, BackgroundColor.MUD, 30, 140), DWELL(SensorCategory.OPERATIONS, FieldType.FLOAT, 60, BackgroundColor.MUD, 1, 10), actualLastInjection(SensorCategory.FUEL, FieldType.FLOAT, 64, BackgroundColor.MUD, 0, 30, "ms"), debugFloatField1(SensorCategory.OPERATIONS, FieldType.FLOAT, 68, BackgroundColor.MUD, 0, 5), diff --git a/java_console/ui/src/com/rusefi/SensorLogger.java b/java_console/ui/src/com/rusefi/SensorLogger.java index a8b2969070..b7413e3e13 100644 --- a/java_console/ui/src/com/rusefi/SensorLogger.java +++ b/java_console/ui/src/com/rusefi/SensorLogger.java @@ -38,6 +38,7 @@ public class SensorLogger { Sensor.FUEL_BASE, Sensor.actualLastInjection, + Sensor.ignitionAdvance, Sensor.deltaTps, Sensor.tpsAccelFuel,