auto-sync

This commit is contained in:
rusEfi 2016-05-22 13:07:12 -04:00
parent 3b88749d29
commit 99f9ea3998
7 changed files with 32 additions and 3 deletions

View File

@ -121,6 +121,8 @@ case Force_4b_trigger_type:
return "Force_4b_trigger_type"; return "Force_4b_trigger_type";
case TT_DODGE_NEON_1995: case TT_DODGE_NEON_1995:
return "TT_DODGE_NEON_1995"; return "TT_DODGE_NEON_1995";
case TT_GM_LS_24:
return "TT_GM_LS_24";
case TT_DODGE_NEON_2003: case TT_DODGE_NEON_2003:
return "TT_DODGE_NEON_2003"; return "TT_DODGE_NEON_2003";
case TT_FORD_ASPIRE: case TT_FORD_ASPIRE:
@ -350,6 +352,8 @@ case FO_ONE_CYLINDER:
return "FO_ONE_CYLINDER"; return "FO_ONE_CYLINDER";
case FO_1_2_3: case FO_1_2_3:
return "FO_1_2_3"; return "FO_1_2_3";
case FO_1_8_7_2_6_5_4_3:
return "FO_1_8_7_2_6_5_4_3";
case Force_4b_firing_order: case Force_4b_firing_order:
return "Force_4b_firing_order"; return "Force_4b_firing_order";
} }

View File

@ -177,7 +177,9 @@ typedef enum {
TT_ROVER_K = 26, TT_ROVER_K = 26,
TT_UNUSED = 27, // this is used if we want to iterate over all trigger types TT_GM_LS_24 = 27,
TT_UNUSED = 28, // this is used if we want to iterate over all trigger types
Force_4b_trigger_type = ENUM_32_BITS, Force_4b_trigger_type = ENUM_32_BITS,
} trigger_type_e; } trigger_type_e;

View File

@ -319,6 +319,8 @@ static int order_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6[] = { 1, 2, 3, 4, 5, 6 };
static int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 }; static int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 };
static int order_1_8_7_2_6_5_4_3[] = { 1, 8, 7, 2, 6, 5, 4, 3 };
static int order_1_2[] = {1, 2}; static int order_1_2[] = {1, 2};
static int order_1_2_3[] = {1, 2, 3}; static int order_1_2_3[] = {1, 2, 3};
@ -360,6 +362,8 @@ int getCylinderId(firing_order_e firingOrder, int index) {
// 8 cylinder // 8 cylinder
case FO_1_8_4_3_6_5_7_2: case FO_1_8_4_3_6_5_7_2:
return order_1_8_4_3_6_5_7_2[index]; return order_1_8_4_3_6_5_7_2[index];
case FO_1_8_7_2_6_5_4_3:
return order_1_8_7_2_6_5_4_3[index];
default: default:
warning(OBD_PCM_Processor_Fault, "getCylinderId not supported for %d", firingOrder); warning(OBD_PCM_Processor_Fault, "getCylinderId not supported for %d", firingOrder);

View File

@ -528,6 +528,10 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
initializeRoverK(triggerShape); initializeRoverK(triggerShape);
break; break;
case TT_GM_LS_24:
initGmLS24(triggerShape);
break;
default: default:
firmwareError("initializeTriggerShape() not implemented: %d", triggerConfig->type); firmwareError("initializeTriggerShape() not implemented: %d", triggerConfig->type);
return; return;

View File

@ -7,6 +7,7 @@
#include "trigger_gm.h" #include "trigger_gm.h"
// GM7X looks like this is not complete
void configureGmTriggerShape(TriggerShape *s) { void configureGmTriggerShape(TriggerShape *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR, false); s->initialize(FOUR_STROKE_CAM_SENSOR, false);
@ -35,3 +36,16 @@ void configureGmTriggerShape(TriggerShape *s) {
s->addEvent(720.0, T_PRIMARY, TV_FALL); s->addEvent(720.0, T_PRIMARY, TV_FALL);
} }
/**
* https://www.mediafire.com/?40mfgeoe4ctti
* http://www.ls1gto.com/forums/archive/index.php/t-190549.htm
* http://www.ls2.com/forums/showthread.php/834483-LS-Timing-Reluctor-Wheels-Explained
*
*/
void initGmLS24(TriggerShape *s) {
// todo: finish this
setToothedWheelConfiguration(s, 24, 0, FOUR_STROKE_CRANK_SENSOR);
}

View File

@ -11,5 +11,6 @@
#include "trigger_structure.h" #include "trigger_structure.h"
void configureGmTriggerShape(TriggerShape *s); void configureGmTriggerShape(TriggerShape *s);
void initGmLS24(TriggerShape *s);
#endif /* TRIGGER_GM_H_ */ #endif /* TRIGGER_GM_H_ */

View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header // This file was generated by Version2Header
// Thu May 19 21:51:00 EDT 2016 // Sun May 22 12:33:02 EDT 2016
#ifndef VCS_VERSION #ifndef VCS_VERSION
#define VCS_VERSION "9916" #define VCS_VERSION "9923"
#endif #endif