VVT support for VAG trigger #883

This commit is contained in:
rusefi 2020-08-25 01:24:15 -04:00
parent b0ad2fcb29
commit b5098eb331
4 changed files with 11 additions and 6 deletions

View File

@ -346,19 +346,21 @@ typedef enum {
TT_HONDA_K_12_1 = 46, TT_HONDA_K_12_1 = 46,
TT_BOSCH_QUICK_START = 47, TT_VVT_BOSCH_QUICK_START = 47,
TT_TOOTHED_WHEEL_36_2 = 48, TT_TOOTHED_WHEEL_36_2 = 48,
TT_SUBARU_SVX = 49, TT_SUBARU_SVX = 49,
TT_VVT_MIATA_NB2 = 50,
// do not forget to edit "#define trigger_type_e_enum" line in integration/rusefi_config.txt file to propogate new value to rusefi.ini TS project // do not forget to edit "#define trigger_type_e_enum" line in integration/rusefi_config.txt file to propogate new value to rusefi.ini TS project
// do not forget to invoke "gen_config.bat" once you make changes to integration/rusefi_config.txt // do not forget to invoke "gen_config.bat" once you make changes to integration/rusefi_config.txt
// todo: one day a hero would integrate some of these things into Makefile in order to reduce manual magic // todo: one day a hero would integrate some of these things into Makefile in order to reduce manual magic
// //
// Another point: once you add a new trigger, run get_trigger_images.bat which would run rusefi_test.exe from unit_tests // Another point: once you add a new trigger, run get_trigger_images.bat which would run rusefi_test.exe from unit_tests
// //
TT_UNUSED = 50, // this is used if we want to iterate over all trigger types TT_UNUSED = 51, // this is used if we want to iterate over all trigger types
Force_4_bytes_size_trigger_type = ENUM_32_BITS, Force_4_bytes_size_trigger_type = ENUM_32_BITS,
} trigger_type_e; } trigger_type_e;

View File

@ -563,7 +563,8 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_
setToothedWheelConfiguration(this, 36, 1, ambiguousOperationMode); setToothedWheelConfiguration(this, 36, 1, ambiguousOperationMode);
break; break;
case TT_BOSCH_QUICK_START: case TT_VVT_MIATA_NB2:
case TT_VVT_BOSCH_QUICK_START:
configureQuickStartSenderWheel(this); configureQuickStartSenderWheel(this);
break; break;

View File

@ -26,5 +26,5 @@ void configureOnePlus60_2(TriggerWaveform *s);
void configure3_1_cam(TriggerWaveform *s); void configure3_1_cam(TriggerWaveform *s);
void configureOnePlusOne(TriggerWaveform *s); void configureOnePlusOne(TriggerWaveform *s);
// TT_BOSCH_QUICK_START // TT_VVT_BOSCH_QUICK_START
void configureQuickStartSenderWheel(TriggerWaveform *s); void configureQuickStartSenderWheel(TriggerWaveform *s);

View File

@ -42,7 +42,6 @@ public:
int getHwEventCounter(int index) const; int getHwEventCounter(int index) const;
void resetCounters(); void resetCounters();
void validateCamVvtCounters(); void validateCamVvtCounters();
TriggerStateWithRunningStatistics triggerState;
TriggerNoiseFilter noiseFilter; TriggerNoiseFilter noiseFilter;
@ -60,8 +59,12 @@ public:
efitick_t vvtSyncTimeNt = 0; efitick_t vvtSyncTimeNt = 0;
TriggerStateWithRunningStatistics triggerState;
TriggerWaveform triggerShape; TriggerWaveform triggerShape;
TriggerState vvtState;
TriggerWaveform vvtShape;
TriggerFormDetails triggerFormDetails; TriggerFormDetails triggerFormDetails;
efitick_t previousVvtCamTime = DEEP_IN_THE_PAST_SECONDS * NT_PER_SECOND; efitick_t previousVvtCamTime = DEEP_IN_THE_PAST_SECONDS * NT_PER_SECOND;
@ -69,7 +72,6 @@ public:
private: private:
IntListenerArray<15> triggerListeneres; IntListenerArray<15> triggerListeneres;
}; };
void triggerInfo(void); void triggerInfo(void);