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

E65

This commit is contained in:
rusefillc 2021-12-29 00:50:17 -05:00
parent d7619d8a05
commit 4bc9c39044
2 changed files with 55 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ CAN_BMW_E90_TORQUE_DEMAND = 0x0B6
CAN_BMW_E90_IGNITION_KEY = 0x130 CAN_BMW_E90_IGNITION_KEY = 0x130
CAN_BMW_E65_GEAR_SELECTOR = 0x192 CAN_BMW_E65_GEAR_SELECTOR = 0x192
CAN_BMW_E90_COOLANT = 0x1D0 CAN_BMW_E90_COOLANT = 0x1D0
CAN_BMW_E90_LOCKING = 0x2FC
CAN_BMW_E90_DASH_ON = 0x332 CAN_BMW_E90_DASH_ON = 0x332
CAN_BMW_GEAR_TORQUE_DEMAND2 = 0x0B5 CAN_BMW_GEAR_TORQUE_DEMAND2 = 0x0B5
@ -43,6 +44,7 @@ canRxAdd(CAN_BMW_E90_TORQUE_DEMAND)
canRxAdd(CAN_BMW_E90_IGNITION_KEY) canRxAdd(CAN_BMW_E90_IGNITION_KEY)
canRxAdd(CAN_BMW_E65_GEAR_SELECTOR) canRxAdd(CAN_BMW_E65_GEAR_SELECTOR)
canRxAdd(CAN_BMW_E90_COOLANT) canRxAdd(CAN_BMW_E90_COOLANT)
canRxAdd(CAN_BMW_E90_LOCKING)
canRxAdd(CAN_BMW_E90_DASH_ON) canRxAdd(CAN_BMW_E90_DASH_ON)
canRxAdd(CAN_BMW_GEAR_TORQUE_DEMAND2) canRxAdd(CAN_BMW_GEAR_TORQUE_DEMAND2)
@ -56,58 +58,71 @@ canRxAdd(CAN_BMW_GEAR_SERVICE)
txPayload = { } txPayload = { }
function relayToTcu(id, data)
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU
end
function printDebug(msg)
print(msg)
end
function onCanRx(bus, id, dlc, data) function onCanRx(bus, id, dlc, data)
id = id % 2048 id = id % 2048
-- local output = string.format("%x", id) -- local output = string.format("%x", id)
if id == CAN_BMW_E90_IGNITION_KEY then if id == CAN_BMW_E90_IGNITION_KEY then
print('!!!!!!!!!!!!! CAN_BMW_E90_IGNITION_KEY') printDebug('!!!!!!!!!!!!! CAN_BMW_E90_IGNITION_KEY')
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E90_TORQUE_1 then elseif id == CAN_BMW_E90_TORQUE_1 then
print('CAN_BMW_E90_TORQUE_1') TORQ_AVL = 0.5 * (twoBytes(data, 1, 1) >> 4)
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU TORQ_AVL_DMEE = 0.5 * (twoBytes(data, 3, 1) >> 4)
print('CAN_BMW_E90_TORQUE_1 ' .. TORQ_AVL .. TORQ_AVL_DMEE)
relayToTcu(id, data)
elseif id == CAN_BMW_E90_TORQUE_2 then elseif id == CAN_BMW_E90_TORQUE_2 then
print('CAN_BMW_E90_TORQUE_2') printDebug('CAN_BMW_E90_TORQUE_2')
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E90_TORQUE_DEMAND then elseif id == CAN_BMW_E90_TORQUE_DEMAND then
print('CAN_BMW_E90_TORQUE_DEMAND') printDebug('CAN_BMW_E90_TORQUE_DEMAND')
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E90_DASH_ON then elseif id == CAN_BMW_E90_DASH_ON then
print('CAN_BMW_E90_DASH_ON') printDebug('CAN_BMW_E90_DASH_ON')
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E65_GEAR_SELECTOR then elseif id == CAN_BMW_E65_GEAR_SELECTOR then
print('CAN_BMW_E65_GEAR_SELECTOR') printDebug('CAN_BMW_E65_GEAR_SELECTOR')
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E65_GEAR_SELECTOR then elseif id == CAN_BMW_E65_GEAR_SELECTOR then
print('CAN_BMW_E65_GEAR_SELECTOR') printDebug('CAN_BMW_E65_GEAR_SELECTOR')
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E90_RPM_THROTTLE then elseif id == CAN_BMW_E90_RPM_THROTTLE then
rpm = twoBytes(data, 4, 0.25) rpm = twoBytes(data, 4, 0.25)
print('CAN_BMW_E90_RPM_THROTTLE ' .. rpm) print('CAN_BMW_E90_RPM_THROTTLE ' .. rpm)
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E90_COOLANT then elseif id == CAN_BMW_E90_COOLANT then
print('CAN_BMW_E90_COOLANT') printDebug('CAN_BMW_E90_COOLANT')
txCan(GEAR_BUS, id, 0, data) -- relay non-TCU message to TCU relayToTcu(id, data)
elseif id == CAN_BMW_E90_LOCKING then
printDebug('CAN_BMW_E90_LOCKING')
relayToTcu(id, data)
elseif id == CAN_BMW_GEAR_TORQUE_DEMAND2 then elseif id == CAN_BMW_GEAR_TORQUE_DEMAND2 then
print('*******CAN_BMW_GEAR_TORQUE_DEMAND2') printDebug('*******CAN_BMW_GEAR_TORQUE_DEMAND2')
txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU
elseif id == CAN_BMW_GEAR_TRANSMISSION_DATA then elseif id == CAN_BMW_GEAR_TRANSMISSION_DATA then
print('*******CAN_BMW_GEAR_TRANSMISSION_DATA') printDebug('*******CAN_BMW_GEAR_TRANSMISSION_DATA')
txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU
elseif id == CAN_BMW_GEAR_TRANSMISSION_DISP then elseif id == CAN_BMW_GEAR_TRANSMISSION_DISP then
print('*******CAN_BMW_GEAR_TRANSMISSION_DISP') printDebug('*******CAN_BMW_GEAR_TRANSMISSION_DISP')
txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU
elseif id == CAN_BMW_GEAR_GANG_STATUS then elseif id == CAN_BMW_GEAR_GANG_STATUS then
print('*******CAN_BMW_GEAR_GANG_STATUS') printDebug('*******CAN_BMW_GEAR_GANG_STATUS')
txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU
elseif id == CAN_BMW_GEAR_GEARBOX_DATA_2 then elseif id == CAN_BMW_GEAR_GEARBOX_DATA_2 then
print('CAN_BMW_GEAR_GEARBOX_DATA_2') printDebug('CAN_BMW_GEAR_GEARBOX_DATA_2')
txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU
elseif id == CAN_BMW_GEAR_NETWORK then elseif id == CAN_BMW_GEAR_NETWORK then
print('CAN_BMW_GEAR_NETWORK') printDebug('CAN_BMW_GEAR_NETWORK')
txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU
elseif id == CAN_BMW_GEAR_SERVICE then elseif id == CAN_BMW_GEAR_SERVICE then
print('CAN_BMW_GEAR_SERVICE') printDebug('CAN_BMW_GEAR_SERVICE')
txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU txCan(ECU_BUS, id, 0, data) -- relay TCU message to non-TCU
else else
end end

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

