setop
/
python-escpos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix in `control` method. print_and_feed default `n=1`

This commit is contained in:
Dmytro Katyukha 2017-02-09 14:11:19 +00:00 committed by Patrick Kanzler
parent 43e0a87a74
commit a7ee11a78c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/escpos/escpos.py
View File

@ -630,12 +630,12 @@ class Escpos(object):
else: # DEFAULT: DOES NOTHING else: # DEFAULT: DOES NOTHING
pass pass
def print_and_feed(self, n): def print_and_feed(self, n=1):
""" Print data in print buffer and feed *n* lines """ Print data in print buffer and feed *n* lines
if n not in range (0, 255) then ValueError will be raised if n not in range (0, 255) then ValueError will be raised
:param n: number of lines to feed. 0 <= n <= 255 :param n: number of n to feed. 0 <= n <= 255. default: 1
:raises ValueError: if not 0 <= n <= 255 :raises ValueError: if not 0 <= n <= 255
""" """
if 0 <= n <= 255: if 0 <= n <= 255:
@ -658,11 +658,6 @@ class Escpos(object):
:param pos: integer between 1 and 16, controls the horizontal tab position :param pos: integer between 1 and 16, controls the horizontal tab position
:raises: :py:exc:`~escpos.exceptions.TabPosError` :raises: :py:exc:`~escpos.exceptions.TabPosError`
""" """
# Set tab positions
if not (1 <= pos <= 16):
raise TabPosError()
else:
self._raw(CTL_SET_HT + six.int2byte(pos))
# Set position # Set position
if ctl.upper() == "LF": if ctl.upper() == "LF":
self._raw(CTL_LF) self._raw(CTL_LF)
@ -671,6 +666,12 @@ class Escpos(object):
elif ctl.upper() == "CR": elif ctl.upper() == "CR":
self._raw(CTL_CR) self._raw(CTL_CR)
elif ctl.upper() == "HT": elif ctl.upper() == "HT":
if not (1 <= pos <= 16):
raise TabPosError()
else:
# Set tab positions
self._raw(CTL_SET_HT + six.int2byte(pos))
self._raw(CTL_HT) self._raw(CTL_HT)
elif ctl.upper() == "VT": elif ctl.upper() == "VT":
self._raw(CTL_VT) self._raw(CTL_VT)