diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 861b70f0e5..b4becedc0a 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1495,3 +1495,4 @@ #define GAUGE_NAME_FUEL_EL_EXTRA "fuel: engine load acceleration extra fuel" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" +#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 8021afe7ce..a8379a957b 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -870,4 +870,6 @@ end_struct #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" -#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" \ No newline at end of file +#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" + +#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index ef22156ebf..b30272fba8 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -44,7 +44,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 Mon Apr 03 21:10:42 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 03 21:25:16 EDT 2017 pageSize = 16376 page = 1 @@ -1336,7 +1336,7 @@ fileVersion = { 20161225 } entry = iatCorrection, "fuel: IAT corr", float, "%.3f" entry = cltCorrection, "cltCorrection", float,"%.3f" - entry = sparkDwellValue, "dwell", float,"%.3f" + entry = sparkDwellValue, "dwell: coil charge time", float,"%.3f" entry = vvtPosition, "VVT", float,"%.2f" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index f11afc63ca..87e299b760 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -607,7 +607,7 @@ fileVersion = { 20161225 } entry = iatCorrection, "fuel: IAT corr", float, "%.3f" entry = cltCorrection, "cltCorrection", float,"%.3f" - entry = sparkDwellValue, "dwell", float,"%.3f" + entry = sparkDwellValue, @@GAUGE_COIL_DWELL_TIME@@, float,"%.3f" entry = vvtPosition, "VVT", float,"%.2f" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 128269d0ae..fd0feff94c 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 03 21:10:42 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 03 21:25:16 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -1030,6 +1030,7 @@ public class Fields { public static final String GAUGE_NAME_FUEL_EL_EXTRA = "fuel: engine load acceleration extra fuel"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT); public static final Field ENGINESNIFFERRPMTHRESHOLD = Field.create("ENGINESNIFFERRPMTHRESHOLD", 4, FieldType.INT); public static final Field INJECTOR_FLOW = Field.create("INJECTOR_FLOW", 8, FieldType.FLOAT); diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index 17d926e303..c67c0568d0 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -96,7 +96,7 @@ public enum Sensor { 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), + DWELL(Fields.GAUGE_COIL_DWELL_TIME, 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), VSS(SensorCategory.OPERATIONS, FieldType.FLOAT, 76, BackgroundColor.BLUE),