From a428a3ae8cfe3c5a0b355ff437a31a5cba9965cf Mon Sep 17 00:00:00 2001
From: Stanley Huang <stanleyhuangyc@gmail.com>
Date: Sun, 23 Jun 2013 00:14:41 +0800
Subject: update MultiLCD library
---
libraries/MultiLCD/ILI9325D.cpp | 2 +-
libraries/MultiLCD/MultiLCD.cpp | 193 ++++++++++++++--------
libraries/MultiLCD/MultiLCD.h | 2 +-
libraries/MultiLCD/examples/lcdhello/lcdhello.ino | 20 +--
4 files changed, 131 insertions(+), 86 deletions(-)
(limited to 'libraries/MultiLCD')
diff --git a/libraries/MultiLCD/ILI9325D.cpp b/libraries/MultiLCD/ILI9325D.cpp
index 8234982..0f70f12 100644
--- a/libraries/MultiLCD/ILI9325D.cpp
+++ b/libraries/MultiLCD/ILI9325D.cpp
@@ -380,7 +380,7 @@ void LCD_ILI9325D::writeDigit(byte n)
if (n >= 0 && n <= 9) {
memcpy_P(pgm_buffer, &font8x16_terminal[n + '0' - 0x21], 16);
} else {
- return;
+ memset(pgm_buffer, 0, 16);
}
SetXY(m_x, m_x + 15, m_y, m_y + 7);
for (byte i = 0; i < 16; i++) {
diff --git a/libraries/MultiLCD/MultiLCD.cpp b/libraries/MultiLCD/MultiLCD.cpp
index 4cf3dd5..1856a21 100644
--- a/libraries/MultiLCD/MultiLCD.cpp
+++ b/libraries/MultiLCD/MultiLCD.cpp
@@ -12,10 +12,11 @@
void LCD_Common::printInt(unsigned int value, char padding)
{
unsigned int den = 10000;
- for (byte i = 5; i > 0; i--, den /= 10) {
+ for (byte i = 5; i > 0; i--) {
byte v = (byte)(value / den);
value -= v * den;
- if (v == 0 && padding) {
+ den /= 10;
+ if (v == 0 && padding && den) {
if (padding >= i) {
writeDigit(-1);
}
@@ -29,10 +30,11 @@ void LCD_Common::printInt(unsigned int value, char padding)
void LCD_Common::printLong(unsigned long value, char padding)
{
unsigned long den = 1000000000;
- for (byte i = 10; i > 0; i--, den /= 10) {
+ for (byte i = 10; i > 0; i--) {
byte v = (byte)(value / den);
value -= v * den;
- if (v == 0 && padding) {
+ den /= 10;
+ if (v == 0 && padding && den) {
if (padding >= i) {
writeDigit(-1);
}
@@ -57,54 +59,49 @@ size_t LCD_ZTOLED::write(uint8_t c)
if (c <= 0x20 || c >= 0x7f) {
ScI2cMxFillArea(OLED_ADDRESS, m_column, m_column + 5, m_page, m_page, 0);
} else {
- setCursor(m_column, m_page);
ScI2cMxDisplayDot(OLED_ADDRESS, font5x8[c - 0x21], 5);
}
m_column += 6;
+ ScI2cMxSetLocation(OLED_ADDRESS, m_page, m_column);
} else {
char s[2] = {c};
ScI2cMxDisplay8x16Str(OLED_ADDRESS, m_page, m_column, s);
m_column += 8;
- if (m_column >= 128) {
- m_column = 0;
- m_page += 2;
- }
+ ScI2cMxSetLocation(OLED_ADDRESS, m_page, m_column);
}
return 1;
}
-/*
-void LCD_ZTOLED::print(const char* s)
-{
- ScI2cMxDisplay8x16Str(OLED_ADDRESS, m_page, m_column, s);
- m_column += (strlen(s) << 3);
- m_page += (m_column >> 7) << 1;
- m_column %= 0x7f;
-}
-*/
-
void LCD_ZTOLED::writeDigit(byte n)
{
- if (n > 9) return;
-
if (m_font == FONT_SIZE_SMALL) {
- setCursor(m_column, m_page);
- ScI2cMxDisplayDot(OLED_ADDRESS, font5x8[n + ('0' - 0x21)], 5);
+ if (n <= 9)
+ ScI2cMxDisplayDot(OLED_ADDRESS, font5x8[n + ('0' - 0x21)], 5);
+ else
+ ScI2cMxFillArea(OLED_ADDRESS, m_column, m_column + 5, m_page, m_page, 0);
m_column += 6;
+ ScI2cMxSetLocation(OLED_ADDRESS, m_page, m_column);
} else if (m_font == FONT_SIZE_MEDIUM) {
- ScI2cMxDisplayDot(OLED_ADDRESS, digits8x8[n], 8);
+ if (n <= 9) {
+ ScI2cMxDisplayDot(OLED_ADDRESS, digits8x8[n], 8);
+ } else {
+ ScI2cMxFillArea(OLED_ADDRESS, m_column, m_column + 7, m_page, m_page, 0);
+
+ }
m_column += 8;
+ ScI2cMxSetLocation(OLED_ADDRESS, m_page, m_column);
} else if (m_font == FONT_SIZE_LARGE) {
write('0' + n);
} else {
unsigned char data[32];
- if (n >= 0 && n <= 9) {
+ if (n <= 9) {
memcpy_P(data, digits16x16[n], 32);
} else {
memset(data, 0, sizeof(data));
}
ScI2cMxDisplayDot16x16(OLED_ADDRESS, m_page, m_column, data);
m_column += 16;
+ ScI2cMxSetLocation(OLED_ADDRESS, m_page, m_column);
}
}
@@ -119,7 +116,7 @@ void LCD_ZTOLED::begin()
{
I2cInit();
ScI2cMxReset(OLED_ADDRESS);
- delay(10);
+ clear();
}
void LCD_PCD8544::writeDigit(byte n)
@@ -240,75 +237,133 @@ size_t LCD_SSD1306::write(uint8_t c)
void LCD_SSD1306::writeDigit(byte n)
{
- if (n > 9) return;
-
uint8_t twbrbackup = TWBR;
TWBR = 18; // upgrade to 400KHz!
if (m_font == FONT_SIZE_SMALL) {
n += '0' - 0x21;
Wire.beginTransmission(_i2caddr);
Wire.write(0x40);
- for (byte i = 0; i < 5; i++) {
- Wire.write(pgm_read_byte_near(&font5x8[n][i]));
+ if (n <= 9) {
+ for (byte i = 0; i < 5; i++) {
+ Wire.write(pgm_read_byte_near(&font5x8[n][i]));
+ }
+ Wire.write(0);
+ } else {
+ for (byte i = 0; i < 6; i++) {
+ Wire.write(0);
+ }
}
- Wire.write(0);
Wire.endTransmission();
m_col += 6;
} else if (m_font == FONT_SIZE_MEDIUM) {
Wire.beginTransmission(_i2caddr);
Wire.write(0x40);
- for (byte i = 0; i < 8; i++) {
- Wire.write(pgm_read_byte_near(&digits8x8[n][i]));
+ if (n <= 9) {
+ for (byte i = 0; i < 8; i++) {
+ Wire.write(pgm_read_byte_near(&digits8x8[n][i]));
+ }
+ } else {
+ for (byte i = 0; i < 8; i++) {
+ Wire.write(0);
+ }
}
Wire.endTransmission();
m_col += 8;
} else if (m_font == FONT_SIZE_LARGE) {
- n += '0' - 0x21;
- ssd1306_command(0xB0 + m_row);//set page address
- ssd1306_command(m_col & 0xf);//set lower column address
- ssd1306_command(0x10 | (m_col >> 4));//set higher column address
+ if (n <= 9) {
+ n += '0' - 0x21;
+ ssd1306_command(0xB0 + m_row);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
- Wire.beginTransmission(_i2caddr);
- Wire.write(0x40);
- for (byte i = 0; i <= 14; i += 2) {
- Wire.write(pgm_read_byte_near(&font8x16_terminal[n][i]));
- }
- Wire.endTransmission();
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (byte i = 0; i <= 14; i += 2) {
+ Wire.write(pgm_read_byte_near(&font8x16_terminal[n][i]));
+ }
+ Wire.endTransmission();
- ssd1306_command(0xB0 + m_row + 1);//set page address
- ssd1306_command(m_col & 0xf);//set lower column address
- ssd1306_command(0x10 | (m_col >> 4));//set higher column address
+ ssd1306_command(0xB0 + m_row + 1);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
- Wire.beginTransmission(_i2caddr);
- Wire.write(0x40);
- for (byte i = 1; i <= 15; i += 2) {
- Wire.write(pgm_read_byte_near(&font8x16_terminal[n][i]));
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (byte i = 1; i <= 15; i += 2) {
+ Wire.write(pgm_read_byte_near(&font8x16_terminal[n][i]));
+ }
+ Wire.endTransmission();
+ } else {
+ ssd1306_command(0xB0 + m_row);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
+
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (byte i = 0; i < 8; i++) {
+ Wire.write(0);
+ }
+ Wire.endTransmission();
+
+ ssd1306_command(0xB0 + m_row + 1);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
+
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (byte i = 0; i < 8; i++) {
+ Wire.write(0);
+ }
+ Wire.endTransmission();
}
- Wire.endTransmission();
m_col += 9;
} else if (m_font == FONT_SIZE_XLARGE) {
- byte i;
- ssd1306_command(0xB0 + m_row);//set page address
- ssd1306_command(m_col & 0xf);//set lower column address
- ssd1306_command(0x10 | (m_col >> 4));//set higher column address
+ if (n <= 9) {
+ byte i;
+ ssd1306_command(0xB0 + m_row);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
- Wire.beginTransmission(_i2caddr);
- Wire.write(0x40);
- for (i = 0; i < 16; i ++) {
- Wire.write(pgm_read_byte_near(&digits16x16[n][i]));
- }
- Wire.endTransmission();
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (i = 0; i < 16; i ++) {
+ Wire.write(pgm_read_byte_near(&digits16x16[n][i]));
+ }
+ Wire.endTransmission();
+
+ ssd1306_command(0xB0 + m_row + 1);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
- ssd1306_command(0xB0 + m_row + 1);//set page address
- ssd1306_command(m_col & 0xf);//set lower column address
- ssd1306_command(0x10 | (m_col >> 4));//set higher column address
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (; i < 32; i ++) {
+ Wire.write(pgm_read_byte_near(&digits16x16[n][i]));
+ }
+ Wire.endTransmission();
+ } else {
+ ssd1306_command(0xB0 + m_row);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
- Wire.beginTransmission(_i2caddr);
- Wire.write(0x40);
- for (; i < 32; i ++) {
- Wire.write(pgm_read_byte_near(&digits16x16[n][i]));
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (byte i = 0; i < 16; i++) {
+ Wire.write(0);
+ }
+ Wire.endTransmission();
+
+ ssd1306_command(0xB0 + m_row + 1);//set page address
+ ssd1306_command(m_col & 0xf);//set lower column address
+ ssd1306_command(0x10 | (m_col >> 4));//set higher column address
+
+ Wire.beginTransmission(_i2caddr);
+ Wire.write(0x40);
+ for (byte i = 0; i < 16; i++) {
+ Wire.write(0);
+ }
+ Wire.endTransmission();
}
- Wire.endTransmission();
m_col += 16;
}
TWBR = twbrbackup;
diff --git a/libraries/MultiLCD/MultiLCD.h b/libraries/MultiLCD/MultiLCD.h
index 0b761ce..138ac09 100644
--- a/libraries/MultiLCD/MultiLCD.h
+++ b/libraries/MultiLCD/MultiLCD.h
@@ -132,7 +132,7 @@ private:
class LCD_ILI9325D : public LCD_Common, public Print
{
public:
- LCD_ILI9325D():m_lineHeight(10) {}
+ LCD_ILI9325D():m_lineHeight(8) {}
void setCursor(uint16_t column, uint16_t line)
{
m_y = column;
diff --git a/libraries/MultiLCD/examples/lcdhello/lcdhello.ino b/libraries/MultiLCD/examples/lcdhello/lcdhello.ino
index cbfbc9b..517e88b 100644
--- a/libraries/MultiLCD/examples/lcdhello/lcdhello.ino
+++ b/libraries/MultiLCD/examples/lcdhello/lcdhello.ino
@@ -24,8 +24,6 @@ static const PROGMEM uint8_t smile[48 * 48 / 8] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0F,0x1F,0x1F,0x3F,0x3F,0x7F,0x7F,0x7E,0xFE,0xFE,0xFC,0xFC,0xFC,0xFC,0xFC,0xFC,0xFC,0xFC,0xFC,0xFC,0xFE,0xFE,0x7E,0x7F,0x7F,0x3F,0x3F,0x1F,0x1F,0x0F,0x07,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
};
-#include "images.h"
-
void setup()
{
lcd.begin();
@@ -33,19 +31,11 @@ void setup()
void loop()
{
- //lcd.draw2x(frame0[0], 0, 124, 78, 58);
- //lcd.draw2x(frame0[0], 164, 124, 78, 58);
- //lcd.draw2x(frame0[0], 0, 0, 78, 58);
- //lcd.draw2x(frame0[0], 164, 0, 78, 58);
- lcd.clear();
- lcd.draw(smile, 40, 0, 48, 48);
- lcd.setCursor(0, 6);
- lcd.setFont(FONT_SIZE_MEDIUM);
- lcd.print("Microduino+BLE");
-
- delay(3000);
+ lcd.clear();
+ lcd.draw(smile, 40, 8, 48, 48);
+ delay(1000);
- lcd.clear();
+ lcd.clear();
lcd.setCursor(0, 0);
lcd.setFont(FONT_SIZE_SMALL);
lcd.print("Hello, world!");
@@ -70,5 +60,5 @@ void loop()
lcd.setFont(FONT_SIZE_XLARGE);
lcd.printLong(12345678);
- delay(3000);
+ delay(3000);
}
--
cgit v1.2.3