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

nissan 4/360 progress

This commit is contained in:
rusefi 2017-04-02 17:59:01 -04:00
parent cbc77ef07b
commit 1f5ff28a0a
6 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/nissan_primera.cpp
View File

@ -16,4 +16,8 @@ void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfigura
engineConfiguration->trigger.type = TT_NISSAN_SR20VE;
}
void setNissanPrimeraEngineConfiguration_360(engine_configuration_s *engineConfiguration) {
engineConfiguration->trigger.type = TT_NISSAN_SR20VE_360;
}
#endif /* EFI_SUPPORT_NISSAN_PRIMERA */

2
firmware/config/engines/nissan_primera.h
View File

@ -15,6 +15,8 @@
#include "engine_configuration.h"
void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration);
void setNissanPrimeraEngineConfiguration_360(engine_configuration_s *engineConfiguration);
#endif /* EFI_SUPPORT_NISSAN_PRIMERA */
#endif /* NISSAN_PRIMERA_H_ */

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

@ -215,8 +215,8 @@ case TT_2JZ_3_34:
return "TT_2JZ_3_34";
case TT_ROVER_K:
return "TT_ROVER_K";
case TT_TEMP_WIP:
return "TT_TEMP_WIP";
case TT_NISSAN_SR20VE_360:
return "TT_NISSAN_SR20VE_360";
}
return NULL;
}

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

@ -244,7 +244,7 @@ typedef enum {
TT_JEEP_18_2_2_2 = 37,
TT_TEMP_WIP = 38,
TT_NISSAN_SR20VE_360 = 38,
TT_UNUSED = 39, // this is used if we want to iterate over all trigger types

20
firmware/controllers/trigger/decoders/trigger_nissan.cpp
View File

@ -6,6 +6,7 @@
*/
#include "trigger_nissan.h"
#include "trigger_universal.h"
static void initializeNissanSR20VE_4_optional_360(TriggerShape *s, bool with2nd DECLARE_ENGINE_PARAMETER_S) {
s->initialize(FOUR_STROKE_CAM_SENSOR, with2nd);
@ -18,9 +19,24 @@ static void initializeNissanSR20VE_4_optional_360(TriggerShape *s, bool with2nd
float w = 5;
s->setTriggerSynchronizationGap2(9.67 * 0.75, 16);
float left = 0;
float right;
int total = 360; // 360 on cam, over 720 crank degree
float base = 180;
s->addEvent2(base - 15, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER);
s->addEvent2(base, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER);
right = base - 15;
if (with2nd) {
addSkippedToothTriggerEvents(T_PRIMARY, s, total, 0, 0.5, 0, 720,
left, right PASS_ENGINE_PARAMETER);
}
s->addEvent2(right, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER);
right = base;
s->addEvent2(right, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER);
// was is the the one with 360 opto sensor?

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

@ -637,7 +637,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
initializeNissanSR20VE_4(this PASS_ENGINE_PARAMETER);
break;
case TT_TEMP_WIP:
case TT_NISSAN_SR20VE_360:
initializeNissanSR20VE_4_360(this PASS_ENGINE_PARAMETER);
break;