rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

M62T vanos support #2243

This commit is contained in:
rusefillc 2021-02-08 21:50:31 -05:00
parent d39b285834
commit 8fa1a6530b
28 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/bmw_m73.cpp
View File

@ -94,7 +94,7 @@ void m73engine(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
CONFIG(isFasterEngineSpinUpEnabled) = true;
CONFIG(fuelAlgorithm) = LM_ALPHA_N;
engineConfiguration->vvtMode = VVT_FIRST_HALF;
engineConfiguration->vvtMode[0] = VVT_FIRST_HALF;
engineConfiguration->globalTriggerAngleOffset = 90;
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);

2
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -335,7 +335,7 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->vvtCamSensorUseRise = true;
// set vvt_mode 3
engineConfiguration->vvtMode = VVT_MIATA_NB2;
engineConfiguration->vvtMode[0] = VVT_MIATA_NB2;
engineConfiguration->vvtOffset = 98; // 2003 red car value
MEMCPY(config->veRpmBins, mazda_miata_nb2_RpmBins);

2
firmware/config/engines/test_engine.cpp
View File

@ -75,7 +75,7 @@ void setTestVVTEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// set global_trigger_offset_angle 0
engineConfiguration->globalTriggerAngleOffset = 0;
engineConfiguration->vvtMode = VVT_SECOND_HALF;
engineConfiguration->vvtMode[0] = VVT_SECOND_HALF;
engineConfiguration->debugMode = DBG_VVT;
}

2
firmware/config/engines/toyota_jzs147.cpp
View File

