M62T vanos support #2243

This commit is contained in:
rusefillc 2021-02-08 14:10:57 -05:00
parent 74d4001bdb
commit 7e25202712
3 changed files with 12 additions and 11 deletions

View File

@ -456,8 +456,6 @@ typedef enum {
VVT_4_1 = 6,
VVT_FORD_ST170 = 7,
Force_4_bytes_size_vvt_mode = ENUM_32_BITS,
} vvt_mode_e;
/**

View File

@ -286,7 +286,7 @@ end_struct
custom debug_mode_e 4 bits, U32, @OFFSET@, [0:5], @@debug_mode_e_enum@@
#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "mode7"
custom vvt_mode_e 4 bits, U32, @OFFSET@, [0:2], @@vvt_mode_e_enum@@
custom vvt_mode_e 1 bits, U08, @OFFSET@, [0:2], @@vvt_mode_e_enum@@
! At the moment TIM1, TIM2, TIM3 and TIM9 are configured as ICU
! todo: as of ChibiOS3, only channels 1 & 2 are allowed to capture input, that's a ChibiOS driver limitation
@ -1299,7 +1299,8 @@ 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
uint8_t[20] unusedOldBiquad;;"units", 1, 0, -20, 100, 0
vvt_mode_e secondVvtMode;set second_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
custom tle8888_mode_e 1 bits, U08, @OFFSET@, [0:1], "Auto", "SemiAuto", "Manual", "Hall"

View File

@ -1790,7 +1790,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
dialog = triggerConfiguration_IO, "Advanced Trigger"
field = "!https://rusefi.com/s/vvt"
field = "VVT mode", vvtMode, {trigger_type != 80}
field = "CAM/VVT mode shaft #1", vvtMode, {trigger_type != 80}
field = "VVT mode shaft #2", secondVvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "VVT position display offset", vvtOffset
field = "print verbose VVT sync details to console",verboseVVTDecoding
@ -1799,15 +1800,16 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
dialog = triggerInputs, "Trigger Inputs"
field = "!ECU reboot needed to apply these settings"
field = "#Cam is primary if you have cam sensor"
field = "#Cam is primary if you have cam sensor as part of trigger shape"
field = "Primary channel", triggerInputPins1
field = "Invert Primary", invertPrimaryTriggerSignal
field = "Secondary channel", triggerInputPins2, { trigger_type != @@TT_TT_TOOTHED_WHEEL@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_60_2@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_36_1@@ && trigger_type != @@TT_TT_ONE@@ && trigger_type != @@TT_TT_60_2_VW@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_36_2@@}
field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != @@TT_TT_TOOTHED_WHEEL@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_60_2@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_36_1@@ && trigger_type != @@TT_TT_ONE@@ && trigger_type != @@TT_TT_60_2_VW@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_36_2@@}
field = "Cam Sync/VVT input #1", camInputs1
field = "Cam Sync/VVT input #2", camInputs2
field = "Cam Sync/VVT input #3", camInputs3
field = "Cam Sync/VVT input #4", camInputs4
field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != @@TT_TT_TOOTHED_WHEEL@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_60_2@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_36_1@@ && trigger_type != @@TT_TT_ONE@@ && trigger_type != @@TT_TT_60_2_VW@@ && trigger_type != @@TT_TT_TOOTHED_WHEEL_36_2@@}
field = "#VVT or Cam for 60/2 goes here"
field = "Cam Sync/VVT shaft #1 bank #1", camInputs1
field = "VVT shaft #2 bank #1", camInputs2
field = "VVT shaft #1 bank #2", camInputs3
field = "VVT shaft #2 bank #2", camInputs4
field = "Invert Cam/VVT", invertCamVVTSignal
panel = triggerInputComparator @@if_ts_show_trigger_comparator