diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1757f4d..da50fae 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,6 @@ - @@ -26,13 +25,13 @@ + - + @@ -84,6 +83,7 @@ + diff --git a/kx.py b/kx.py index f38f70d..81e47b1 100644 --- a/kx.py +++ b/kx.py @@ -48,9 +48,8 @@ class KX: def writeToFlashK(self): - msg = protocol_kx.CANMsgK(self.sbl_id, 0, protocol_kx.KX_FLAG_WRITE_REQ, K) messageK = can.Message(arbitration_id=0x2BB, data=[self.sbl_id, 0, 0, - protocol_kx.KX_FLAG_WRITE_REQ], is_extended_id=False) + protocol_kx.KX_FLAG_SEND], is_extended_id=False) try: self.can0.send(messageK) time.sleep(0.01) @@ -59,19 +58,12 @@ class KX: print("Flash NOT sent") - def send_test_source_enable(self, x, y, xVel, yVel): - resetMsg = can.Message( - arbitration_id=0xA, - data=[ - 0x53, - 0xFF, - struct.pack('b', int(x))[0], - struct.pack('B', int(y))[0], - struct.pack('b', int(xVel))[0], - struct.pack('b', int(yVel))[0], - 0x68, - 0xA4 - ], - is_extended_id=False - ) - self.can0.send(resetMsg) \ No newline at end of file + def send_test_source_enable(self, enabaled): + msg = protocol_kx.CANMsgK(self.sbl_id, 0, protocol_kx.KX_FLAG_WRITE_REQ, K) + messageK = can.Message(arbitration_id=0x2BB, data=[self.sbl_id, protocol_kx.KDescription.K_TEST_SOURCES_ENABLED, 0, + protocol_kx.KX_FLAG_WRITE_REQ, 0, 0, 0, enabaled], is_extended_id=False) + self.can0.send(messageK) + self.sendK() + self.writeToFlashK() + time.sleep(0.1) + self.reset() \ No newline at end of file diff --git a/main.py b/main.py index cbf17c1..cddbdae 100644 --- a/main.py +++ b/main.py @@ -3,12 +3,12 @@ import can import protocol_kx import struct import os -import time can0 = can.interface.Bus(bustype='socketcan', channel='can0', bitrate=500000) KXLOX = kx.KX(protocol_kx.KDescription.K_TEST_SOURCE_2_SIGLVL.value, 950, 255, can0) +KXLOX.send_test_source_enable(0) KXLOX.KXInit(protocol_kx.KDescription.K_SBL_ID.value, 43) KXLOX.KXInit(protocol_kx.KDescription.K_TEST_SOURCE_1_POS_X_MAX.value, 21) KXLOX.KXInit(protocol_kx.KDescription.K_TEST_SOURCE_1_POS_Y_MAX.value, 21) @@ -18,8 +18,5 @@ KXLOX.KXInit(protocol_kx.KDescription.K_TEST_SOURCE_1_POS_Y.value, 7) KXLOX.KXInit(protocol_kx.KDescription.K_TEST_SOURCE_1_POS_X.value, 7) KXLOX.KXInit(protocol_kx.KDescription.K_TEST_SOURCE_1_SIGLVL.value, 450) KXLOX.KXInit(protocol_kx.KDescription.K_TEST_SOURCES_ENABLED.value, 1) -KXLOX.sendK() -KXLOX.writeToFlashK() -time.sleep(0.1) -KXLOX.reset() +KXLOX.send_test_source_enable(1)