Diff: include/SGL.h

Revision:

10:ef7440718431

Parent:

8:ff74bd4d94d6

Child:

11:162aa3e801df

--- a/include/SGL.h	Tue Nov 17 19:45:22 2015 +0000
+++ b/include/SGL.h	Tue Nov 17 21:20:37 2015 +0000
@@ -40,105 +40,7 @@
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define MAX(a,b) (((a)>(b))?(a):(b))
 
-const unsigned char simpleFont[][8] =
-{
-  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-  {0x00,0x00,0x5F,0x00,0x00,0x00,0x00,0x00},
-  {0x00,0x00,0x07,0x00,0x07,0x00,0x00,0x00},
-  {0x00,0x14,0x7F,0x14,0x7F,0x14,0x00,0x00},
-  {0x00,0x24,0x2A,0x7F,0x2A,0x12,0x00,0x00},
-  {0x00,0x23,0x13,0x08,0x64,0x62,0x00,0x00},
-  {0x00,0x36,0x49,0x55,0x22,0x50,0x00,0x00},
-  {0x00,0x00,0x05,0x03,0x00,0x00,0x00,0x00},
-  {0x00,0x1C,0x22,0x41,0x00,0x00,0x00,0x00},
-  {0x00,0x41,0x22,0x1C,0x00,0x00,0x00,0x00},
-  {0x00,0x08,0x2A,0x1C,0x2A,0x08,0x00,0x00},
-  {0x00,0x08,0x08,0x3E,0x08,0x08,0x00,0x00},
-  {0x00,0xA0,0x60,0x00,0x00,0x00,0x00,0x00},
-  {0x00,0x08,0x08,0x08,0x08,0x08,0x00,0x00},
-  {0x00,0x60,0x60,0x00,0x00,0x00,0x00,0x00},
-  {0x00,0x20,0x10,0x08,0x04,0x02,0x00,0x00},
-  {0x00,0x3E,0x51,0x49,0x45,0x3E,0x00,0x00},
-  {0x00,0x00,0x42,0x7F,0x40,0x00,0x00,0x00},
-  {0x00,0x62,0x51,0x49,0x49,0x46,0x00,0x00},
-  {0x00,0x22,0x41,0x49,0x49,0x36,0x00,0x00},
-  {0x00,0x18,0x14,0x12,0x7F,0x10,0x00,0x00},
-  {0x00,0x27,0x45,0x45,0x45,0x39,0x00,0x00},
-  {0x00,0x3C,0x4A,0x49,0x49,0x30,0x00,0x00},
-  {0x00,0x01,0x71,0x09,0x05,0x03,0x00,0x00},
-  {0x00,0x36,0x49,0x49,0x49,0x36,0x00,0x00},
-  {0x00,0x06,0x49,0x49,0x29,0x1E,0x00,0x00},
-  {0x00,0x00,0x36,0x36,0x00,0x00,0x00,0x00},
-  {0x00,0x00,0xAC,0x6C,0x00,0x00,0x00,0x00},
-  {0x00,0x08,0x14,0x22,0x41,0x00,0x00,0x00},
-  {0x00,0x14,0x14,0x14,0x14,0x14,0x00,0x00},
-  {0x00,0x41,0x22,0x14,0x08,0x00,0x00,0x00},
-  {0x00,0x02,0x01,0x51,0x09,0x06,0x00,0x00},
-  {0x00,0x32,0x49,0x79,0x41,0x3E,0x00,0x00},
-  {0x00,0x7E,0x09,0x09,0x09,0x7E,0x00,0x00},
-  {0x00,0x7F,0x49,0x49,0x49,0x36,0x00,0x00},
-  {0x00,0x3E,0x41,0x41,0x41,0x22,0x00,0x00},
-  {0x00,0x7F,0x41,0x41,0x22,0x1C,0x00,0x00},
-  {0x00,0x7F,0x49,0x49,0x49,0x41,0x00,0x00},
-  {0x00,0x7F,0x09,0x09,0x09,0x01,0x00,0x00},
-  {0x00,0x3E,0x41,0x41,0x51,0x72,0x00,0x00},
-  {0x00,0x7F,0x08,0x08,0x08,0x7F,0x00,0x00},
-  {0x00,0x41,0x7F,0x41,0x00,0x00,0x00,0x00},
-  {0x00,0x20,0x40,0x41,0x3F,0x01,0x00,0x00},
-  {0x00,0x7F,0x08,0x14,0x22,0x41,0x00,0x00},
-  {0x00,0x7F,0x40,0x40,0x40,0x40,0x00,0x00},
-  {0x00,0x7F,0x02,0x0C,0x02,0x7F,0x00,0x00},
-  {0x00,0x7F,0x04,0x08,0x10,0x7F,0x00,0x00},
-  {0x00,0x3E,0x41,0x41,0x41,0x3E,0x00,0x00},
-  {0x00,0x7F,0x09,0x09,0x09,0x06,0x00,0x00},
-  {0x00,0x3E,0x41,0x51,0x21,0x5E,0x00,0x00},
-  {0x00,0x7F,0x09,0x19,0x29,0x46,0x00,0x00},
-  {0x00,0x26,0x49,0x49,0x49,0x32,0x00,0x00},
-  {0x00,0x01,0x01,0x7F,0x01,0x01,0x00,0x00},
-  {0x00,0x3F,0x40,0x40,0x40,0x3F,0x00,0x00},
-  {0x00,0x1F,0x20,0x40,0x20,0x1F,0x00,0x00},
-  {0x00,0x3F,0x40,0x38,0x40,0x3F,0x00,0x00},
-  {0x00,0x63,0x14,0x08,0x14,0x63,0x00,0x00},
-  {0x00,0x03,0x04,0x78,0x04,0x03,0x00,0x00},
-  {0x00,0x61,0x51,0x49,0x45,0x43,0x00,0x00},
-  {0x00,0x7F,0x41,0x41,0x00,0x00,0x00,0x00},
-  {0x00,0x02,0x04,0x08,0x10,0x20,0x00,0x00},
-  {0x00,0x41,0x41,0x7F,0x00,0x00,0x00,0x00},
-  {0x00,0x04,0x02,0x01,0x02,0x04,0x00,0x00},
-  {0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00},
-  {0x00,0x01,0x02,0x04,0x00,0x00,0x00,0x00},
-  {0x00,0x20,0x54,0x54,0x54,0x78,0x00,0x00},
-  {0x00,0x7F,0x48,0x44,0x44,0x38,0x00,0x00},
-  {0x00,0x38,0x44,0x44,0x28,0x00,0x00,0x00},
-  {0x00,0x38,0x44,0x44,0x48,0x7F,0x00,0x00},
-  {0x00,0x38,0x54,0x54,0x54,0x18,0x00,0x00},
-  {0x00,0x08,0x7E,0x09,0x02,0x00,0x00,0x00},
-  {0x00,0x18,0xA4,0xA4,0xA4,0x7C,0x00,0x00},
-  {0x00,0x7F,0x08,0x04,0x04,0x78,0x00,0x00},
-  {0x00,0x00,0x7D,0x00,0x00,0x00,0x00,0x00},
-  {0x00,0x80,0x84,0x7D,0x00,0x00,0x00,0x00},
-  {0x00,0x7F,0x10,0x28,0x44,0x00,0x00,0x00},
-  {0x00,0x41,0x7F,0x40,0x00,0x00,0x00,0x00},
-  {0x00,0x7C,0x04,0x18,0x04,0x78,0x00,0x00},
-  {0x00,0x7C,0x08,0x04,0x7C,0x00,0x00,0x00},
-  {0x00,0x38,0x44,0x44,0x38,0x00,0x00,0x00},
-  {0x00,0xFC,0x24,0x24,0x18,0x00,0x00,0x00},
-  {0x00,0x18,0x24,0x24,0xFC,0x00,0x00,0x00},
-  {0x00,0x00,0x7C,0x08,0x04,0x00,0x00,0x00},
-  {0x00,0x48,0x54,0x54,0x24,0x00,0x00,0x00},
-  {0x00,0x04,0x7F,0x44,0x00,0x00,0x00,0x00},
-  {0x00,0x3C,0x40,0x40,0x7C,0x00,0x00,0x00},
-  {0x00,0x1C,0x20,0x40,0x20,0x1C,0x00,0x00},
-  {0x00,0x3C,0x40,0x30,0x40,0x3C,0x00,0x00},
-  {0x00,0x44,0x28,0x10,0x28,0x44,0x00,0x00},
-  {0x00,0x1C,0xA0,0xA0,0x7C,0x00,0x00,0x00},
-  {0x00,0x44,0x64,0x54,0x4C,0x44,0x00,0x00},
-  {0x00,0x08,0x36,0x41,0x00,0x00,0x00,0x00},
-  {0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00},
-  {0x00,0x41,0x36,0x08,0x00,0x00,0x00,0x00},
-  {0x00,0x02,0x01,0x01,0x02,0x01,0x00,0x00},
-  {0x00,0x02,0x05,0x05,0x02,0x00,0x00,0x00} 
-};
+typedef const unsigned char** FontType;
 
 class SGL {
  
@@ -154,10 +56,14 @@
     virtual void fillCircle(uint8_t x, uint8_t y, uint8_t r, uint16_t color);
     virtual void drawTraingle(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2, uint16_t color);
     virtual void fillTraingle(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2, uint16_t color);    
-    virtual void drawChar(uint8_t ascii, uint8_t x, uint8_t y, uint8_t size, uint16_t color);
-    virtual void drawString(char *string, uint8_t x, uint8_t y, uint8_t size, uint16_t color);
+    
+    // The zoom factor works at the moment only with integer values. Float values will create bad fonts 
+    virtual void drawChar(uint8_t ascii, uint8_t x, uint8_t y, float zoom, uint16_t color);
+    virtual void drawString(const char *string, uint8_t x, uint8_t y, float zoom, uint16_t color, uint8_t fontSpace=6);
+    
     virtual void drawBitMap(uint8_t x, uint8_t y, const uint8_t *bitmap, uint8_t width, uint8_t height, uint16_t color);
     virtual void fillScreen(uint16_t color);
+    virtual void setFont(FontType font, uint8_t width, uint8_t height, uint8_t start, uint8_t stop);
     
 private:
     void swap(uint8_t* a, uint8_t* b){ 
@@ -166,6 +72,11 @@
     
     uint8_t _width;
     uint8_t _height;
+    FontType _currentFont;
+    uint8_t _fontWidth;
+    uint8_t _fontHeight;
+    uint8_t _fontStart;
+    uint8_t _fontStop;
 };
 
 #endif