From 6b3c82e80a0be912976985f6c2e04cac61060198 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 12 Dec 2023 17:44:03 -0500 Subject: [PATCH] only: Lua VSS broken for no apparent reson? fix #5759 --- firmware/controllers/algo/rusefi_enums.h | 7 +++---- firmware/controllers/can/can_vss.cpp | 2 -- firmware/integration/rusefi_config.txt | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 1123a99ada..e3b7e6b513 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -330,8 +330,7 @@ typedef enum __attribute__ ((__packed__)) { typedef enum __attribute__ ((__packed__)) { BMW_e46 = 0, W202 = 1, - LUA = 2, - BMW_e90 = 3, + BMW_e90 = 2, } can_vss_nbc_e; /** @@ -414,8 +413,8 @@ typedef enum __attribute__ ((__packed__)) { * For an old Freescale MPX4250D use "MT_MPX4250". * See https://www.nxp.com/docs/en/data-sheet/MPX4250A.pdf */ - MT_MPX4250A = 9, - + MT_MPX4250A = 9, + /** * Bosch 2.5 Bar TMap Map Sensor with IAT diff --git a/firmware/controllers/can/can_vss.cpp b/firmware/controllers/can/can_vss.cpp index e9c0ecc9ff..77f6b57b4f 100644 --- a/firmware/controllers/can/can_vss.cpp +++ b/firmware/controllers/can/can_vss.cpp @@ -25,8 +25,6 @@ expected look_up_can_id(can_vss_nbc_e type) { return 0x1A0; // BMW E90 ABS speed frame (not wheel speeds, vehicle speed) case W202: return 0x0200; /* W202 C180 ABS signal */ - case LUA: - return 0; // a bit of a hack to be able to inject VSS using a Lua script default: firmwareError(ObdCode::OBD_Vehicle_Speed_SensorB, "Wrong Can DBC selected: %d", type); return unexpected; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 8fb953e306..e7269e2967 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1403,7 +1403,7 @@ tChargeMode_e tChargeMode; pid_s idleRpmPid2 - custom can_vss_nbc_e 2 bits, U08, @OFFSET@, [0:1], "BMW_e46", "W202", "Lua", "BMW E8x/E9x MK60e5" + custom can_vss_nbc_e 2 bits, U08, @OFFSET@, [0:1], "BMW_e46", "W202", "BMW E8x/E9x MK60e5" can_vss_nbc_e canVssNbcType gppwm_channel[GPPWM_CHANNELS iterate] gppwm;