Merge branch 'master' into belono/issue245

src/escpos/constants.py

@@ -77,6 +77,16 @@ LINE_DISPLAY_CLOSE = ESC + b"\x3d\x01"
 SHEET_SLIP_MODE = ESC + b"\x63\x30\x04"  # slip paper
 SHEET_ROLL_MODE = ESC + b"\x63\x30\x01"  # paper roll
 
+# Slip specific codes
+SLIP_EJECT = ESC + b"\x4b\xc0"  # Eject the slip or cheque
+SLIP_SELECT = FS  # Select the slip station as default station
+SLIP_SET_WAIT_TIME = (
+    ESC + b"\x1b\x66"
+)  # Set timeout waiting for a slip/cheque to be inserted
+SLIP_PRINT_AND_EJECT = (
+    b"\x0c"  # Print the buffer and eject (after waiting for the paper to be inserted)
+)
+
 # Text format
 # TODO: Acquire the "ESC/POS Application Programming Guide for Paper Roll
 #       Printers" and tidy up this stuff too.

src/escpos/escpos.py

@@ -30,6 +30,11 @@ from .constants import (
     QR_ECLEVEL_M,
     QR_ECLEVEL_H,
     QR_ECLEVEL_Q,
+    SHEET_ROLL_MODE,
+    SHEET_SLIP_MODE,
+    SLIP_PRINT_AND_EJECT,
+    SLIP_SELECT,
+    SLIP_EJECT,
 )
 from .constants import (
     QR_MODEL_1,
@@ -794,21 +799,19 @@ class Escpos(object):
                 )
             )
 
-        # Render the barcode to a fake file
+        # Render the barcode
         barcode_class = barcode.get_barcode_class(barcode_type)
         my_code = barcode_class(data, writer=image_writer)
 
-        with open(os.devnull, "wb") as nullfile:
-            my_code.write(
-                nullfile,
-                {
-                    "module_height": module_height,
-                    "module_width": module_width,
-                    "quiet_zone": 0,  # horizontal padding
-                    "text_distance": text_distance,
-                    "font_size": font_size,
-                },
-            )
+        my_code.render(
+            writer_options={
+                "module_height": module_height,
+                "module_width": module_width,
+                "quiet_zone": 0,  # horizontal padding
+                "text_distance": text_distance,
+                "font_size": font_size,
+            }
+        )
 
         # Retrieve the Pillow image and print it
         image = my_code.writer._image
@@ -1208,6 +1211,41 @@ class Escpos(object):
         if status[0] & RT_MASK_PAPER == RT_MASK_PAPER:
             return 2
 
+    def target(self, type="ROLL"):
+        """Select where to print to
+
+        Print to the thermal printer by default (ROLL) or
+        print to the slip dot matrix printer if supported (SLIP)
+        """
+        if type.upper() == "ROLL":
+            self._raw(SHEET_ROLL_MODE)
+        elif type.upper() == "SLIP":
+            self._raw(SHEET_SLIP_MODE)
+        else:
+            raise ValueError("Unsupported target")
+
+    def eject_slip(self):
+        """Eject the slip/cheque"""
+        self._raw(SLIP_EJECT)
+
+    def print_and_eject_slip(self):
+        """Print and eject
+
+        Prints data from the buffer to the slip station and if the paper
+        sensor is covered, reverses the slip out the front of the printer
+        far enough to be accessible to the operator.
+        The impact station opens the platen in all cases.
+        """
+        self._raw(SLIP_PRINT_AND_EJECT)
+
+    def use_slip_only(self):
+        """Selects the Slip Station for all functions.
+
+        The receipt station is the default setting after the printer
+        is initialized or the Clear Printer (0x10) command is received
+        """
+        self._raw(SLIP_SELECT)
+
 
 class EscposIO(object):
     """ESC/POS Printer IO object

src/escpos/magicencode.py

@@ -18,6 +18,7 @@ from .constants import CODEPAGE_CHANGE
 from .exceptions import Error
 from .codepages import CodePages
 import six
+import re
 
 
 class Encoder(object):
@@ -252,6 +253,10 @@ class MagicEncode(object):
             self.write_with_encoding(self.encoding, text)
             return
 
+        if re.findall(r"[\u4e00-\u9fa5]", text):
+            self.driver._raw(text.encode("GB18030"))
+            return
+
         # See how far we can go into the text with the current encoding
         to_write, text = split_writable_text(self.encoder, text, self.encoding)
         if to_write: