From da613e65dc34b64d55f7676a591ea372950583ba Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 8 Jul 2021 09:37:25 -0400 Subject: [PATCH] fix vvt indication #2926 TS project part of the change --- .../console/binary_log/binary_logging.cpp | 5 +++- firmware/integration/rusefi_config.txt | 8 +++--- firmware/tunerstudio/rusefi.input | 25 ++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/firmware/console/binary_log/binary_logging.cpp b/firmware/console/binary_log/binary_logging.cpp index 3f574fb9e7..08267119fd 100644 --- a/firmware/console/binary_log/binary_logging.cpp +++ b/firmware/console/binary_log/binary_logging.cpp @@ -40,7 +40,10 @@ static constexpr LogField fields[] = { {tsOutputChannels.oilPressure, GAUGE_NAME_OIL_PRESSURE, GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS, 0}, {tsOutputChannels.lowFuelPressure, GAUGE_NAME_FUEL_PRESSURE_LOW, GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS, 0}, {tsOutputChannels.highFuelPressure, GAUGE_NAME_FUEL_PRESSURE_HIGH, GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS, 0}, - {tsOutputChannels.vvtPositionB1I, GAUGE_NAME_VVT, "deg", 1}, + {tsOutputChannels.vvtPositionB1I, GAUGE_NAME_VVT_B1I, "deg", 1}, + {tsOutputChannels.vvtPositionB1E, GAUGE_NAME_VVT_B1E, "deg", 1}, + {tsOutputChannels.vvtPositionB2I, GAUGE_NAME_VVT_B2I, "deg", 1}, + {tsOutputChannels.vvtPositionB2E, GAUGE_NAME_VVT_B2E, "deg", 1}, {tsOutputChannels.chargeAirMass, GAUGE_NAME_AIR_MASS, "g", 3}, {tsOutputChannels.currentTargetAfr, GAUGE_NAME_TARGET_AFR, "afr", 2}, {tsOutputChannels.targetLambda, GAUGE_NAME_TARGET_LAMBDA, "", 3}, diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 1e1e8689d8..3f7d3fa00e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1688,10 +1688,10 @@ end_struct #define GAUGE_NAME_VERSION "firmware" #define GAUGE_NAME_TRG_ERR "trg err" -#define GAUGE_NAME_VVT "VVT position" -#define GAUGE_NAME_SECOND_VVT_BANK_1 "VVT second position bank 1" -#define GAUGE_NAME_VVT_BANK_2 "VVT position bank 2" -#define GAUGE_NAME_SECOND_VVT_BANK_2 "VVT second position bank 2" +#define GAUGE_NAME_VVT_B1I "VVT: bank 1 intake" +#define GAUGE_NAME_VVT_B1E "VVT: bank 1 exhaust" +#define GAUGE_NAME_VVT_B2I "VVT: bank 2 intake" +#define GAUGE_NAME_VVT_B2E "VVT: bank 2 exhaust" #define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_VVS "Vehicle Speed" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 16127875cf..d1f8178fef 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -237,7 +237,7 @@ enable2ndByteCanID = false ; misc sensors VBatt = scalar, U16, 38, "V",{1/@@PACK_MULT_VOLTAGE@@}, 0.0 oilPressure = scalar, U16, 40, "kPa",{1/@@PACK_MULT_PRESSURE@@}, 0.0 - vvtPosition = scalar, U16, 42, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 + vvtPositionB1I = scalar, S16, 42, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0; @@ -399,9 +399,9 @@ enable2ndByteCanID = false VssAcceleration = scalar, S16, 284, "m/s2", {1/@@PACK_MULT_MS@@}, 0.0 lambdaValue2 = scalar, U16, 286, "",{1/@@PACK_MULT_LAMBDA@@}, 0.0 AFRValue2 = scalar, U16, 288, "AFR",{1/@@PACK_MULT_AFR@@}, 0.0 - secondVvtPositionBank1=scalar,U16, 290, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 - vvtPositionBank2= scalar, U16, 292, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 - secondVvtPositionBank2=scalar,U16, 294, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 + vvtPositionB1E=scalar,S16, 290, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 + vvtPositionB2I=scalar,S16, 292, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 + vvtPositionB2E=scalar,S16, 294, "deg",{1/@@PACK_MULT_ANGLE@@}, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/@@PACK_MULT_VOLTAGE@@}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/@@PACK_MULT_VOLTAGE@@}, 0.0 @@ -1032,10 +1032,10 @@ gaugeCategory = Sensors - Extra 1 accelerationXGauge = accelerationX, @@GAUGE_NAME_ACCEL_X@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationYGauge = accelerationY, @@GAUGE_NAME_ACCEL_Y@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 atmPresCGauge = baroPressure, @@GAUGE_NAME_BARO_PRESSURE@@, "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 - vvtPositionGauge = vvtPosition, @@GAUGE_NAME_VVT@@, "deg", 0, 100, 0, 0, 720, 720, 0, 0 - secondVvtPositionBank1Gauge=secondVvtPositionBank1, @@GAUGE_NAME_SECOND_VVT_BANK_1@@, "deg", 0, 100, 0, 0, 720, 720, 0, 0 - vvtPositionBank2Gauge=vvtPositionBank2, @@GAUGE_NAME_VVT_BANK_2@@, "deg", 0, 100, 0, 0, 720, 720, 0, 0 - secondVvtPositionBank2Gauge=secondVvtPositionBank2, @@GAUGE_NAME_SECOND_VVT_BANK_2@@, "deg", 0, 100, 0, 0, 720, 720, 0, 0 + vvtPositionB1IGauge = vvtPositionB1I, @@GAUGE_NAME_VVT_B1I@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1 + vvtPositionB1EGauge = vvtPositionB1E, @@GAUGE_NAME_VVT_B1E@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1 + vvtPositionB2IGauge = vvtPositionB2I, @@GAUGE_NAME_VVT_B2I@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1 + vvtPositionB2EGauge = vvtPositionB2E, @@GAUGE_NAME_VVT_B2E@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1 internalMcuTemperatureGauge = internalMcuTemperature, @@GAUGE_NAME_ECU_TEMPERATURE@@, "C", 0, 100, 0, 0, 75, 100, 0, 0 OilPressGauge = oilPressure, @@GAUGE_NAME_OIL_PRESSURE@@, @@GAUGE_NAME_OIL_PRESSURE_UNITS@@, 0, 750, 35, 75, 550, 700, 0, 0 idleAirValvePositionGauge = idleAirValvePosition, "Idle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -1305,10 +1305,11 @@ gaugeCategory = DynoView entry = cltCorrection, @@GAUGE_NAME_FUEL_CLT_CORR@@, float,"%.3f" entry = sparkDwellValue, @@GAUGE_COIL_DWELL_TIME@@, float,"%.3f" - entry = vvtPosition, @@GAUGE_NAME_VVT@@, float,"%.2f" - entry = vvtPositionBank2,@@GAUGE_NAME_VVT_BANK_2@@, float,"%.2f" - entry = secondVvtPositionBank1,@@GAUGE_NAME_SECOND_VVT_BANK_1@@, float,"%.2f" - entry = secondVvtPositionBank2,@@GAUGE_NAME_SECOND_VVT_BANK_2@@, float,"%.2f" + + entry = vvtPositionB1I, @@GAUGE_NAME_VVT_B1I@@, float, "%.1f" + entry = vvtPositionB1E, @@GAUGE_NAME_VVT_B1E@@, float, "%.1f" + entry = vvtPositionB2I, @@GAUGE_NAME_VVT_B2I@@, float, "%.1f" + entry = vvtPositionB2E, @@GAUGE_NAME_VVT_B2E@@, float, "%.1f" entry = injectionOffset, "injOffset" , float, "%.2F" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d"