From 70ea61c091b5c8e5eeeee3ae10bd131c1928c99d Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 19 Feb 2022 20:38:08 -0500
Subject: [PATCH] N73

---
 firmware/config/engines/bmw_n73.cpp   | 25 ++++++++++++++++++++++++-
 unit_tests/tests/lua/test_lua_e65.cpp | 11 +++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/firmware/config/engines/bmw_n73.cpp b/firmware/config/engines/bmw_n73.cpp
index 68d5cc1907..e5f7c7fda4 100644
--- a/firmware/config/engines/bmw_n73.cpp
+++ b/firmware/config/engines/bmw_n73.cpp
@@ -26,11 +26,23 @@ function setTwoBytes(data, offset, value)
 	data[offset + 2] = (value >> 8) % 255
 end
 
+	function bmwChecksum(canID, data, offset, length)
+		checksum = canID
+		for i = offset, offset + length - 1,1
+		do
+	   		checksum = checksum + data[i]
+		end
+		checksum = (checksum >> 8) + (checksum & 0xff)
+		return checksum
+	end
+
 -- this controls onCanRx rate as well!
 setTickRate(300)
 --
 -- crazy copy-pasta, at some point move to sets/bags
 
+ignitionKeyByte0 = 256
+
 tcuMessages = { }
 -- 'ecu' means not-TCU
 ecuMessages = { }
@@ -126,7 +138,14 @@ function onCanRx(bus, id, dlc, data)
 		printDebug('CAN_BMW_E90_WHEEL_SPEED')
 		relayToTcu(id, data)
 	elseif id == CAN_BMW_E90_IGNITION_KEY then
-		printDebug('!!!!!!!!!!!!! CAN_BMW_E90_IGNITION_KEY')
+		if ignitionKeyByte0 != data[1] then
+		    ignitionKeyByte0 = data[1]
+		    if ignitionKeyByte0 == 0x55
+  		        printDebug('!!!!!!!!!!!!! CAN_BMW_E90_IGNITION_KEY CRANKING')
+  		    elseif
+  		        printDebug('!!!!!!!!!!!!! CAN_BMW_E90_IGNITION_KEY ' .. ignitionKeyByte0)
+            end
+  		end
 		relayToTcu(id, data)
 	elseif id == CAN_BMW_E65_GEAR_SELECTOR then
 		printDebug('CAN_BMW_E65_GEAR_SELECTOR')
@@ -157,6 +176,10 @@ function onCanRx(bus, id, dlc, data)
 		relayToEcu(id, data)
 	elseif id == CAN_BMW_GEAR_TRANSMISSION_DATA then
 		printDebug('*******CAN_BMW_GEAR_TRANSMISSION_DATA')
+		gearBits = data[1] & 0xF
+		if (gearBits >= 5 && gearBits <= 0xA) then
+		    printDebug('*******CAN_BMW_GEAR_TRANSMISSION_DATA gear ' .. (gearBits - 4))
+		end
 		relayToEcu(id, data)
 	elseif id == CAN_BMW_GEAR_GEARBOX_DATA_2 then
 		printDebug('*******CAN_BMW_GEAR_GEARBOX_DATA_2')
diff --git a/unit_tests/tests/lua/test_lua_e65.cpp b/unit_tests/tests/lua/test_lua_e65.cpp
index 67955ed9dc..db0bc1a28a 100644
--- a/unit_tests/tests/lua/test_lua_e65.cpp
+++ b/unit_tests/tests/lua/test_lua_e65.cpp
@@ -41,6 +41,17 @@ TEST(LuaE65, Rpm) {
 	EXPECT_NEAR_M3(testLuaReturnsNumberOrNil(realdata).value_or(0), 845);
 }
 
+TEST(LuaE65, gear) {
+	const char* realdata = TWO_BYTES R"(
+
+	function testFunc()
+		data = {0x58}
+		return data[1] & 0xF
+	end)";
+
+	EXPECT_NEAR_M3(testLuaReturnsNumberOrNil(realdata).value_or(0), 8);
+}
+
 TEST(LuaE65, sumChecksum) {
 	// checksum is first byte
 	// id = A8, packet: