Merge pull request #47 from caternuson/fontb

Add FontB support

Author: ladyada

Adafruit_Thermal.cpp

@@ -268,7 +268,7 @@ void Adafruit_Thermal::printBarcode(const char *text, uint8_t type) {
 }
 
 // === Character commands ===
-
+#define FONT_MASK (1 << 0) //!< Select character font A or B
 #define INVERSE_MASK                                                           \
   (1 << 1) //!< Turn on/off white/black reverse printing mode. Not in 2.6.8
            //!< firmware (see inverseOn())
@@ -278,18 +278,43 @@ void Adafruit_Thermal::printBarcode(const char *text, uint8_t type) {
 #define DOUBLE_WIDTH_MASK (1 << 5)  //!< Turn on/off double-width printing mode
 #define STRIKE_MASK (1 << 6)        //!< Turn on/off deleteline mode
 
+void Adafruit_Thermal::adjustCharValues(uint8_t printMode) {
+  uint8_t charWidth;
+  if (printMode & FONT_MASK) {
+    // FontB
+    charHeight = 17;
+    charWidth = 9;
+  } else {
+    // FontA
+    charHeight = 24;
+    charWidth = 12;
+  }
+  // Double Width Mode
+  if (printMode & DOUBLE_WIDTH_MASK) {
+    maxColumn /= 2;
+    charWidth *= 2;
+  }
+  // Double Height Mode
+  if (printMode & DOUBLE_HEIGHT_MASK) {
+    charHeight *= 2;
+  }
+  maxColumn = (384 / charWidth);
+}
+
 void Adafruit_Thermal::setPrintMode(uint8_t mask) {
   printMode |= mask;
   writePrintMode();
-  charHeight = (printMode & DOUBLE_HEIGHT_MASK) ? 48 : 24;
-  maxColumn = (printMode & DOUBLE_WIDTH_MASK) ? 16 : 32;
+  adjustCharValues(printMode);
+  // charHeight = (printMode & DOUBLE_HEIGHT_MASK) ? 48 : 24;
+  // maxColumn = (printMode & DOUBLE_WIDTH_MASK) ? 16 : 32;
 }
 
 void Adafruit_Thermal::unsetPrintMode(uint8_t mask) {
   printMode &= ~mask;
   writePrintMode();
-  charHeight = (printMode & DOUBLE_HEIGHT_MASK) ? 48 : 24;
-  maxColumn = (printMode & DOUBLE_WIDTH_MASK) ? 16 : 32;
+  adjustCharValues(printMode);
+  // charHeight = (printMode & DOUBLE_HEIGHT_MASK) ? 48 : 24;
+  // maxColumn = (printMode & DOUBLE_WIDTH_MASK) ? 16 : 32;
 }
 
 void Adafruit_Thermal::writePrintMode() {
@@ -395,24 +420,30 @@ void Adafruit_Thermal::setSize(char value) {
 
   switch (toupper(value)) {
   default: // Small: standard width and height
-    size = 0x00;
-    charHeight = 24;
-    maxColumn = 32;
+    // size = 0x00;
+    // charHeight = 24;
+    // maxColumn = 32;
+    doubleWidthOff();
+    doubleHeightOff();
     break;
   case 'M': // Medium: double height
-    size = 0x01;
-    charHeight = 48;
-    maxColumn = 32;
+    // size = 0x01;
+    // charHeight = 48;
+    // maxColumn = 32;
+    doubleHeightOn();
+    doubleWidthOff();
     break;
   case 'L': // Large: double width and height
-    size = 0x11;
-    charHeight = 48;
-    maxColumn = 16;
+    // size = 0x11;
+    // charHeight = 48;
+    // maxColumn = 16;
+    doubleHeightOn();
+    doubleWidthOn();
     break;
   }
 
-  writeBytes(ASCII_GS, '!', size);
-  prevByte = '\n'; // Setting the size adds a linefeed
+  // writeBytes(ASCII_GS, '!', size);
+  // prevByte = '\n'; // Setting the size adds a linefeed
 }
 
 // ESC 7 n1 n2 n3 Setting Control Parameter Command
@@ -654,6 +685,17 @@ void Adafruit_Thermal::tab() {
   column = (column + 4) & 0b11111100;
 }
 
+void Adafruit_Thermal::setFont(char font) {
+  switch (toupper(font)) {
+  case 'B':
+    setPrintMode(FONT_MASK);
+    break;
+  case 'A':
+  default:
+    unsetPrintMode(FONT_MASK);
+  }
+}
+
 void Adafruit_Thermal::setCharSpacing(int spacing) {
   writeBytes(ASCII_ESC, ' ', spacing);
 }

Adafruit_Thermal.h

@@ -212,6 +212,11 @@ class Adafruit_Thermal : public Print {
      * @param val Desired height of the barcode
      */
     setBarcodeHeight(uint8_t val=50),
+    /*!
+     * @brief Sets the font
+     * @param font Desired font, either A or B
+     */
+    setFont(char font='A'),
     /*!
      * @brief Sets the character spacing
      * @param spacing Desired character spacing
@@ -352,7 +357,7 @@ class Adafruit_Thermal : public Print {
       writeBytes(uint8_t a, uint8_t b, uint8_t c),
       writeBytes(uint8_t a, uint8_t b, uint8_t c, uint8_t d),
       setPrintMode(uint8_t mask), unsetPrintMode(uint8_t mask),
-      writePrintMode();
+      writePrintMode(), adjustCharValues(uint8_t printMode);
 };
 
 #endif // ADAFRUIT_THERMAL_H

examples/A_printertest/A_printertest.ino

@@ -47,6 +47,14 @@ void setup() {
   // over and over (which would happen if they were in loop() instead).
   // Some functions will feed a line when called, this is normal.
 
+  // Font options
+  printer.setFont('B');
+  printer.println("FontB");
+  printer.println("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+  printer.setFont('A');
+  printer.println("FontA (default)");
+  printer.println("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+
   // Test inverse on & off
   printer.inverseOn();
   printer.println(F("Inverse ON"));

keywords.txt

@@ -38,10 +38,7 @@ doubleHeightOff	KEYWORD2
 inverseOn	KEYWORD2
 inverseOff	KEYWORD2
 setDefault	KEYWORD2
-
-
-
-
+setFont	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)