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

Remove Miata MX5 NB1 trigger fix #3488

This commit is contained in:
rusefillc 2022-01-31 18:20:43 -05:00
parent 493dcb4d66
commit 1d64929f33
12 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/CHANGELOG.md
View File

@ -25,6 +25,9 @@ Release template (copy/paste this for new release):
All notable user-facing or behavior-altering changes will be documented in this file.
## Removed
- Miata NB1 trigger was merged with Miata NB2 trigger
## January 2022 Release - "Green Juice"
### Added

2
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -353,7 +353,7 @@ static void setMazdaMiataEngineNB2Defaults() {
engineConfiguration->vvtCamSensorUseRise = true;
// set vvt_mode 3
engineConfiguration->vvtMode[0] = VVT_MIATA_NB2;
engineConfiguration->vvtMode[0] = VVT_MIATA_NB;
engineConfiguration->vvtOffsets[0] = 98; // 2003 red car value
setCommonMazdaNB();

2
firmware/controllers/algo/auto_generated_commonenum.cpp
View File

@ -757,7 +757,7 @@ case VVT_INACTIVE:
return "VVT_INACTIVE";
case VVT_MAP_V_TWIN_ANOTHER:
return "VVT_MAP_V_TWIN_ANOTHER";
case VVT_MIATA_NB2:
case VVT_MIATA_NB:
return "VVT_MIATA_NB2";
case VVT_NISSAN_MR:
return "VVT_NISSAN_MR";

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

@ -522,7 +522,7 @@ case TT_VVT_BOSCH_QUICK_START:
return "TT_VVT_BOSCH_QUICK_START";
case TT_VVT_JZ:
return "TT_VVT_JZ";
case TT_VVT_MIATA_NB2:
case TT_VVT_MIATA_NB:
return "TT_VVT_MIATA_NB2";
case TT_VVT_NISSAN_VQ35:
return "TT_VVT_NISSAN_VQ35";

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

@ -81,8 +81,8 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
return TT_ONE;
case VVT_2JZ:
return TT_VVT_JZ;
case VVT_MIATA_NB2:
return TT_VVT_MIATA_NB2;
case VVT_MIATA_NB:
return TT_VVT_MIATA_NB;
case VVT_BOSCH_QUICK_START:
return TT_VVT_BOSCH_QUICK_START;
case VVT_HONDA_K:

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

@ -456,7 +456,7 @@ typedef enum {
/**
* cam sensor of Mazda Miata NB2 - the VVT signal shape
*/
TT_VVT_MIATA_NB2 = 43,
TT_VVT_MIATA_NB = 43,
TT_RENIX_44_2_2 = 44,

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

@ -85,9 +85,9 @@ typedef enum __attribute__ ((__packed__)) {
VVT_2JZ = 2,
/**
* Mazda NB2 has three cam tooth. We synchronize based on gap ratio.
* @see TT_VVT_MIATA_NB2
* @see TT_VVT_MIATA_NB
*/
VVT_MIATA_NB2 = 3,
VVT_MIATA_NB = 3,
/**
* Single-tooth cam sensor mode where TDC and cam signal happen in the same 360 degree of 720 degree engine cycle

4
firmware/controllers/trigger/decoders/trigger_mazda.cpp
View File

@ -120,10 +120,6 @@ static void initializeMazdaMiataNb1ShapeWithOffset(TriggerWaveform *s, float off
s->addEvent720(720.0f, T_PRIMARY, TV_RISE);
}
void initializeMazdaMiataNb1Shape(TriggerWaveform *s) {
initializeMazdaMiataNb1ShapeWithOffset(s, 0);
}
void initializeMazdaMiataVVtTestShape(TriggerWaveform *s) {
initializeMazdaMiataNb1ShapeWithOffset(s, -22);
}

1
firmware/controllers/trigger/decoders/trigger_mazda.h
View File

@ -10,7 +10,6 @@
#include "trigger_structure.h"
void initializeMazdaMiataNaShape(TriggerWaveform *s);
void initializeMazdaMiataNb1Shape(TriggerWaveform *s);
void initializeMazdaMiataNb2Crank(TriggerWaveform *s);
void initializeMazdaMiataVVtTestShape(TriggerWaveform *s);
void configureMazdaProtegeSOHC(TriggerWaveform *s);

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

@ -462,9 +462,12 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat
break;
case TT_MAZDA_MIATA_NB1:
initializeMazdaMiataNb1Shape(this);
#if EFI_PROD_CODE
// todo: remove this fatal and remove 'TT_MAZDA_MIATA_NB1' in May of 2022
firmwareError(CUSTOM_ERR_TEST_ERROR, "Miata NB1 needs to adjust trigger configuration");
#endif
initializeMazdaMiataVVtTestShape(this);
break;
case TT_MAZDA_MIATA_VVT_TEST:
initializeMazdaMiataVVtTestShape(this);
break;
@ -481,7 +484,7 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat
configureFordST170(this);
break;
case TT_VVT_MIATA_NB2:
case TT_VVT_MIATA_NB:
initializeMazdaMiataVVtCamShape(this);
break;

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

@ -148,7 +148,7 @@ static angle_t adjustCrankPhase(int camIndex) {
case VVT_NISSAN_VQ:
case VVT_BOSCH_QUICK_START:
return syncAndReport(tc, getCrankDivider(operationMode), 0);
case VVT_MIATA_NB2:
case VVT_MIATA_NB:
/**
* NB2 is a symmetrical crank, there are four phases total
*/

2
firmware/integration/rusefi_config.txt
View File

@ -580,7 +580,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", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi", "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 VVT", "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", "INVALID", "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", "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", "INVALID", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "trg70", "trg71"
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