From f7a2caee7223cf4891af97e6f5bd15f9e2a35b23 Mon Sep 17 00:00:00 2001
From: Stephan Sokolow <http://www.ssokolow.com/ContactMe>
Date: Thu, 22 May 2014 00:45:57 -0400
Subject: [PATCH] Actually use the barcode height and width parameters

(And reverse their order in the method signature so corrections to the
range checks don't break existing code)

check whether this is the solution for #26
---
 escpos/constants.py |  4 ++--
 escpos/escpos.py    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/escpos/constants.py b/escpos/constants.py
index 6025ac4..5f7c641 100644
--- a/escpos/constants.py
+++ b/escpos/constants.py
@@ -98,8 +98,8 @@ _SET_HRI_FONT = lambda n: GS + 'f' + n
 BARCODE_FONT_A = _SET_HRI_FONT('\x00')  # Font type A for HRI barcode chars
 BARCODE_FONT_B = _SET_HRI_FONT('\x01')  # Font type B for HRI barcode chars
 
-BARCODE_HEIGHT = GS + 'h' + '\x64'  # Barcode Height [1-255]
-BARCODE_WIDTH  = GS + 'w' + '\x03'  # Barcode Width  [2-6]
+BARCODE_HEIGHT = GS + 'h'  # Barcode Height [1-255]
+BARCODE_WIDTH  = GS + 'w'  # Barcode Width  [2-6]
 
 #NOTE: This isn't actually an ESC/POS command. It's the common prefix to the
 #      two "print bar code" commands:
diff --git a/escpos/escpos.py b/escpos/escpos.py
index 3a7a83f..b77b5a0 100644
--- a/escpos/escpos.py
+++ b/escpos/escpos.py
@@ -268,7 +268,7 @@ class Escpos(object):
         else:
             raise CharCodeError()
 
-    def barcode(self, code, bc, width, height, pos, font):
+    def barcode(self, code, bc, height, width, pos, font):
         """ Print Barcode
 
         :param code: alphanumeric data to be printed as bar code
@@ -283,10 +283,10 @@ class Escpos(object):
             * NW7
 
             If none is specified, the method raises :py:exc:`~escpos.exceptions.BarcodeTypeError`.
-        :param width: barcode width, has to be between 1 and 255
-            *default*: 64
         :param height: barcode height, has to be between 2 and 6
             *default*: 3
+        :param width: barcode width, has to be between 1 and 255
+            *default*: 64
         :param pos: where to place the text relative to the barcode, *default*: below
 
             * ABOVE
@@ -306,13 +306,13 @@ class Escpos(object):
         # Align Bar Code()
         self._raw(TXT_ALIGN_CT)
         # Height
-        if height >= 2 or height <= 6:
-            self._raw(BARCODE_HEIGHT)
+        if 1 <= height <= 255:
+            self._raw(BARCODE_HEIGHT + chr(height))
         else:
             raise BarcodeSizeError()
         # Width
-        if width >= 1 or width <= 255:
-            self._raw(BARCODE_WIDTH)
+        if 2 <= width <= 6:
+            self._raw(BARCODE_WIDTH + chr(width))
         else:
             raise BarcodeSizeError()
         # Font