From b9f649a93c363e8d74541de6c92e3390955cba5f Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 20 Sep 2019 20:41:45 -0400 Subject: [PATCH] ETB to SD logs --- firmware/console/status_loop.cpp | 9 +++++++++ firmware/controllers/actuators/electronic_throttle.cpp | 3 +++ firmware/controllers/generated/rusefi_generated.h | 3 +++ firmware/integration/rusefi_config.txt | 3 +++ firmware/tunerstudio/rusefi.input | 6 +++--- .../models/src/com/rusefi/config/generated/Fields.java | 5 ++++- 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 47c9e5490d..0d77ecfbbb 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -217,6 +217,15 @@ static void printSensors(Logging *log) { reportSensorF(log, GAUGE_NAME_VBAT, "V", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE), 2); // log column #6 } + + // 312 + reportSensorF(log, GAUGE_NAME_ETB_TARGET, "v", tsOutputChannels.etbTarget, 2); + // 316 + reportSensorF(log, GAUGE_NAME_ETB_DUTY, "e", tsOutputChannels.etb1DutyCycle, 2); + // 320 + reportSensorF(log, GAUGE_NAME_ETB_ERROR, "d", tsOutputChannels.etb1Error, 2); + + reportSensorF(log, GAUGE_NAME_FUEL_BARO_CORR, "x", engine->engineState.baroCorrection, 2); reportSensorF(log, GAUGE_NAME_AIR_FLOW, "v", getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE), 2); diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index c5ae399227..58269a496d 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -295,8 +295,11 @@ DISPLAY(DISPLAY_IF(hasEtbPedalPositionSensor)) /* DISPLAY_ELSE */ DISPLAY_TEXT(No_Pedal_Sensor); /* DISPLAY_ENDIF */ + // 312 tsOutputChannels.etbTarget = targetPosition; + // 316 tsOutputChannels.etb1DutyCycle = currentEtbDuty; + // 320 // Error is positive if the throttle needs to open further tsOutputChannels.etb1Error = targetPosition - actualThrottlePosition; } diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 9978a5b73f..6cf5bed386 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -888,6 +888,9 @@ #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_LOAD "Engine Load" +#define GAUGE_NAME_ETB_DUTY "ETB duty cycle" +#define GAUGE_NAME_ETB_ERROR "ETB position error" +#define GAUGE_NAME_ETB_TARGET "ETB position target" #define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure correction" #define GAUGE_NAME_FUEL_BASE "fuel: base" #define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 039e2b0253..05d4bf8057 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1183,6 +1183,9 @@ end_struct #define GAUGE_NAME_VBAT "VBatt" #define GAUGE_NAME_ENGINE_LOAD "Engine Load" #define GAUGE_NAME_CPU_TEMP "CPU Temperature" +#define GAUGE_NAME_ETB_TARGET "ETB position target" +#define GAUGE_NAME_ETB_ERROR "ETB position error" +#define GAUGE_NAME_ETB_DUTY "ETB duty cycle" #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index dcf197e396..7f7b800685 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -848,9 +848,9 @@ gaugeCategory = Throttle Body (incl. ETB) tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 - etbTargetGauge = etbTarget, "ETB position target", "%", 0, 100, 0, 0, 100, 100, 1, 1 - etbErrorGauge = etb1Error, "ETB position error", "%", -20, 20, -10, -5, 5, 10, 2, 0 - etbDutyCycleGauge = etb1DutyCycle, "ETB duty cycle", "%", -100, 100, -75, -50, 50, 75, 0, 0 + etbTargetGauge = etbTarget, @@GAUGE_NAME_ETB_TARGET@@, "%", 0, 100, 0, 0, 100, 100, 1, 1 + etbErrorGauge = etb1Error, @@GAUGE_NAME_ETB_ERROR@@, "%", -20, 20, -10, -5, 5, 10, 2, 0 + etbDutyCycleGauge = etb1DutyCycle, @@GAUGE_NAME_ETB_DUTY@@, "%", -100, 100, -75, -50, 50, 75, 0, 0 [WueAnalyze] diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 6192b334d5..06ff7eaffb 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 19:43:59 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 20:31:53 EDT 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -583,6 +583,9 @@ public class Fields { 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_ETB_DUTY = "ETB duty cycle"; + public static final String GAUGE_NAME_ETB_ERROR = "ETB position error"; + public static final String GAUGE_NAME_ETB_TARGET = "ETB position target"; public static final String GAUGE_NAME_FUEL_BARO_CORR = "fuel: Barometric pressure correction"; public static final String GAUGE_NAME_FUEL_BASE = "fuel: base"; public static final String GAUGE_NAME_FUEL_CHARGE_TEMP = "fuel: Estimated charge temperature";