Diff: TextLCD.cpp

Revision:

9:609f5265134b

Parent:

7:44f34c09bd37

--- a/TextLCD.cpp	Thu Jan 02 21:07:01 2014 +0000
+++ b/TextLCD.cpp	Thu Dec 17 14:55:22 2015 +0000
@@ -23,11 +23,44 @@
 #include "TextLCD.h"
 #include "mbed.h"
 
+namespace ext_text_lcd {
+
+namespace {
+    int makeLcdAddress(const TextLCD::LCDType &type, int column, int row) {
+        return column + row * 0x40;
+    }
+    
+    int makeLcdAddress40(const TextLCD::LCDType &type, int column, int row) {
+        return column + row * 40;
+    }
+    
+    int makeLcdAddress4Rows(const TextLCD::LCDType &type, int column, int row) {
+        return column + (row % 2) * 0x40 + (row / 2) * 20;
+    }
+}
+
+const TextLCD::LCDType TextLCD::LCD16x2(16, 2, makeLcdAddress);
+const TextLCD::LCDType TextLCD::LCD16x2B(16, 2, makeLcdAddress40);
+const TextLCD::LCDType TextLCD::LCD20x2(20, 2, makeLcdAddress);
+const TextLCD::LCDType TextLCD::LCD20x4(20, 4, makeLcdAddress4Rows);
+
 TextLCD::TextLCD(PinName rs, PinName e, PinName d4, PinName d5,
-                 PinName d6, PinName d7, LCDType type) : _rs(rs),
-        _e(e), _d(d4, d5, d6, d7),
-        _type(type) {
+                 PinName d6, PinName d7, const LCDType &type) : 
+    _rs(rs), _e(e), _output(new BusOutput(d4, d5, d6, d7)),
+    _type(type)
+{
+    init();
+}
 
+TextLCD::TextLCD(PinName rs, PinName e, PortName dport, std::size_t dlsb, 
+                 const LCDType &type) :
+    _rs(rs), _e(e), _output(new PortOutput(dport, dlsb)),
+    _type(type)
+{
+    init();
+}
+
+void TextLCD::init() {
     _e  = 1;
     _rs = 0;            // command mode
 
@@ -47,12 +80,6 @@
     cls();
 }
 
-void TextLCD::character(int column, int row, int c) {
-    int a = address(column, row);
-    writeCommand(a);
-    writeData(c);
-}
-
 void TextLCD::cls() {
     writeCommand(0x01); // cls, and set cursor to 0
     wait(0.00164f);     // This command takes 1.64 ms
@@ -62,26 +89,31 @@
 void TextLCD::locate(int column, int row) {
     _column = column;
     _row = row;
+    
+    int a = address(column, row);
+    writeCommand(0x80 | a);
 }
 
 int TextLCD::_putc(int value) {
+    int column = _column;
+    int row = _row;
     if (value == '\n') {
-        _column = 0;
-        _row++;
-        if (_row >= rows()) {
-            _row = 0;
-        }
+        column = 0;
+        row = _row+1;
     } else {
-        character(_column, _row, value);
-        _column++;
-        if (_column >= columns()) {
-            _column = 0;
-            _row++;
-            if (_row >= rows()) {
-                _row = 0;
-            }
+        writeData(value);
+        column++;
+        if (column < columns()) {
+            return value;
         }
+        
+        column = 0;
+        row++;
     }
+    if (row >= rows()) {
+        row = 0;
+    }
+    locate(column, row);
     return value;
 }
 
@@ -90,12 +122,12 @@
 }
 
 void TextLCD::writeByte(int value) {
-    _d = value >> 4;
+    _output->writeNibble(value >> 4);
     wait(0.000040f); // most instructions take 40us
     _e = 0;
     wait(0.000040f);
     _e = 1;
-    _d = value >> 0;
+    _output->writeNibble(value);
     wait(0.000040f);
     _e = 0;
     wait(0.000040f);  // most instructions take 40us
@@ -112,48 +144,29 @@
     writeByte(data);
 }
 
-int TextLCD::address(int column, int row) {
-    switch (_type) {
-        case LCD20x4:
-            switch (row) {
-                case 0:
-                    return 0x80 + column;
-                case 1:
-                    return 0xc0 + column;
-                case 2:
-                    return 0x94 + column;
-                case 3:
-                    return 0xd4 + column;
-            }
-        case LCD16x2B:
-            return 0x80 + (row * 40) + column;
-        case LCD16x2:
-        case LCD20x2:
-        default:
-            return 0x80 + (row * 0x40) + column;
-    }
+void TextLCD::setDisplayControl(DisplayControl d, CursorDisplayControl c, CursorStyle b)
+{
+    writeCommand(0x08 | d | c | b);
 }
 
-int TextLCD::columns() {
-    switch (_type) {
-        case LCD20x4:
-        case LCD20x2:
-            return 20;
-        case LCD16x2:
-        case LCD16x2B:
-        default:
-            return 16;
+void TextLCD::writeToCGMem(unsigned addr, const char *buffer, std::size_t size)
+{
+    writeCommand(0x40 | (addr & 0x3f));
+    while (size > 0) {
+        writeData(*buffer);
+        size--;
+        buffer++;
     }
+    
+    locate(_column, _row);
 }
 
-int TextLCD::rows() {
-    switch (_type) {
-        case LCD20x4:
-            return 4;
-        case LCD16x2:
-        case LCD16x2B:
-        case LCD20x2:
-        default:
-            return 2;
-    }
+void TextLCD::BusOutput::writeNibble(int value) {
+    _bus = value; 
 }
+
+void TextLCD::PortOutput::writeNibble(int value) {
+    _port = value << _shift;
+}
+
+} // ext_text_lcd namespace