From 7df4f36f88389cf66f1e8f6587c21676077cb3e1 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 8 May 2022 07:10:54 -0400 Subject: [PATCH] Revert "Ford Mustang firing order 1-5-4-2-6-3-7-8 fix #4150" This reverts commit 76243afa9c86bf08425fc8704eda1104284825cc. --- firmware/CHANGELOG.md | 1 - firmware/controllers/algo/firing_order.h | 3 +-- firmware/controllers/math/engine_math.cpp | 4 ---- firmware/integration/rusefi_config.txt | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md index b8d6f174eb..61a840eda0 100644 --- a/firmware/CHANGELOG.md +++ b/firmware/CHANGELOG.md @@ -26,7 +26,6 @@ Release template (copy/paste this for new release): ### Added - FasterEngineSpinUp should be enabled by default #4094 - ETB low limit is now configurable #4119 - - Ford Mustang firing order 1-5-4-2-6-3-7-8 #4150 ### Fixed - Make 36-2 trigger sync parameters more generous #4132 diff --git a/firmware/controllers/algo/firing_order.h b/firmware/controllers/algo/firing_order.h index 2b6dfc29c2..232d618894 100644 --- a/firmware/controllers/algo/firing_order.h +++ b/firmware/controllers/algo/firing_order.h @@ -56,7 +56,6 @@ typedef enum __attribute__ ((__packed__)) { FO_1_2_3_4_5_6_7_8 = 25, // linearly incrementing, for V8 testing FO_1_5_4_8_6_3_7_2 = 26, // Audi 4.2 40v V8 FO_1_8_7_3_6_5_4_2 = 28, // VH41DE (Japaneese Y32 Variant) - FO_1_5_4_2_6_3_7_8 = 32, // Ford Mustang // 9 cylinder - for instance radial :) // PS: Matt says that 9cyl is actually 1-3-5-7-9-2-4-6-8 or 1-8-6-4-2-9-7-5-3 for reverse rotation @@ -79,6 +78,6 @@ typedef enum __attribute__ ((__packed__)) { // unfortunately not supported by default firmware because MAX_CYLINDER_COUNT=12 by default FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16 - // next value to use: 33 + // next value to use: 32 } firing_order_e; diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index df03451f10..5dc2ca5751 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -142,7 +142,6 @@ static const uint8_t order_1_3_7_2_6_5_4_8[] = { 1, 3, 7, 2, 6, 5, 4, 8 }; static const uint8_t order_1_2_3_4_5_6_7_8[] = { 1, 2, 3, 4, 5, 6, 7, 8 }; static const uint8_t order_1_5_4_8_6_3_7_2[] = { 1, 5, 4, 8, 6, 3, 7, 2 }; static const uint8_t order_1_8_7_3_6_5_4_2[] = { 1, 8, 7, 3, 6, 5, 4, 2 }; -static const uint8_t order_1_5_4_2_6_3_7_8[] = { 1, 5, 4, 2, 6, 3, 7, 8 }; // 9 cylinder static const uint8_t order_1_2_3_4_5_6_7_8_9[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; @@ -201,7 +200,6 @@ static size_t getFiringOrderLength() { case FO_1_2_3_4_5_6_7_8: case FO_1_5_4_8_6_3_7_2: case FO_1_8_7_3_6_5_4_2: - case FO_1_5_4_2_6_3_7_8: return 8; // 9 cylinder radial @@ -289,8 +287,6 @@ static const uint8_t* getFiringOrderTable() return order_1_5_4_8_6_3_7_2; case FO_1_8_7_3_6_5_4_2: return order_1_8_7_3_6_5_4_2; - case FO_1_5_4_2_6_3_7_8: - return order_1_5_4_2_6_3_7_8; // 9 cylinder diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ae4703bf6c..5692c66ccd 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -510,7 +510,7 @@ uint32_t cylindersCount;Number of cylinder the engine has.;"", 1, 0, 1, @@MAX_CY ! FO_1_8_4_3_6_5_7_2 = 5 ! FO_1_2_4_5_3 = 6 -custom firing_order_e 1 bits, U08, @OFFSET@, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "1-5-4-2-6-3-7-8", "fo33", "fo34", "fo35", "fo36", "fo37" +custom firing_order_e 1 bits, U08, @OFFSET@, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" firing_order_e firingOrder; end_struct