From cd85d485d01aa370419e35ef627f1c7d10fbaa89 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 11 May 2019 10:57:58 -0400 Subject: [PATCH] gauges cleanup --- firmware/controllers/algo/rusefi_generated.h | 1 + firmware/integration/rusefi_config.txt | 1 + firmware/tunerstudio/rusefi.input | 22 +++++++++---------- .../models/src/com/rusefi/config/Fields.java | 4 +++- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 9c2affca91..4484159e1b 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -865,6 +865,7 @@ #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_LOAD "Engine Load" #define GAUGE_NAME_FUEL_BASE "fuel: base" +#define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: charge T" #define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" #define GAUGE_NAME_FUEL_CRANKING "fuel: cranking" #define GAUGE_NAME_FUEL_EL_EXTRA "fuel: engine load acceleration extra fuel" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 4b4d55d520..954179de91 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1152,6 +1152,7 @@ end_struct #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change" +#define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: charge T" #define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel ms" #define GAUGE_NAME_FUEL_EL_EXTRA "fuel: engine load acceleration extra fuel" #define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index c943281309..100b062b7f 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -727,13 +727,6 @@ fileVersion = { 20171101 } [GaugeConfigurations] - ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld -#if CELSIUS - tChargeGauge = tCharge, "Charge Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 -#else - tChargeGauge = tCharge, "Charge Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 -#endif - ; warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 150, -1, -1, 101, 105, 0, 0 ; accelEnrichGauge = accDecEnrich, "Accel Enrich", "%", 50, 150, -1, -1, 999, 999, 0, 0 @@ -747,21 +740,18 @@ fileVersion = { 20171101 } egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "dRpm", 0, 3, 0, 1, 3, 4, 1, 1 massAirFlowValueGa = massAirFlowValue,"Air Flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 - baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1 knockCountGauge = knockCount,"Knock count", "count", 0, 120, 10, 10, 100, 100, 1, 1 knockLevelGauge = knockLevel,"Knock level", "volts", 0, 7, 10, 10, 100, 100, 1, 2 fuelTankLevelGauge = fuelTankLevel,"Fuel", "x", 0, 7, 10, 10, 100, 100, 1, 2 - triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 - - - idleAirValvePositionGauge = idleAirValvePosition, "idle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 + speedToRpmRatioGauge = speedToRpmRatio, "speed2rpm", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Status warningCounterGauge = warningCounter, "Counter", "", 0, 100, 0, 0, 100, 100, 0, 0 lastErrorCodeGauge = lastErrorCode, "Latest Error", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 + triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 recentErrorCode0Gauge = recentErrorCode0, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 recentErrorCode1Gauge = recentErrorCode1, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 recentErrorCode2Gauge = recentErrorCode2, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0 @@ -816,6 +806,7 @@ gaugeCategory = Sensors2 internalMcuTemperatureGauge = internalMcuTemperature, @@GAUGE_NAME_ECU_TEMPERATURE@@, "C", 0, 100, 0, 0, 100, 100, 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 + idleAirValvePositionGauge = idleAirValvePosition, "idle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 gaugeCategory = Spark Data ignadvGauge = ignitionAdvance, "Ignition Advance 1", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 @@ -832,6 +823,13 @@ gaugeCategory = Accel Data gaugeCategory = Fuel Data + ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld +#if CELSIUS + tChargeGauge = tCharge, @@GAUGE_NAME_FUEL_CHARGE_TEMP@@, "°C", -40, 140, -15, 1, 95, 110, 1, 1 +#else + tChargeGauge = tCharge, @@GAUGE_NAME_FUEL_CHARGE_TEMP@@, "°F", -40, 285, 5, 35, 205, 230, 1, 1 +#endif + baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1 crankingFuelGauge = crankingFuelMs, @@GAUGE_NAME_FUEL_CRANKING@@, "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 iatCorrectionGauge = iatCorrection, @@GAUGE_NAME_FUEL_IAT_CORR@@, "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, @@GAUGE_NAME_FUEL_CLT_CORR@@, "mult", 0, 3, 0, 0, 3, 3, 2, 2 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index ada2a2b063..d039c22f84 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 Thu May 09 19:31:34 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 10:55:06 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -554,8 +554,10 @@ public class Fields { public static final String GAUGE_NAME_DEBUG_I4 = "debug i4"; public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; + public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_LOAD = "Engine Load"; public static final String GAUGE_NAME_FUEL_BASE = "fuel: base"; + public static final String GAUGE_NAME_FUEL_CHARGE_TEMP = "fuel: charge T"; public static final String GAUGE_NAME_FUEL_CLT_CORR = "fuel: CLT correction"; public static final String GAUGE_NAME_FUEL_CRANKING = "fuel: cranking"; public static final String GAUGE_NAME_FUEL_EL_EXTRA = "fuel: engine load acceleration extra fuel";