This commit is contained in:
rusefillc 2023-02-01 00:15:02 -05:00
parent 6aa7fb89cf
commit 2474b04c85
1 changed files with 33 additions and 48 deletions

View File

@ -1,29 +1,14 @@
-- J2819 TP2.0 vehicle diagnostics protocol -- J2819 TP2.0 vehicle diagnostics protocol
-- very limited implementation -- very limited implementation
-- this controls onCanRx rate as well! -- this controls onCanRx rate as well!
setTickRate(300) tickRate = 100
setTickRate(tickRate)
timeout = 3000 timeout = 3000
--cuType = 0x01 -- ECU
cuType = 0x02 -- TCU cuType = 0x02 -- TCU
if cuType == 0x01 then
cltSensor = Sensor.new("clt")
cltSensor : setTimeout(timeout)
iatSensor = Sensor.new("iat")
iatSensor : setTimeout(timeout)
rpmSensor = Sensor.new("rpm")
rpmSensor : setTimeout(timeout)
mapSensor = Sensor.new("map")
mapSensor : setTimeout(timeout)
end
hexstr = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "A", "B", "C", "D", "E", "F" } hexstr = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "A", "B", "C", "D", "E", "F" }
function toHexString(num) function toHexString(num)
@ -73,14 +58,12 @@ local sendCounter = 0
local packetCounter = 1 local packetCounter = 1
local payLoadIndex = 0 local payLoadIndex = 0
local groups = { 2, 4, 31 }
-- todo: smarter array size calculation?
local groupsSize = 3
local groupIndex = 1 local groupIndex = 1
withErrorCodes = 0 withErrorCodes = 0
byeByeStateCounter = 2
function nextReq() function nextReq()
local result = 0x10 + sendCounter local result = 0x10 + sendCounter
sendCounter = sendCounter + 1 sendCounter = sendCounter + 1
@ -90,17 +73,25 @@ function nextReq()
return result return result
end end
function startTp()
sendCounter = 0
packetCounter = 1
payLoadIndex = 0
print("Starting TP with TCU")
txCan(1, VWTP_OUT, 0, { cuType, 0xC0, 0x00, 0x10, 0x00, 0x03, 0x01 })
end
function requestErrorCodes() function requestErrorCodes()
reqFirst = nextReq() out = { nextReq(), 0x00, 0x04, 0x18, 0x02, 0xFF, 0x00 }
out = { reqFirst, 0x00, 0x04, 0x18, 0x02, 0xFF, 0x00 } txCan(1, cuId, 0, out)
txCan(1, cuId, 0, out) print("Requesting error codes " .. arrayToString(out))
print("Requesting error codes " .. arrayToString(out))
end end
function requestEraseCodes() function requestEraseCodes()
out = { nextReq(), 00, 0x03, 0x14, 0xFF, 0x00 } out = { nextReq(), 00, 0x03, 0x14, 0xFF, 0x00 }
print("Request Code Erase") txCan(1, cuId, 0, out)
txCan(1, cuId, 0, out) print("Requesting to Erase Code(s)")
end end
function onCanTester(bus, id, dlc, data) function onCanTester(bus, id, dlc, data)
@ -108,30 +99,16 @@ function onCanTester(bus, id, dlc, data)
print('Got from tester ' ..arrayToString(data)) print('Got from tester ' ..arrayToString(data))
if data[1] == 0xA3 then if data[1] == 0xA3 then
print ("A3 Keep-alive") print ("A3 Keep-alive")
txCan(1, cuId, 0, { 0xA1, 0x0F, 0x8A, 0xFF, 0x4A, 0xFF }) txCan(1, cuId, 0, { 0xA1, 0x0F, 0x8A, 0xFF, 0x4A, 0xFF })
groupIndex = groupIndex + 1 print ("Keep-alive withErrorCodes=" .. withErrorCodes)
if groupIndex > groupsSize then
groupIndex = 1
end
groupId = groups[groupIndex]
print ("KA codes " .. withErrorCodes)
if withErrorCodes > 0 then if withErrorCodes > 0 then
requestEraseCodes() requestEraseCodes()
end end
-- reqFirst = nextReq
--print("Requesting next group " ..groupId .." with counter " ..sendCounter)
--txCan(1, cuId, 0, { reqFirst, 0x00, 0x02, 0x21, groupId })
return return
end end
@ -144,16 +121,15 @@ function onCanTester(bus, id, dlc, data)
if data[1] == 0xA8 then if data[1] == 0xA8 then
print ("They said Bye-Bye") print ("They said Bye-Bye")
byeByeStateCounter = 3 * tickRate
return return
end end
if data[1] == 0x10 and dlc == 5 then if data[1] == 0x10 and dlc == 5 then
ackPacket = 0xB0 + packetCounter ackPacket = 0xB0 + packetCounter
print ("Sending ACK Bx " ..ackPacket) print ("Sending ACK Bx " ..ackPacket)
txCan(1, cuId, 0, { ackPacket }) txCan(1, cuId, 0, { ackPacket })
if data[3] == 2 and data[4] == 0x50 then if data[3] == 2 and data[4] == 0x50 then
print('Got Hello2 Response ' ..arrayToString(data)) print('Got Hello2 Response ' ..arrayToString(data))
@ -161,7 +137,6 @@ function onCanTester(bus, id, dlc, data)
end end
end end
top4 = math.floor(data[1] / 16) top4 = math.floor(data[1] / 16)
if top4 == 0xB then if top4 == 0xB then
@ -179,7 +154,8 @@ function onCanTester(bus, id, dlc, data)
if len ~= 2 then if len ~= 2 then
print("HAVE CODES " .. len) print("HAVE CODES " .. len)
withErrorCodes = 1 withErrorCodes = 1
else
withErrorCodes = 0
end end
end end
@ -213,8 +189,17 @@ end
canRxAdd(VWTP_IN, onCanHello) canRxAdd(VWTP_IN, onCanHello)
canRxAdd(VWTP_TESTER, onCanTester) canRxAdd(VWTP_TESTER, onCanTester)
txCan(1, VWTP_OUT, 0, { cuType, 0xC0, 0x00, 0x10, 0x00, 0x03, 0x01 }) startTp()
function onTick() function onTick()
if byeByeStateCounter > 0 then
byeByeStateCounter = byeByeStateCounter - 1
end
if byeByeStateCounter == 1 then
startTp()
end
end end