@ -110,7 +110,7 @@ void setToyota_2jz_vics(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; // cam sensor will he handled by custom vtti code
engineConfiguration->camInputs[0] = GPIOC_6;
engineConfiguration->vvtMode = VVT_2JZ;
engineConfiguration->vvtMode[0] = VVT_2JZ;
// set global_trigger_offset_angle 155
engineConfiguration->globalTriggerAngleOffset = 155; // todo

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

@ -22,7 +22,7 @@ void setVwPassatB6(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
#if (BOARD_TLE8888_COUNT > 0)
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
engineConfiguration->vvtMode = VVT_BOSCH_QUICK_START;
engineConfiguration->vvtMode[0] = VVT_BOSCH_QUICK_START;
engineConfiguration->map.sensor.type = MT_BOSCH_2_5;
// seting Injectors flow rate equal 1214 cc/min

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

@ -147,8 +147,8 @@ void Engine::initializeTriggerWaveform(Logging *logger DECLARE_ENGINE_PARAMETER_
}
initVvtShape(logger, engineConfiguration->vvtMode, &ENGINE(triggerCentral).vvtShape[0], initState PASS_ENGINE_PARAMETER_SUFFIX);
initVvtShape(logger, engineConfiguration->secondVvtMode, &ENGINE(triggerCentral).vvtShape[1], initState PASS_ENGINE_PARAMETER_SUFFIX);
initVvtShape(logger, engineConfiguration->vvtMode[0], &ENGINE(triggerCentral).vvtShape[0], initState PASS_ENGINE_PARAMETER_SUFFIX);
initVvtShape(logger, engineConfiguration->vvtMode[1], &ENGINE(triggerCentral).vvtShape[1], initState PASS_ENGINE_PARAMETER_SUFFIX);
if (!TRIGGER_WAVEFORM(shapeDefinitionError)) {

2
firmware/controllers/engine_cycle/main_trigger_callback.cpp
View File

@ -371,7 +371,7 @@ uint32_t *cyccnt = (uint32_t*) &DWT->CYCCNT;
void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp DECLARE_ENGINE_PARAMETER_SUFFIX) {
ScopePerf perf(PE::MainTriggerCallback);
if (CONFIG(vvtMode) == VVT_MIATA_NB2 && ENGINE(triggerCentral.vvtSyncTimeNt) == 0) {
if (CONFIG(vvtMode[0]) == VVT_MIATA_NB2 && ENGINE(triggerCentral.vvtSyncTimeNt) == 0) {
// this is a bit spaghetti code for sure
// do not spark & do not fuel until we have VVT sync. NB2 is a special case
// due to symmetrical crank wheel and we need to make sure no spark happens out of sync

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:41:01 UTC 2021
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:38:22 EST 2021
// by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:41:01 UTC 2021
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:38:22 EST 2021
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:41:01 UTC 2021
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:38:22 EST 2021
// by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:41:01 UTC 2021
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 08 21:38:22 EST 2021
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

4
firmware/controllers/generated/signature_all.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 3414537129
#define TS_SIGNATURE "rusEFI 2021.02.08.all.3414537129"
#define SIGNATURE_HASH 2483621418
#define TS_SIGNATURE "rusEFI 2021.02.08.all.2483621418"

4
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 1342152250
#define TS_SIGNATURE "rusEFI 2021.02.08.frankenso_na6.1342152250"
#define SIGNATURE_HASH 275981241
#define TS_SIGNATURE "rusEFI 2021.02.08.frankenso_na6.275981241"

4
firmware/controllers/generated/signature_hellen72.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD hellen72
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 3654413073
#define TS_SIGNATURE "rusEFI 2021.02.08.hellen72.3654413073"
#define SIGNATURE_HASH 2254263954
#define TS_SIGNATURE "rusEFI 2021.02.08.hellen72.2254263954"

4
firmware/controllers/generated/signature_hellen_cypress.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 2314823801
#define TS_SIGNATURE "rusEFI 2021.02.08.hellen_cypress.2314823801"
#define SIGNATURE_HASH 3598046714
#define TS_SIGNATURE "rusEFI 2021.02.08.hellen_cypress.3598046714"

4
firmware/controllers/generated/signature_kin.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 2314823801
#define TS_SIGNATURE "rusEFI 2021.02.08.kin.2314823801"
#define SIGNATURE_HASH 3598046714
#define TS_SIGNATURE "rusEFI 2021.02.08.kin.3598046714"

4
firmware/controllers/generated/signature_mre_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 3846422851
#define TS_SIGNATURE "rusEFI 2021.02.08.mre_f4.3846422851"
#define SIGNATURE_HASH 3134160064
#define TS_SIGNATURE "rusEFI 2021.02.08.mre_f4.3134160064"

4
firmware/controllers/generated/signature_mre_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 3846422851
#define TS_SIGNATURE "rusEFI 2021.02.08.mre_f7.3846422851"
#define SIGNATURE_HASH 3134160064
#define TS_SIGNATURE "rusEFI 2021.02.08.mre_f7.3134160064"

4
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 3641946527
#define TS_SIGNATURE "rusEFI 2021.02.08.prometheus_405.3641946527"
#define SIGNATURE_HASH 2258570268
#define TS_SIGNATURE "rusEFI 2021.02.08.prometheus_405.2258570268"

4
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 3641946527
#define TS_SIGNATURE "rusEFI 2021.02.08.prometheus_469.3641946527"
#define SIGNATURE_HASH 2258570268
#define TS_SIGNATURE "rusEFI 2021.02.08.prometheus_469.2258570268"

4
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 2897509254
#define TS_SIGNATURE "rusEFI 2021.02.08.proteus_f4.2897509254"
#define SIGNATURE_HASH 4080584197
#define TS_SIGNATURE "rusEFI 2021.02.08.proteus_f4.4080584197"

4
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 2897509254
#define TS_SIGNATURE "rusEFI 2021.02.08.proteus_f7.2897509254"
#define SIGNATURE_HASH 4080584197
#define TS_SIGNATURE "rusEFI 2021.02.08.proteus_f7.4080584197"

4
firmware/controllers/generated/signature_subaru_eg33_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD subaru_eg33_f7
#define SIGNATURE_DATE 2021.02.08
#define SIGNATURE_HASH 2526856374
#define TS_SIGNATURE "rusEFI 2021.02.08.subaru_eg33_f7.2526856374"
#define SIGNATURE_HASH 3373300021
#define TS_SIGNATURE "rusEFI 2021.02.08.subaru_eg33_f7.3373300021"

2
firmware/controllers/settings.cpp
View File

@ -1282,7 +1282,7 @@ static void setValue(const char *paramStr, const char *valueStr) {
} else if (strEqualCaseInsensitive(paramStr, "vvt_offset")) {
engineConfiguration->vvtOffset = valueF;
} else if (strEqualCaseInsensitive(paramStr, "vvt_mode")) {
engineConfiguration->vvtMode = (vvt_mode_e)valueI;
engineConfiguration->vvtMode[0] = (vvt_mode_e)valueI;
} else if (strEqualCaseInsensitive(paramStr, "operation_mode")) {
engineConfiguration->ambiguousOperationMode = (operation_mode_e)valueI;
} else if (strEqualCaseInsensitive(paramStr, "vvtCamSensorUseRise")) {

8
firmware/controllers/trigger/trigger_central.cpp
View File

@ -129,7 +129,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
}
if (!vvtWithRealDecoder(engineConfiguration->vvtMode) && (CONFIG(vvtCamSensorUseRise) ^ (front != TV_FALL))) {
if (!vvtWithRealDecoder(engineConfiguration->vvtMode[camIndex]) && (CONFIG(vvtCamSensorUseRise) ^ (front != TV_FALL))) {
// todo: there should be a way to always use real trigger code for this logic?
return;
}
@ -191,7 +191,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
#endif /* EFI_TUNER_STUDIO */
}
switch(engineConfiguration->vvtMode) {
switch(engineConfiguration->vvtMode[camIndex]) {
case VVT_2JZ:
// we do not know if we are in sync or out of sync, so we have to be looking for both possibilities
if ((currentPosition < engineConfiguration->fsio_setting[14] || currentPosition > engineConfiguration->fsio_setting[15]) &&
@ -227,7 +227,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
warning(CUSTOM_ERR_VVT_OUT_OF_RANGE, "Please adjust vvtOffset since position %f", tc->vvtPosition);
}
switch (engineConfiguration->vvtMode) {
switch (engineConfiguration->vvtMode[camIndex]) {
case VVT_FIRST_HALF:
{
@ -625,7 +625,7 @@ void triggerInfo(void) {
#if EFI_PROD_CODE
if (HAVE_CAM_INPUT()) {
scheduleMsg(logger, "VVT input: %s mode %s", hwPortname(engineConfiguration->camInputs[0]),
getVvt_mode_e(engineConfiguration->vvtMode));
getVvt_mode_e(engineConfiguration->vvtMode[0]));
scheduleMsg(logger, "VVT event counters: %d/%d", engine->triggerCentral.vvtEventRiseCounter, engine->triggerCentral.vvtEventFallCounter);
}

3
firmware/integration/rusefi_config.txt
View File

@ -1299,8 +1299,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygenBins;Narrow Band WBO Approximation;"V", 1, 0, -10.0, 10.0, 3
float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygen;;"ratio", 1, 0, -40.0, 40.0, 2
vvt_mode_e vvtMode;set vvt_mode X
vvt_mode_e secondVvtMode;set second_vvt_mode X
vvt_mode_e[CAMS_PER_BANK iterate] vvtMode;set vvt_mode X
uint8_t[22] unusedOldBiquad;;"units", 1, 0, -20, 100, 0
float[CLT_TIMING_CURVE_SIZE] cltTimingBins;CLT-based timing correction;"C", 1, 0, -100.0, 250.0, 1
float[CLT_TIMING_CURVE_SIZE] cltTimingExtra;;"degree", 1, 0, -400.0, 400.0, 0

2
unit_tests/tests/trigger/test_cam_vvt_input.cpp
View File

@ -82,7 +82,7 @@ TEST(trigger, testCamInput) {
// changing to 'ONE TOOTH' trigger on CRANK with CAM/VVT
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->useOnlyRisingEdgeForTrigger = true;
engineConfiguration->vvtMode = VVT_FIRST_HALF;
engineConfiguration->vvtMode[0] = VVT_FIRST_HALF;
engineConfiguration->vvtOffset = 720;
eth.setTriggerType(TT_ONE PASS_ENGINE_PARAMETER_SUFFIX);
engineConfiguration->camInputs[0] = GPIOA_10; // we just need to indicate that we have CAM

2
unit_tests/tests/trigger/test_quad_cam.cpp
View File

@ -15,7 +15,7 @@ TEST(trigger, testQuadCam) {
// engineConfiguration->vvtMode = VVT_2JZ;
// engineConfiguration->secondVvtMode = VVT_MIATA_NB2;
engineConfiguration->vvtMode = VVT_MIATA_NB2;
engineConfiguration->vvtMode[0] = VVT_MIATA_NB2;
engineConfiguration->camInputs[0] = GPIOA_10; // we just need to indicate that we have CAM