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

new VVT trigger shape? #1847

This commit is contained in:
Andrey 2022-03-22 06:34:22 -04:00
parent ecf302faf2
commit b3fdd790b5
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/auto_generated_enginetypes.cpp
View File

@ -512,6 +512,7 @@ case TT_VVT_MIATA_NB:
return "TT_VVT_MIATA_NB";
case TT_VVT_MITSUBISHI_3A92:
return "TT_VVT_MITSUBISHI_3A92";
case TT_VVT_TOYOTA_4_1:
case TT_VVT_MITSUBISHI_6G75:
return "TT_VVT_MITSUBISHI_6G75";
case TT_VVT_NISSAN_VQ35:

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

@ -76,7 +76,6 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
case VVT_BOSCH_QUICK_START:
return TT_VVT_BOSCH_QUICK_START;
case VVT_HONDA_K:
case VVT_TOYOTA_4_1:
case VVT_FIRST_HALF:
case VVT_SECOND_HALF:
case VVT_MAP_V_TWIN_ANOTHER:
@ -87,6 +86,8 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
return TT_VVT_BARRA_3_PLUS_1;
case VVT_NISSAN_VQ:
return TT_VVT_NISSAN_VQ35;
case VVT_TOYOTA_4_1:
return TT_VVT_TOYOTA_4_1;
case VVT_MITSUBISHI_3A92:
return TT_VVT_MITSUBISHI_3A92;
case VVT_MITSUBISHI_6G75:

4
firmware/controllers/algo/engine_types.h
View File

@ -516,13 +516,15 @@ typedef enum {
TT_VVT_MITSUBISHI_6G75 = 72,
TT_VVT_TOYOTA_4_1 = 73,
// 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
// 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
//
TT_UNUSED = 73, // this is used if we want to iterate over all trigger types
TT_UNUSED = 74, // this is used if we want to iterate over all trigger types
// todo: convert to ENUM_16_BITS? I can see 257 triggers but not 65K triggers
Force_4_bytes_size_trigger_type = ENUM_32_BITS,

1
firmware/controllers/algo/rusefi_enums.h
View File

@ -101,7 +101,6 @@ typedef enum __attribute__ ((__packed__)) {
/**
* 1.8l Toyota 1ZZ-FE https://rusefi.com/forum/viewtopic.php?f=3&t=1735
* 4 minus one
* looks abandoned and unfinished?
*/
VVT_TOYOTA_4_1 = 6,

1
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -536,6 +536,7 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat
initializeVvt3A92(this);
break;
case TT_VVT_TOYOTA_4_1:
case TT_VVT_MITSUBISHI_6G75:
case TT_NISSAN_QR25:
initializeNissanQR25crank(this);

2
firmware/integration/rusefi_config.txt
View File

@ -577,7 +577,7 @@ adc_channel_e fuelLevelSensor;+This is the processor pin that your fuel level se
struct trigger_config_s @brief Trigger wheel(s) configuration
#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "trg70", "trg71"
#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "trg72", "trg73", "trg74", "trg75"
custom trigger_type_e 4 bits, U32, @OFFSET@, [0:6], @@trigger_type_e_enum@@
trigger_type_e type;+https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X