andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

N73

This commit is contained in:
rusefillc 2022-02-19 20:38:08 -05:00
parent 034efc21c3
commit 70ea61c091
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
firmware/config/engines/bmw_n73.cpp
View File

@ -26,11 +26,23 @@ function setTwoBytes(data, offset, value)
data[offset + 2] = (value >> 8) % 255 data[offset + 2] = (value >> 8) % 255
end 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! -- this controls onCanRx rate as well!
setTickRate(300) setTickRate(300)
-- --
-- crazy copy-pasta, at some point move to sets/bags -- crazy copy-pasta, at some point move to sets/bags
ignitionKeyByte0 = 256
tcuMessages = { } tcuMessages = { }
-- 'ecu' means not-TCU -- 'ecu' means not-TCU
ecuMessages = { } ecuMessages = { }
@ -126,7 +138,14 @@ function onCanRx(bus, id, dlc, data)
printDebug('CAN_BMW_E90_WHEEL_SPEED') printDebug('CAN_BMW_E90_WHEEL_SPEED')
relayToTcu(id, data) relayToTcu(id, data)
elseif id == CAN_BMW_E90_IGNITION_KEY then 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) relayToTcu(id, data)
elseif id == CAN_BMW_E65_GEAR_SELECTOR then elseif id == CAN_BMW_E65_GEAR_SELECTOR then
printDebug('CAN_BMW_E65_GEAR_SELECTOR') printDebug('CAN_BMW_E65_GEAR_SELECTOR')
@ -157,6 +176,10 @@ function onCanRx(bus, id, dlc, data)
relayToEcu(id, data) relayToEcu(id, data)
elseif id == CAN_BMW_GEAR_TRANSMISSION_DATA then elseif id == CAN_BMW_GEAR_TRANSMISSION_DATA then
printDebug('*******CAN_BMW_GEAR_TRANSMISSION_DATA') 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) relayToEcu(id, data)
elseif id == CAN_BMW_GEAR_GEARBOX_DATA_2 then elseif id == CAN_BMW_GEAR_GEARBOX_DATA_2 then
printDebug('*******CAN_BMW_GEAR_GEARBOX_DATA_2') printDebug('*******CAN_BMW_GEAR_GEARBOX_DATA_2')

11
unit_tests/tests/lua/test_lua_e65.cpp
View File

@ -41,6 +41,17 @@ TEST(LuaE65, Rpm) {
EXPECT_NEAR_M3(testLuaReturnsNumberOrNil(realdata).value_or(0), 845); 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) { TEST(LuaE65, sumChecksum) {
// checksum is first byte // checksum is first byte
// id = A8, packet: // id = A8, packet: