1
0
mirror of https://github.com/python-escpos/python-escpos synced 2025-10-03 09:19:59 +00:00

Merge remote-tracking branch 'manpaz/master'

This commit is contained in:
Christoph Heuel
2015-12-12 20:30:52 +01:00
5 changed files with 24 additions and 66 deletions

View File

@@ -45,7 +45,7 @@ class Escpos:
buffer = ""
self._raw(S_RASTER_N)
buffer = "%02X%02X%02X%02X" % (((size[0]/size[1])/8), 0, size[1], 0)
buffer = "%02X%02X%02X%02X" % (((size[0]/size[1])/8), 0, size[1]&0xff, size[1]>>8)
self._raw(binascii.unhexlify(buffer))
buffer = ""
@@ -72,7 +72,7 @@ class Escpos:
if im.size[0] > 512:
print ("WARNING: Image is wider than 512 and could be truncated at print time ")
if im.size[1] > 255:
if im.size[1] > 0xffff:
raise ImageSizeError()
im_border = self._check_image_size(im.size[0])

View File

@@ -41,11 +41,19 @@ class Usb(Escpos):
if self.device is None:
print("Cable isn't plugged in")
if self.device.is_kernel_driver_active(0):
check_driver = None
try:
check_driver = self.device.is_kernel_driver_active(0)
except NotImplementedError:
pass
if check_driver is None or check_driver:
try:
self.device.detach_kernel_driver(0)
except usb.core.USBError as e:
print("Could not detatch kernel driver: %s" % str(e))
if check_driver is not None:
print("Could not detatch kernel driver: %s" % str(e))
try:
self.device.set_configuration()