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

only: cherry picking: it's going to be painful

This commit is contained in:
Andrey 2023-04-29 15:07:43 -04:00
parent 7d444a6e8c
commit e748e65638
4 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/config/engines/mazda_miata_vvt.h
View File

@ -11,9 +11,6 @@
#include "engine_configuration.h" #include "engine_configuration.h"
void setMazdaMiataNbInjectorLag();
void setMazdaNB2VVTSettings();
/** /**
* Primary rusEfi test mule https://rusefi.com/forum/viewtopic.php?f=3&t=1095 * Primary rusEfi test mule https://rusefi.com/forum/viewtopic.php?f=3&t=1095
* MAZDA_MIATA_2003 * MAZDA_MIATA_2003
@ -26,20 +23,6 @@ void setMazdaMiata2003EngineConfiguration();
void setMazdaMiata2003EngineConfigurationNaFuelRail(); void setMazdaMiata2003EngineConfigurationNaFuelRail();
void setMazdaMiata2003EngineConfigurationBoardTest(); void setMazdaMiata2003EngineConfigurationBoardTest();
void setMiataNB2_MRE_ETB();
/**
* OEM mechanical throttle body, with MAP
* set engine_type 11
*/
void setMiataNB2_MRE_MAP();
/**
* OEM mechanical throttle body using OEM MAF
* set engine_type 15
*/
void setMiataNB2_MRE_MAF();
/** /**
* https://github.com/rusefi/rusefi/wiki/Mazda-Miata-2001 * https://github.com/rusefi/rusefi/wiki/Mazda-Miata-2001
* set engine_type 1 * set engine_type 1
@ -49,7 +32,7 @@ void setMiataNB2_Proteus_TCU();
/** /**
* set engine_type 67 * set engine_type 67
*/ */
void setMiataNB2_ProteusEngineConfiguration(); void setMiataNB2_Proteus();
/** /**
* set engine_type 69 * set engine_type 69

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

@ -98,9 +98,4 @@ void setToyota_2jz_vics() {
// engineConfiguration->scriptSetting[5] = 175 + 45; // engineConfiguration->scriptSetting[5] = 175 + 45;
engineConfiguration->vvtPins[0] = Gpio::E3; // VVT solenoid control engineConfiguration->vvtPins[0] = Gpio::E3; // VVT solenoid control
// Mazda VVT settings have nothing to do wit Toyota 2JZ settings but those are a good starting point for settings
setMazdaNB2VVTSettings();
} }

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

@ -750,15 +750,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case MRE_MIATA_NA6_MAP: case MRE_MIATA_NA6_MAP:
setMiataNA6_MAP_MRE(); setMiataNA6_MAP_MRE();
break; break;
case MRE_MIATA_NB2_MAP:
setMiataNB2_MRE_MAP();
break;
case MRE_MIATA_NB2_MAF:
setMiataNB2_MRE_MAF();
break;
case MRE_MIATA_NB2_ETB:
setMiataNB2_MRE_ETB();
break;
case MRE_BODY_CONTROL: case MRE_BODY_CONTROL:
mreBCM(); mreBCM();
break; break;
@ -809,7 +800,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case PROTEUS_VAG_80_18T: case PROTEUS_VAG_80_18T:
case PROTEUS_N73: case PROTEUS_N73:
case PROTEUS_MIATA_NB2: case PROTEUS_MIATA_NB2:
setMiataNB2_ProteusEngineConfiguration(); setMiataNB2_Proteus();
break; break;
case PROTEUS_SBC: case PROTEUS_SBC:
setProteusSbc(); setProteusSbc();

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

@ -156,21 +156,21 @@ TEST(trigger, testNB2CamInput) {
eth.moveTimeForwardUs(MS2US(3)); // shifting VVT phase a few angles eth.moveTimeForwardUs(MS2US(3)); // shifting VVT phase a few angles
hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0); hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
// first gap - long // first gap - long
eth.moveTimeForwardUs(MS2US(130)); eth.moveTimeForwardUs(MS2US(130));
hwHandleVvtCamSignal(TriggerValue::FALL, getTimeNowNt(), 0); hwHandleVvtCamSignal(false, getTimeNowNt(), 0);
eth.moveTimeForwardUs(MS2US( 30)); eth.moveTimeForwardUs(MS2US( 30));
hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0); hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
// second gap - short // second gap - short
eth.moveTimeForwardUs(MS2US(10)); eth.moveTimeForwardUs(MS2US(10));
hwHandleVvtCamSignal(TriggerValue::FALL, getTimeNowNt(), 0); hwHandleVvtCamSignal(false, getTimeNowNt(), 0);
eth.moveTimeForwardUs(MS2US(10)); eth.moveTimeForwardUs(MS2US(10));
hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0); hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
ASSERT_FLOAT_EQ(0, engine->triggerCentral.getVVTPosition(0, 0)); ASSERT_FLOAT_EQ(0, engine->triggerCentral.getVVTPosition(0, 0));
ASSERT_EQ(totalRevolutionCountBeforeVvtSync, engine->triggerCentral.triggerState.getCrankSynchronizationCounter()); ASSERT_EQ(totalRevolutionCountBeforeVvtSync, engine->triggerCentral.triggerState.getCrankSynchronizationCounter());
@ -178,9 +178,9 @@ TEST(trigger, testNB2CamInput) {
// Third gap - long // Third gap - long
eth.moveTimeForwardUs(MS2US(130)); eth.moveTimeForwardUs(MS2US(130));
hwHandleVvtCamSignal(TriggerValue::FALL, getTimeNowNt(), 0); hwHandleVvtCamSignal(false, getTimeNowNt(), 0);
eth.moveTimeForwardUs(MS2US( 30)); eth.moveTimeForwardUs(MS2US( 30));
hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0); hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
EXPECT_NEAR(290.5f, engine->triggerCentral.getVVTPosition(0, 0), EPS2D); EXPECT_NEAR(290.5f, engine->triggerCentral.getVVTPosition(0, 0), EPS2D);
// actually position based on VVT! // actually position based on VVT!