From 1bfda63efe57fc3213e799f5e3913e28fe094e0d Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 10 Sep 2015 19:01:32 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/daihatsu.cpp | 2 ++ firmware/controllers/algo/auto_generated_enums.cpp | 2 ++ firmware/controllers/algo/rusefi_enums.h | 3 +++ firmware/controllers/math/engine_math.cpp | 7 ++++++- firmware/rusefi.cpp | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/firmware/config/engines/daihatsu.cpp b/firmware/config/engines/daihatsu.cpp index 106194cb26..c1ec65386e 100644 --- a/firmware/config/engines/daihatsu.cpp +++ b/firmware/config/engines/daihatsu.cpp @@ -11,5 +11,7 @@ EXTERN_ENGINE; void setDaihatsu(DECLARE_ENGINE_PARAMETER_F) { + engineConfiguration->specs.cylindersCount = 3; + engineConfiguration->specs.firingOrder = FO_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6; } diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 6d2a16287b..8cc1c0cf48 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -311,6 +311,8 @@ case FO_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6: return "FO_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6"; case FO_ONE_CYLINDER: return "FO_ONE_CYLINDER"; +case FO_1_2_3: + return "FO_1_2_3"; case Force_4b_firing_order: return "Force_4b_firing_order"; } diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 23ba7b2733..b8d132a9ac 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -276,6 +276,9 @@ typedef enum { // 2 cylinder FO_1_THEN_2 = 8, + // 3 cylinder + FO_1_2_3 = 10, + // 4 cylinder FO_1_THEN_3_THEN_4_THEN2 = 1, FO_1_THEN_2_THEN_4_THEN3 = 2, diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index 854a141eef..21d83ef076 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -297,6 +297,8 @@ static int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 }; static int order_1_2[] = {1, 2}; +static int order_1_2_3[] = {1, 2, 3}; + /** * @param index from zero to cylindersCount - 1 * @return cylinderId from one to cylindersCount @@ -306,9 +308,12 @@ int getCylinderId(firing_order_e firingOrder, int index) { switch (firingOrder) { case FO_ONE_CYLINDER: return 1; - +// 2 cylinder case FO_1_THEN_2: return order_1_2[index]; +// 3 cylinder + case FO_1_2_3: + return order_1_2_3[index]; // 4 cylinder case FO_1_THEN_3_THEN_4_THEN2: return order_1_THEN_3_THEN_4_THEN2[index]; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 11ed014607..cec743e5c8 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -273,5 +273,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20150908; + return 20150910; }