Merge remote-tracking branch 'technical-git/master'
This commit is contained in:
commit
5c5fe45c9d
14
B6-temp.md
14
B6-temp.md
|
@ -192,13 +192,6 @@ function onMotor6(bus, id, dlc, data)
|
||||||
txCan(TCU_BUS, id, 0, motor6Data)
|
txCan(TCU_BUS, id, 0, motor6Data)
|
||||||
end
|
end
|
||||||
|
|
||||||
function silentDrop(bus, id, dlc, data)
|
|
||||||
end
|
|
||||||
|
|
||||||
function printAndDrop(bus, id, dlc, data)
|
|
||||||
print('Dropping ' ..arrayToString(data))
|
|
||||||
end
|
|
||||||
|
|
||||||
function onMotorInfo(bus, id, dlc, data)
|
function onMotorInfo(bus, id, dlc, data)
|
||||||
-- print("Relaying to TCU " .. id)
|
-- print("Relaying to TCU " .. id)
|
||||||
txCan(TCU_BUS, id, 0, data) -- relay non-TCU message to TCU
|
txCan(TCU_BUS, id, 0, data) -- relay non-TCU message to TCU
|
||||||
|
@ -216,6 +209,13 @@ end
|
||||||
function onMotor2(bus, id, dlc, data)
|
function onMotor2(bus, id, dlc, data)
|
||||||
minTorque = fakeTorque / 2
|
minTorque = fakeTorque / 2
|
||||||
motor2Data[7] = math.floor(minTorque / 0.39)
|
motor2Data[7] = math.floor(minTorque / 0.39)
|
||||||
|
|
||||||
|
print ( "brake " .. getBitRange(data, 16, 2) .. " " .. rpm)
|
||||||
|
|
||||||
|
brakeBit = rpm < 2000 and 1 or 0
|
||||||
|
setBitRange(motor2Data, 16, 1, brakeBit)
|
||||||
|
|
||||||
|
|
||||||
txCan(TCU_BUS, id, 0, data) -- relay non-TCU message to TCU
|
txCan(TCU_BUS, id, 0, data) -- relay non-TCU message to TCU
|
||||||
-- txCan(TCU_BUS, id, 0, motor2Data)
|
-- txCan(TCU_BUS, id, 0, motor2Data)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue