diff --git a/lib/ssd1306/ssd1306.c b/lib/ssd1306/ssd1306.c --- a/lib/ssd1306/ssd1306.c +++ b/lib/ssd1306/ssd1306.c @@ -208,25 +208,30 @@ static const char fontData[][5] = {0x00,0x00,0x7F,0x00,0x00}, // ( 92) | - 0x007C Vertical Line {0x00,0x41,0x36,0x08,0x00}, // ( 93) } - 0x007D Right Curly Bracket {0x02,0x01,0x02,0x04,0x02}, // ( 94) ~ - 0x007E Tilde - {0x08,0x14,0x2A,0x14,0x22}, // ( 95) << - 0x00AB Left-Pointing Double Angle Quotation Mark + {0x08,0x14,0x2A,0x14,0x22}, // ( 95) << - 0x00AB Left-Pointing Double Angle Quotation Mark {0x00,0x02,0x05,0x02,0x00}, // ( 96) - 0x00B0 Degree Sign -// {0x44,0x44,0x5F,0x44,0x44}, // ( 97) +- - 0x00B1 Plus-Minus Sign -// {0x7E,0x20,0x20,0x10,0x3E}, // ( 98) u - 0x00B5 Micro Sign -// {0x22,0x14,0x2A,0x14,0x08}, // ( 99) >> - 0x00BB Right-Pointing Double Angle Quotation Mark -// {0x30,0x48,0x45,0x40,0x20}, // (100) ? - 0x00BF Inverted Question Mark -// {0x22,0x14,0x08,0x14,0x22}, // (101) x - 0x00D7 Multiplcation Sign -// {0x08,0x08,0x2A,0x08,0x08}, // (102) + - 0x00F7 Division Sign -// {0x18,0x14,0x08,0x14,0x0C}, // (103) - 0x221E Infinity -// {0x44,0x4A,0x4A,0x51,0x51}, // (104) < - 0x2264 Less-Than or Equal to -// {0x51,0x51,0x4A,0x4A,0x44}, // (105) > - 0x2265 Greater-Than or Equal to -// {0x54,0x14,0x64,0x08,0x70}, // (106) .: - RF Symbol -// {0x70,0x7C,0x72,0x7C,0x70}, // (107) ^ - Lock symbol -// {0x70,0x5C,0x52,0x54,0x70}, // (108) / - Unlock symbol -// {0x0C,0x1E,0x3C,0x1E,0x0C}, // (109) <3 - Heart Symbol -// {0x18,0x22,0xFF,0x12,0x0C}, // (110) U - USB Symbol + {0x44,0x44,0x5F,0x44,0x44}, // ( 97) +- - 0x00B1 Plus-Minus Sign + {0x7E,0x20,0x20,0x10,0x3E}, // ( 98) u - 0x00B5 Micro Sign + {0x22,0x14,0x2A,0x14,0x08}, // ( 99) >> - 0x00BB Right-Pointing Double Angle Quotation Mark + {0x30,0x48,0x45,0x40,0x20}, // (100) ? - 0x00BF Inverted Question Mark + {0x22,0x14,0x08,0x14,0x22}, // (101) x - 0x00D7 Multiplication Sign + {0x08,0x08,0x2A,0x08,0x08}, // (102) + - 0x00F7 Division Sign + {0x18,0x14,0x08,0x14,0x0C}, // (103) - 0x221E Infinity + {0x44,0x4A,0x4A,0x51,0x51}, // (104) < - 0x2264 Less-Than or Equal to + {0x51,0x51,0x4A,0x4A,0x44}, // (105) > - 0x2265 Greater-Than or Equal to + {0x54,0x14,0x64,0x08,0x70}, // (106) .: - RF Symbol + {0x70,0x7C,0x72,0x7C,0x70}, // (107) ^ - Lock symbol + {0x70,0x5C,0x52,0x54,0x70}, // (108) / - Unlock symbol + {0x0C,0x1E,0x3C,0x1E,0x0C}, // (109) <3 - Heart Symbol + {0x18,0x22,0xFF,0x12,0x0C}, // (110) U - USB Symbol + {0x22,0x5d,0x22,0x00,0x00}, // (111) ez updown + {0x14,0x3e,0x14,0x00,0x00}, // (112) ez updown short }; +/* +*/ + // Set start page static void setStartPage(unsigned char d) { @@ -316,9 +321,9 @@ void ssd1306_drawlogo() // Print a single character -void ssd1306_drawchar(char ascii, unsigned char row, unsigned char xPos) +void ssd1306_drawchar(unsigned char ascii, unsigned char row, unsigned char xPos) { - const char *srcPointer = (char*)-1; + const unsigned char *srcPointer = (char*)-1; srcPointer = &fontData[(ascii-32)][0]; @@ -335,7 +340,7 @@ void ssd1306_drawchar(char ascii, unsign // Print a single large character -void ssd1306_drawcharbig(char ascii, unsigned char row, unsigned char xPos) +void ssd1306_drawcharbig(unsigned char ascii, unsigned char row, unsigned char xPos) { const char *srcPointer = (char*)-1; @@ -399,11 +404,11 @@ void ssd1306_drawcharbig(char ascii, uns // Print a string to the display -void ssd1306_drawstring(const char *dataPtr, unsigned char row, unsigned char xPos) +void ssd1306_drawstring(const unsigned char *dataPtr, unsigned char row, unsigned char xPos) { - char *srcPointer; + unsigned char *srcPointer; - srcPointer = (char*)dataPtr; + srcPointer = (unsigned char*)dataPtr; ssd1306_drawchar(' ',row,xPos); // NBSP must be written first before the string start while(1) @@ -417,7 +422,7 @@ void ssd1306_drawstring(const char *data // Print a string to the display, big font -void ssd1306_drawstringbig(const char *dataPtr, unsigned char row, unsigned char xPos) +void ssd1306_drawstringbig(const unsigned char *dataPtr, unsigned char row, unsigned char xPos) { char *srcPointer;