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

M62T vanos support #2243

This commit is contained in:
rusefi 2021-02-08 20:38:38 -05:00
parent 432e116b31
commit 6793b5d8fc
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/console/binary/tunerstudio_outputs.h
View File

@ -267,7 +267,10 @@ typedef struct {
scaled_afr airFuelRatio2; // 288
//288
uint8_t unusedAtTheEnd[48]; // we have some unused bytes to allow compatible TS changes
scaled_angle secondVvtPositionBank1; // 290
scaled_angle vvtPositionBank2; // 292
scaled_angle secondVvtPositionBank2; // 294
uint8_t unusedAtTheEnd[42]; // we have some unused bytes to allow compatible TS changes
// Temporary - will remove soon
TsDebugChannels* getDebugChannels() {

9
firmware/controllers/engine_controller.cpp
View File

@ -226,9 +226,12 @@ static void doPeriodicSlowCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
efitick_t nowNt = getTimeNowNt();
for (int bankIndex = 0; bankIndex < BANKS_COUNT; bankIndex++) {
if (nowNt - engine->triggerCentral.vvtSyncTimeNt[bankIndex] >= NT_PER_SECOND) {
// loss of VVT sync
engine->triggerCentral.vvtSyncTimeNt[bankIndex] = 0;
for (int camIndex = 0; camIndex < CAMS_PER_BANK; camIndex++) {
if (nowNt - engine->triggerCentral.vvtSyncTimeNt[bankIndex][camIndex] >= NT_PER_SECOND) {
// loss of VVT sync
engine->triggerCentral.vvtSyncTimeNt[bankIndex][camIndex] = 0;
}
}
}

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

@ -57,7 +57,9 @@ TriggerCentral::TriggerCentral() : trigger_central_s(),
void TriggerCentral::init(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
INJECT_ENGINE_REFERENCE(&triggerState);
for (int bankIndex = 0; bankIndex < BANKS_COUNT; bankIndex++) {
INJECT_ENGINE_REFERENCE(&vvtState[bankIndex]);
for (int camIndex = 0; camIndex < CAMS_PER_BANK; camIndex++) {
INJECT_ENGINE_REFERENCE(&vvtState[bankIndex][camIndex]);
}
}
}
@ -78,7 +80,7 @@ EXTERN_ENGINE;
static Logging *logger;
angle_t TriggerCentral::getVVTPosition() {
return vvtPosition[0];
return vvtPosition[0][0];
}
#define miataNbIndex (0)
@ -92,6 +94,7 @@ static bool vvtWithRealDecoder(vvt_mode_e vvtMode) {
void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECLARE_ENGINE_PARAMETER_SUFFIX) {
int bankIndex = 0;
int camIndex = 0;
TriggerCentral *tc = &engine->triggerCentral;
if (front == TV_RISE) {
tc->vvtEventRiseCounter++;
@ -162,7 +165,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
return;
}
ENGINE(triggerCentral).vvtState[bankIndex].decodeTriggerEvent(
ENGINE(triggerCentral).vvtState[bankIndex][camIndex].decodeTriggerEvent(
ENGINE(triggerCentral).vvtShape,
nullptr,
nullptr,
@ -179,7 +182,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
// https://github.com/rusefi/rusefi/issues/1713 currentPosition could be negative that's expected
#if EFI_UNIT_TEST
tc->currentVVTEventPosition = currentPosition;
tc->currentVVTEventPosition[bankIndex][camIndex] = currentPosition;
#endif // EFI_UNIT_TEST
if (engineConfiguration->debugMode == DBG_VVT) {
@ -200,7 +203,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
case VVT_MIATA_NB2:
case VVT_BOSCH_QUICK_START:
{
if (engine->triggerCentral.vvtState[bankIndex].currentCycle.current_index != 0) {
if (engine->triggerCentral.vvtState[bankIndex][camIndex].currentCycle.current_index != 0) {
// this is not NB2 sync tooth - exiting
return;
}
@ -215,12 +218,12 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
break;
}
tc->vvtSyncTimeNt[bankIndex] = nowNt;
tc->vvtSyncTimeNt[bankIndex][camIndex] = nowNt;
// we do NOT clamp VVT position into the [0, engineCycle) range - we expect vvtOffset to be configured so that
// it's not necessary
tc->vvtPosition[bankIndex] = engineConfiguration->vvtOffset - currentPosition;
if (tc->vvtPosition[bankIndex] < 0 || tc->vvtPosition[bankIndex] > ENGINE(engineCycle)) {
tc->vvtPosition[bankIndex][camIndex] = engineConfiguration->vvtOffset - currentPosition;
if (tc->vvtPosition[bankIndex][camIndex] < 0 || tc->vvtPosition[bankIndex][camIndex] > ENGINE(engineCycle)) {
warning(CUSTOM_ERR_VVT_OUT_OF_RANGE, "Please adjust vvtOffset since position %f", tc->vvtPosition);
}

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

@ -61,23 +61,23 @@ public:
#if EFI_UNIT_TEST
// latest VVT event position (could be not synchronization event)
angle_t currentVVTEventPosition = 0;
angle_t currentVVTEventPosition[BANKS_COUNT][CAMS_PER_BANK];
#endif // EFI_UNIT_TEST
// synchronization event position
angle_t vvtPosition[BANKS_COUNT];
angle_t vvtPosition[BANKS_COUNT][CAMS_PER_BANK];
/**
* this is similar to TriggerState#startOfCycleNt but with the crank-only sensor magic
*/
efitick_t timeAtVirtualZeroNt = 0;
efitick_t vvtSyncTimeNt[BANKS_COUNT];
efitick_t vvtSyncTimeNt[BANKS_COUNT][CAMS_PER_BANK];
TriggerStateWithRunningStatistics triggerState;
TriggerWaveform triggerShape;
TriggerState vvtState[BANKS_COUNT];
TriggerState vvtState[BANKS_COUNT][CAMS_PER_BANK];
TriggerWaveform vvtShape;
TriggerFormDetails triggerFormDetails;

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

@ -32,5 +32,5 @@ TEST(sensors, test2jz) {
hwHandleVvtCamSignal(TV_RISE, getTimeNowNt(), 0 PASS_ENGINE_PARAMETER_SUFFIX);
// currentPosition
ASSERT_NEAR(608.2 - 720, engine->triggerCentral.currentVVTEventPosition, EPS3D);
ASSERT_NEAR(608.2 - 720, engine->triggerCentral.currentVVTEventPosition[0][0], EPS3D);
}