From 7c378c7c6cdf74d3889adde046a5eb663aaf2d5f Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 10 Oct 2021 22:23:33 -0400 Subject: [PATCH] VAG ETB calibration is a mess? --- .../hellen121nissan/board_configuration.cpp | 1 + .../hellen/hellen121vag/board_configuration.cpp | 3 +++ firmware/config/engines/vw_b6.cpp | 13 ++----------- .../controllers/actuators/electronic_throttle.cpp | 15 +++++++++++++++ .../controllers/actuators/electronic_throttle.h | 1 + 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 3912389900..426d0cc41c 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -172,6 +172,7 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->throttlePedalSecondaryUpVoltage = 0.43; engineConfiguration->throttlePedalSecondaryWOTVoltage = 2.20; + // this calibration reminds me of VAG just flipped? engineConfiguration->tpsMin = 100; engineConfiguration->tpsMax = 889; diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index c64682572a..12a82a4fd2 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -13,6 +13,7 @@ #include "pch.h" #include "fsio_impl.h" #include "custom_engine.h" +#include "electronic_throttle_impl.h" #include "../hellen_meta.h" static void hellenWbo() { @@ -138,6 +139,8 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->etbIo[0].controlPin = GPIOA_8; // ETB_EN out_io12 CONFIG(etb_use_two_wires) = true; + setBoschVAGETB(PASS_CONFIG_PARAMETER_SIGNATURE); + engineConfiguration->isSdCardEnabled = true; // todo: should this be a global default not just Hellen121? diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp index a442064828..2f0b336af7 100644 --- a/firmware/config/engines/vw_b6.cpp +++ b/firmware/config/engines/vw_b6.cpp @@ -10,6 +10,7 @@ #include "vw_b6.h" #include "custom_engine.h" #include "table_helper.h" +#include "electronic_throttle_impl.h" /** * set engine_type 62 @@ -124,21 +125,11 @@ void setVwPassatB6(DECLARE_CONFIG_PARAMETER_SIGNATURE) { } */ coolantControl->pin = TLE8888_PIN_5; // "3 - Lowside 2" - - // "7 - Lowside 1" engineConfiguration->hpfpValvePin = TLE8888_PIN_6; + setBoschVAGETB(PASS_CONFIG_PARAMETER_SIGNATURE); - // set tps_min 890 - engineConfiguration->tpsMin = 890; // convert 12to10 bit (ADC/4) - // set tps_max 70 - engineConfiguration->tpsMax = 70; // convert 12to10 bit (ADC/4) - - engineConfiguration->etb.pFactor = 5.12; - engineConfiguration->etb.iFactor = 47; - engineConfiguration->etb.dFactor = 0.088; - engineConfiguration->etb.offset = 0; engineConfiguration->injector.flow = 300; engineConfiguration->tempHpfpStart = 120; diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index 1d94e8b5fc..b16b80dabd 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -845,6 +845,21 @@ static const float boschBiasValues[] = { -15, -15, -10, 0, 19, 20, 26, 28 }; +void setBoschVAGETB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + // set tps_min 890 + engineConfiguration->tpsMin = 890; // convert 12to10 bit (ADC/4) + // set tps_max 70 + engineConfiguration->tpsMax = 70; // convert 12to10 bit (ADC/4) + + engineConfiguration->tps1SecondaryMin = 102; + engineConfiguration->tps1SecondaryMax = 891; + + engineConfiguration->etb.pFactor = 5.12; + engineConfiguration->etb.iFactor = 47; + engineConfiguration->etb.dFactor = 0.088; + engineConfiguration->etb.offset = 0; +} + void setBoschVNH2SP30Curve(DECLARE_CONFIG_PARAMETER_SIGNATURE) { copyArray(CONFIG(etbBiasBins), boschBiasBins); copyArray(CONFIG(etbBiasValues), boschBiasValues); diff --git a/firmware/controllers/actuators/electronic_throttle.h b/firmware/controllers/actuators/electronic_throttle.h index 897b271d97..6c4e8119b1 100644 --- a/firmware/controllers/actuators/electronic_throttle.h +++ b/firmware/controllers/actuators/electronic_throttle.h @@ -22,6 +22,7 @@ void setHitachiEtbCalibration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void set18919_AM810_pedal_position_sensor(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setToyota89281_33010_pedal_position_sensor(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setBoschVAGETB(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setDefaultEtbBiasCurve(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setDefaultEtbParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);