@ -17,6 +17,18 @@ TEST(LuaE65, Battery) {
EXPECT_NEAR_M3(testLuaReturnsNumberOrNil(realdata).value_or(0), 14.5236); EXPECT_NEAR_M3(testLuaReturnsNumberOrNil(realdata).value_or(0), 14.5236);
} }
// https://github.com/HeinrichG-V12/E65_ReverseEngineering/blob/main/docs/0x0A8.md
TEST(LuaE65, extractTorqueFromA8) {
const char* realdata = TWO_BYTES R"(
function testFunc()
data = { 0x42, 0x89, 0x10, 0x80, 0x10, 0x0F, 0x00, 0x60 }
return 0.5 * (twoBytes(data, 1, 1) >> 4)
end
)";
EXPECT_NEAR_M3(testLuaReturnsNumberOrNil(realdata).value_or(0), 0x108 / 2);
}
// http://loopybunny.co.uk/CarPC/can/0AA.html // http://loopybunny.co.uk/CarPC/can/0AA.html
TEST(LuaE65, Rpm) { TEST(LuaE65, Rpm) {
const char* realdata = TWO_BYTES R"( const char* realdata = TWO_BYTES R"(
@ -36,13 +48,13 @@ TEST(LuaE65, sumChecksum) {
const char* realdata = R"( const char* realdata = R"(
function bmwChecksum(canID, data, offset, length) function bmwChecksum(canID, data, offset, length)
checksum = canID checksum = canID
for i = offset, offset + length - 1,1 for i = offset, offset + length - 1,1
do do
checksum = checksum + data[i] checksum = checksum + data[i]
end end
checksum = math.floor (checksum / 0x100) + (checksum & 0xff) checksum = (checksum >> 8) + (checksum & 0xff)
return checksum return checksum
end end