gracious/NIIMBOT-D101
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

changed transceive response code to an offset relative to the reqcode

Browse Source
This commit is contained in:
Martin Christoph Frank
2023-04-09 13:20:03 +02:00
parent 4fa8a774f2
commit 908e1bbfbf
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
niimprint/printerclient.py
+15 -14
View File
@@ -56,7 +56,8 @@ class PrinterClient:
# print('send:',packet) # print('send:',packet)
self._sock.send(packet.to_bytes()) self._sock.send(packet.to_bytes())
def _transceive(self, reqcode, data, respcode): def _transceive(self, reqcode, data, respoffset):
respcode = respoffset + reqcode
self._send(niimbotpacket.NiimbotPacket(reqcode, data)) self._send(niimbotpacket.NiimbotPacket(reqcode, data))
resp = None resp = None
for _ in range(6): for _ in range(6):
@@ -73,7 +74,7 @@ class PrinterClient:
return resp return resp
def get_info(self, key): def get_info(self, key):
if packet := self._transceive(RequestCodeEnum.GET_INFO, bytes((key,)), RequestCodeEnum.GET_INFO + key): if packet := self._transceive(RequestCodeEnum.GET_INFO, bytes((key,)), key):
match key: match key:
case InfoEnum.DEVICESERIAL: case InfoEnum.DEVICESERIAL:
return packet.data.hex() return packet.data.hex()
@@ -87,7 +88,7 @@ class PrinterClient:
return None return None
def get_rfid(self): def get_rfid(self):
packet = self._transceive(RequestCodeEnum.GET_RFID, b'\x01', RequestCodeEnum.GET_RFID+1) packet = self._transceive(RequestCodeEnum.GET_RFID, b'\x01', 1)
data = packet.data data = packet.data
if data[0] == 0: if data[0] == 0:
@@ -116,7 +117,7 @@ class PrinterClient:
} }
def heartbeat(self): def heartbeat(self):
packet = self._transceive(RequestCodeEnum.HEARTBEAT, b'\x01', RequestCodeEnum.HEARTBEAT+1) packet = self._transceive(RequestCodeEnum.HEARTBEAT, b'\x01', 1)
closingstate = None closingstate = None
powerlevel = None powerlevel = None
paperstate = None paperstate = None
@@ -152,43 +153,43 @@ class PrinterClient:
def set_label_type(self, n): def set_label_type(self, n):
assert 1 <= n <= 3 assert 1 <= n <= 3
packet = self._transceive(RequestCodeEnum.SET_LABEL_TYPE, bytes((n,)), RequestCodeEnum.SET_LABEL_TYPE + 16) packet = self._transceive(RequestCodeEnum.SET_LABEL_TYPE, bytes((n,)), 16)
return bool(packet.data[0]) return bool(packet.data[0])
def set_label_density(self, n): def set_label_density(self, n):
assert 1 <= n <= 3 assert 1 <= n <= 3
packet = self._transceive(RequestCodeEnum.SET_LABEL_DENSITY, bytes((n,)), RequestCodeEnum.SET_LABEL_DENSITY + 16) packet = self._transceive(RequestCodeEnum.SET_LABEL_DENSITY, bytes((n,)), 16)
return bool(packet.data[0]) return bool(packet.data[0])
def start_print(self): def start_print(self):
packet = self._transceive(RequestCodeEnum.START_PRINT, b'\x01', RequestCodeEnum.START_PRINT + 1) packet = self._transceive(RequestCodeEnum.START_PRINT, b'\x01', 1)
return bool(packet.data[0]) return bool(packet.data[0])
def end_print(self): def end_print(self):
packet = self._transceive(RequestCodeEnum.END_PRINT, b'\x01', RequestCodeEnum.END_PRINT + 1) packet = self._transceive(RequestCodeEnum.END_PRINT, b'\x01', 1)
return bool(packet.data[0]) return bool(packet.data[0])
def start_page_print(self): def start_page_print(self):
packet = self._transceive(RequestCodeEnum.START_PAGE_PRINT, b'\x01', RequestCodeEnum.START_PAGE_PRINT + 1) packet = self._transceive(RequestCodeEnum.START_PAGE_PRINT, b'\x01', 1)
return bool(packet.data[0]) return bool(packet.data[0])
def end_page_print(self): def end_page_print(self):
packet = self._transceive(RequestCodeEnum.END_PAGE_PRINT, b'\x01', RequestCodeEnum.END_PAGE_PRINT + 1) packet = self._transceive(RequestCodeEnum.END_PAGE_PRINT, b'\x01', 1)
return bool(packet.data[0]) return bool(packet.data[0])
def allow_print_clear(self): def allow_print_clear(self):
packet = self._transceive(RequestCodeEnum.ALLOW_PRINT_CLEAR, b'\x01', RequestCodeEnum.ALLOW_PRINT_CLEAR + 16) packet = self._transceive(RequestCodeEnum.ALLOW_PRINT_CLEAR, b'\x01', 16)
return bool(packet.data[0]) return bool(packet.data[0])
def set_dimension(self, w, h): def set_dimension(self, w, h):
packet = self._transceive(RequestCodeEnum.SET_DIMENSION, struct.pack('>HH', w, h), RequestCodeEnum.SET_DIMENSION + 1) packet = self._transceive(RequestCodeEnum.SET_DIMENSION, struct.pack('>HH', w, h), 1)
return bool(packet.data[0]) return bool(packet.data[0])
def set_quantity(self, n): def set_quantity(self, n):
packet = self._transceive(RequestCodeEnum.SET_QUANTITY, struct.pack('>H', n), RequestCodeEnum.SET_QUANTITY + 1) packet = self._transceive(RequestCodeEnum.SET_QUANTITY, struct.pack('>H', n), 1)
return bool(packet.data[0]) return bool(packet.data[0])
def get_print_status(self): def get_print_status(self):
packet = self._transceive(RequestCodeEnum.GET_PRINT_STATUS, b'\x01', RequestCodeEnum.GET_PRINT_STATUS + 16) packet = self._transceive(RequestCodeEnum.GET_PRINT_STATUS, b'\x01', 16)
page, progress1, progress2 = struct.unpack('>HBB', packet.data) page, progress1, progress2 = struct.unpack('>HBB', packet.data)
return {'page': page, 'progress1': progress1, 'progress2': progress2} return {'page': page, 'progress1': progress1, 'progress2': progress2}