Diff: GraphicOLED.h

Revision:

3:a6650dd2dbc8

Parent:

2:337a2655f815

--- a/GraphicOLED.h	Mon Aug 04 06:17:36 2014 +0000
+++ b/GraphicOLED.h	Tue Aug 12 01:47:43 2014 +0000
@@ -1,11 +1,7 @@
 // GraphicOLED.h
 #pragma once
-
 #include "mbed.h"
 
-#define iskanji(c) ((c)>=0x81 && (c)<=0x9F || (c)>=0xE0 && (c)<=0xFC)
-#define iskanji2(c) ((c)>=0x40 && (c)<=0xFC && (c)!=0x7F)
-
 /** GraphicOLED interface for WS0010
  *
  * Currently support UTF-8 KANJI(misaki font) 
@@ -32,13 +28,13 @@
     GraphicOLED(PinName rs, PinName e, PinName d4, PinName d5, PinName d6, PinName d7);
 
 #if DOXYGEN_ONLY
-    /** Write a character to the LCD
+    /** Write a character to the OLED
      *
      * @param c The character to write to the display
      */
     int putc(int c);
 
-    /** Write a formated string to the LCD
+    /** Write a formated string to the OLED
      *
      * @param format A printf-style format string, followed by the
      *               variables to use in formating the string.
@@ -63,16 +59,14 @@
     void g_write(uint8_t *buf, int len, int x, int y);
        
 private:
-    void character2(int column, int row, int c);
-    bool _kanji_flag;
-    int _kanji_1st;
+    int _uni_len;
+    uint32_t _unicode;
 
     // Stream implementation functions
     virtual int _putc(int value);
     virtual int _getc();
 
-    int address(int column, int row);
-    void character(int column, int row, int c);
+    int character(int column, int row, int c);
     void writeByte(uint8_t value);
     void writeCommand(uint8_t command);
     void writeData(uint8_t data);