rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

B6 test mule

This commit is contained in:
rusefillc 2022-05-21 02:25:43 -04:00
parent b4de5f2155
commit 4a9789e6c4
2 changed files with 87 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
firmware/config/engines/vw_b6.cpp
View File

@ -12,20 +12,14 @@
#include "table_helper.h"
#include "electronic_throttle_impl.h"
#include "mre_meta.h"
#include "proteus_meta.h"
/**
* set engine_type 62
* VW_B6
* has to be microRusEFI 0.5.2
*/
void setMreVwPassatB6() {
#if HW_MICRO_RUSEFI
static void commonPassatB6() {
setCrankOperationMode();
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
engineConfiguration->vvtMode[0] = VVT_BOSCH_QUICK_START;
engineConfiguration->map.sensor.type = MT_BOSCH_2_5;
engineConfiguration->tps1_2AdcChannel = MRE_IN_ANALOG_VOLT_9;
engineConfiguration->canNbcType = CAN_BUS_NBC_VAG;
// Injectors flow 1214 cc/min at 100 bar pressure
@ -52,13 +46,6 @@ void setMreVwPassatB6() {
engineConfiguration->invertCamVVTSignal = true;
engineConfiguration->vvtCamSensorUseRise = true;
// EFI_ADC_7: "31 - AN volt 3" - PA7
engineConfiguration->throttlePedalPositionAdcChannel = MRE_IN_ANALOG_VOLT_3;
// 36 - AN volt 8
engineConfiguration->throttlePedalPositionSecondAdcChannel = MRE_IN_ANALOG_VOLT_8;
// "26 - AN volt 2"
engineConfiguration->highPressureFuel.hwChannel = MRE_IN_ANALOG_VOLT_2;
/**
* PSS-140
*/
@ -68,6 +55,87 @@ void setMreVwPassatB6() {
engineConfiguration->highPressureFuel.v2 = 4.5; /* volts */;
engineConfiguration->highPressureFuel.value2 = BAR2KPA(140);
gppwm_channel *lowPressureFuelPumpControl = &engineConfiguration->gppwm[1];
strcpy(engineConfiguration->gpPwmNote[1], "LPFP");
lowPressureFuelPumpControl->pwmFrequency = 20;
lowPressureFuelPumpControl->loadAxis = GPPWM_FuelLoad;
lowPressureFuelPumpControl->dutyIfError = 50;
setTable(lowPressureFuelPumpControl->table, (uint8_t)50);
gppwm_channel *coolantControl = &engineConfiguration->gppwm[0];
strcpy(engineConfiguration->gpPwmNote[0], "Rad Fan");
coolantControl->pwmFrequency = 25;
coolantControl->loadAxis = GPPWM_FuelLoad;
// Volkswage wants 10% for fan to be OFF, between pull-up and low side control we need to invert that value
// todo system lua for duty driven by CLT? (3, Gpio::E0, "0.15 90 coolant 120 min max 90 - 30 / 0.8 * +", 25);
int value = 100 - 10;
coolantControl->dutyIfError = value;
setTable(coolantControl->table, (uint8_t)value);
// for now I just want to stop radiator whine
// todo: enable cooling!
/*
for (int load = 0; load < GPPWM_LOAD_COUNT; load++) {
for (int r = 0; r < GPPWM_RPM_COUNT; r++) {
engineConfiguration->gppwm[0].table[load][r] = value;
}
}
*/
engineConfiguration->hpfpCamLobes = 3;
engineConfiguration->hpfpPumpVolume = 0.290;
engineConfiguration->hpfpMinAngle = 10;
engineConfiguration->hpfpActivationAngle = 30;
engineConfiguration->hpfpTargetDecay = 2000;
engineConfiguration->hpfpPidP = 0.01;
engineConfiguration->hpfpPidI = 0.0003;
engineConfiguration->hpfpPeakPos = 10;
setTable(config->veTable, 55);
setBoschVAGETB();
// random number just to take position away from zero
engineConfiguration->vvtOffsets[0] = 180;
// https://rusefi.com/forum/viewtopic.php?p=38235#p38235
engineConfiguration->injector.flow = 1200;
engineConfiguration->idle.solenoidPin = Gpio::Unassigned;
engineConfiguration->fanPin = Gpio::Unassigned;
engineConfiguration->useETBforIdleControl = true;
engineConfiguration->injectionMode = IM_SEQUENTIAL;
engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL;}
void setProteusVwPassatB6() {
#if HW_PROTEUS
commonPassatB6();
#endif
}
/**
* set engine_type 62
* VW_B6
* has to be microRusEFI 0.5.2
*/
void setMreVwPassatB6() {
#if HW_MICRO_RUSEFI
commonPassatB6();
engineConfiguration->tps1_2AdcChannel = MRE_IN_ANALOG_VOLT_9;
// EFI_ADC_7: "31 - AN volt 3" - PA7
engineConfiguration->throttlePedalPositionAdcChannel = MRE_IN_ANALOG_VOLT_3;
// 36 - AN volt 8
engineConfiguration->throttlePedalPositionSecondAdcChannel = MRE_IN_ANALOG_VOLT_8;
// "26 - AN volt 2"
engineConfiguration->highPressureFuel.hwChannel = MRE_IN_ANALOG_VOLT_2;
// "19 - AN volt 4"
engineConfiguration->lowPressureFuel.hwChannel = EFI_ADC_12;
engineConfiguration->lowPressureFuel.v1 = 0.5; /* volts */;
@ -109,65 +177,19 @@ void setMreVwPassatB6() {
gppwm_channel *lowPressureFuelPumpControl = &engineConfiguration->gppwm[1];
strcpy(engineConfiguration->gpPwmNote[1], "LPFP");
lowPressureFuelPumpControl->pwmFrequency = 20;
lowPressureFuelPumpControl->loadAxis = GPPWM_FuelLoad;
lowPressureFuelPumpControl->dutyIfError = 50;
setTable(lowPressureFuelPumpControl->table, (uint8_t)50);
// "42 - Injector 4", somehow GP4 did not work? not enough current? not happy with diode?
lowPressureFuelPumpControl->pin = Gpio::TLE8888_PIN_4;
gppwm_channel *coolantControl = &engineConfiguration->gppwm[0];
strcpy(engineConfiguration->gpPwmNote[0], "Rad Fan");
coolantControl->pwmFrequency = 25;
coolantControl->loadAxis = GPPWM_FuelLoad;
// Volkswage wants 10% for fan to be OFF, between pull-up and low side control we need to invert that value
// todo system lua for duty driven by CLT? (3, Gpio::E0, "0.15 90 coolant 120 min max 90 - 30 / 0.8 * +", 25);
int value = 100 - 10;
coolantControl->dutyIfError = value;
setTable(coolantControl->table, (uint8_t)value);
// for now I just want to stop radiator whine
// todo: enable cooling!
/*
for (int load = 0; load < GPPWM_LOAD_COUNT; load++) {
for (int r = 0; r < GPPWM_RPM_COUNT; r++) {
engineConfiguration->gppwm[0].table[load][r] = value;
}
}
*/
coolantControl->pin = Gpio::TLE8888_PIN_5; // "3 - Lowside 2"
// "7 - Lowside 1"
//engineConfiguration->hpfpValvePin = MRE_LS_1;
engineConfiguration->disablePrimaryUart = true;
engineConfiguration->hpfpValvePin = Gpio::B10; // AUX J13
engineConfiguration->hpfpCamLobes = 3;
engineConfiguration->hpfpPumpVolume = 0.290;
engineConfiguration->hpfpMinAngle = 10;
engineConfiguration->hpfpActivationAngle = 30;
engineConfiguration->hpfpTargetDecay = 2000;
engineConfiguration->hpfpPidP = 0.01;
engineConfiguration->hpfpPidI = 0.0003;
engineConfiguration->hpfpPeakPos = 10;
setTable(config->veTable, 55);
setBoschVAGETB();
// random number just to take position away from zero
engineConfiguration->vvtOffsets[0] = 180;
// https://rusefi.com/forum/viewtopic.php?p=38235#p38235
engineConfiguration->injector.flow = 1200;
engineConfiguration->idle.solenoidPin = Gpio::Unassigned;
engineConfiguration->fanPin = Gpio::Unassigned;
engineConfiguration->useETBforIdleControl = true;
engineConfiguration->injectionMode = IM_SEQUENTIAL;
engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL;
#endif /* HW_MICRO_RUSEFI */
}

4
firmware/controllers/algo/engine_configuration.cpp
View File

@ -905,6 +905,9 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
break;
#endif // HW_MICRO_RUSEFI
#if HW_PROTEUS
case PROTEUS_VW_B6:
setProteusVwPassatB6();
break;
case PROTEUS_QC_TEST_BOARD:
proteusBoardTest();
break;
@ -1016,7 +1019,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case DODGE_NEON_2003_CRANK:
setDodgeNeonNGCEngineConfiguration();
break;
case PROTEUS_VW_B6:
case FORD_ASPIRE_1996:
setFordAspireEngineConfiguration();
break;