wirtz
/
LiquidCrystalPlus_I2C
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Additions for "Plus" version and some small renaming parts.

Browse Source
master
Holger Wirtz 7 years ago
parent 5c0be63b8d
commit ccb0102aa8
2 changed files with 104 additions and 53 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 142
      LiquidCrystalPlus_I2C.cpp
  2. 15
      LiquidCrystalPlus_I2C.h

142
LiquidCrystal_I2C.cpp → LiquidCrystalPlus_I2C.cpp
Unescape View File

@ -1,13 +1,13 @@
// Based on the work by DFRobot // Based on the work by DFRobot
#include "LiquidCrystal_I2C.h" #include "LiquidCrystalPlus_I2C.h"
#include <inttypes.h> #include <inttypes.h>
#if defined(ARDUINO) && ARDUINO >= 100 #if defined(ARDUINO) && ARDUINO >= 100
#include "Arduino.h" #include "Arduino.h"
#define printIIC(args) Wire.write(args) #define printIIC(args) Wire.write(args)
inline size_t LiquidCrystal_I2C::write(uint8_t value) { inline size_t LiquidCrystalPlus_I2C::write(uint8_t value) {
send(value, Rs); send(value, Rs);
return 1; return 1;
} }
@ -16,7 +16,7 @@ inline size_t LiquidCrystal_I2C::write(uint8_t value) {
#include "WProgram.h" #include "WProgram.h"
#define printIIC(args) Wire.send(args) #define printIIC(args) Wire.send(args)
inline void LiquidCrystal_I2C::write(uint8_t value) { inline void LiquidCrystalPlus_I2C::write(uint8_t value) {
send(value, Rs); send(value, Rs);
} }
@ -44,7 +44,7 @@ inline void LiquidCrystal_I2C::write(uint8_t value) {
// can't assume that its in that state when a sketch starts (and the // can't assume that its in that state when a sketch starts (and the
// LiquidCrystal constructor is called). // LiquidCrystal constructor is called).
LiquidCrystal_I2C::LiquidCrystal_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows) LiquidCrystalPlus_I2C::LiquidCrystalPlus_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows)
{ {
_Addr = lcd_Addr; _Addr = lcd_Addr;
_cols = lcd_cols; _cols = lcd_cols;
@ -52,23 +52,23 @@ LiquidCrystal_I2C::LiquidCrystal_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t l
_backlightval = LCD_NOBACKLIGHT; _backlightval = LCD_NOBACKLIGHT;
} }
void LiquidCrystal_I2C::oled_init(){ void LiquidCrystalPlus_I2C::oled_init(){
_oled = true; _oled = true;
init_priv(); init_priv();
} }
void LiquidCrystal_I2C::init(){ void LiquidCrystalPlus_I2C::init(){
init_priv(); init_priv();
} }
void LiquidCrystal_I2C::init_priv() void LiquidCrystalPlus_I2C::init_priv()
{ {
Wire.begin(); Wire.begin();
_displayfunction = LCD_4BITMODE | LCD_1LINE | LCD_5x8DOTS; _displayfunction = LCD_4BITMODE | LCD_1LINE | LCD_5x8DOTS;
begin(_cols, _rows); begin(_cols, _rows);
} }
void LiquidCrystal_I2C::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) { void LiquidCrystalPlus_I2C::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
if (lines > 1) { if (lines > 1) {
_displayfunction |= LCD_2LINE; _displayfunction |= LCD_2LINE;
} }
@ -129,18 +129,18 @@ void LiquidCrystal_I2C::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
} }
/********** high level commands, for the user! */ /********** high level commands, for the user! */
void LiquidCrystal_I2C::clear(){ void LiquidCrystalPlus_I2C::clear(){
command(LCD_CLEARDISPLAY);// clear display, set cursor position to zero command(LCD_CLEARDISPLAY);// clear display, set cursor position to zero
delayMicroseconds(2000); // this command takes a long time! delayMicroseconds(2000); // this command takes a long time!
if (_oled) setCursor(0,0); if (_oled) setCursor(0,0);
} }
void LiquidCrystal_I2C::home(){ void LiquidCrystalPlus_I2C::home(){
command(LCD_RETURNHOME); // set cursor position to zero command(LCD_RETURNHOME); // set cursor position to zero
delayMicroseconds(2000); // this command takes a long time! delayMicroseconds(2000); // this command takes a long time!
} }
void LiquidCrystal_I2C::setCursor(uint8_t col, uint8_t row){ void LiquidCrystalPlus_I2C::setCursor(uint8_t col, uint8_t row){
int row_offsets[] = { 0x00, 0x40, 0x14, 0x54 }; int row_offsets[] = { 0x00, 0x40, 0x14, 0x54 };
if ( row > _numlines ) { if ( row > _numlines ) {
row = _numlines-1; // we count rows starting w/0 row = _numlines-1; // we count rows starting w/0
@ -149,70 +149,70 @@ void LiquidCrystal_I2C::setCursor(uint8_t col, uint8_t row){
} }
// Turn the display on/off (quickly) // Turn the display on/off (quickly)
void LiquidCrystal_I2C::noDisplay() { void LiquidCrystalPlus_I2C::noDisplay() {
_displaycontrol &= ~LCD_DISPLAYON; _displaycontrol &= ~LCD_DISPLAYON;
command(LCD_DISPLAYCONTROL | _displaycontrol); command(LCD_DISPLAYCONTROL | _displaycontrol);
} }
void LiquidCrystal_I2C::display() { void LiquidCrystalPlus_I2C::display() {
_displaycontrol |= LCD_DISPLAYON; _displaycontrol |= LCD_DISPLAYON;
command(LCD_DISPLAYCONTROL | _displaycontrol); command(LCD_DISPLAYCONTROL | _displaycontrol);
} }
// Turns the underline cursor on/off // Turns the underline cursor on/off
void LiquidCrystal_I2C::noCursor() { void LiquidCrystalPlus_I2C::noCursor() {
_displaycontrol &= ~LCD_CURSORON; _displaycontrol &= ~LCD_CURSORON;
command(LCD_DISPLAYCONTROL | _displaycontrol); command(LCD_DISPLAYCONTROL | _displaycontrol);
} }
void LiquidCrystal_I2C::cursor() { void LiquidCrystalPlus_I2C::cursor() {
_displaycontrol |= LCD_CURSORON; _displaycontrol |= LCD_CURSORON;
command(LCD_DISPLAYCONTROL | _displaycontrol); command(LCD_DISPLAYCONTROL | _displaycontrol);
} }
// Turn on and off the blinking cursor // Turn on and off the blinking cursor
void LiquidCrystal_I2C::noBlink() { void LiquidCrystalPlus_I2C::noBlink() {
_displaycontrol &= ~LCD_BLINKON; _displaycontrol &= ~LCD_BLINKON;
command(LCD_DISPLAYCONTROL | _displaycontrol); command(LCD_DISPLAYCONTROL | _displaycontrol);
} }
void LiquidCrystal_I2C::blink() { void LiquidCrystalPlus_I2C::blink() {
_displaycontrol |= LCD_BLINKON; _displaycontrol |= LCD_BLINKON;
command(LCD_DISPLAYCONTROL | _displaycontrol); command(LCD_DISPLAYCONTROL | _displaycontrol);
} }
// These commands scroll the display without changing the RAM // These commands scroll the display without changing the RAM
void LiquidCrystal_I2C::scrollDisplayLeft(void) { void LiquidCrystalPlus_I2C::scrollDisplayLeft(void) {
command(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVELEFT); command(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVELEFT);
} }
void LiquidCrystal_I2C::scrollDisplayRight(void) { void LiquidCrystalPlus_I2C::scrollDisplayRight(void) {
command(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVERIGHT); command(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVERIGHT);
} }
// This is for text that flows Left to Right // This is for text that flows Left to Right
void LiquidCrystal_I2C::leftToRight(void) { void LiquidCrystalPlus_I2C::leftToRight(void) {
_displaymode |= LCD_ENTRYLEFT; _displaymode |= LCD_ENTRYLEFT;
command(LCD_ENTRYMODESET | _displaymode); command(LCD_ENTRYMODESET | _displaymode);
} }
// This is for text that flows Right to Left // This is for text that flows Right to Left
void LiquidCrystal_I2C::rightToLeft(void) { void LiquidCrystalPlus_I2C::rightToLeft(void) {
_displaymode &= ~LCD_ENTRYLEFT; _displaymode &= ~LCD_ENTRYLEFT;
command(LCD_ENTRYMODESET | _displaymode); command(LCD_ENTRYMODESET | _displaymode);
} }
// This will 'right justify' text from the cursor // This will 'right justify' text from the cursor
void LiquidCrystal_I2C::autoscroll(void) { void LiquidCrystalPlus_I2C::autoscroll(void) {
_displaymode |= LCD_ENTRYSHIFTINCREMENT; _displaymode |= LCD_ENTRYSHIFTINCREMENT;
command(LCD_ENTRYMODESET | _displaymode); command(LCD_ENTRYMODESET | _displaymode);
} }
// This will 'left justify' text from the cursor // This will 'left justify' text from the cursor
void LiquidCrystal_I2C::noAutoscroll(void) { void LiquidCrystalPlus_I2C::noAutoscroll(void) {
_displaymode &= ~LCD_ENTRYSHIFTINCREMENT; _displaymode &= ~LCD_ENTRYSHIFTINCREMENT;
command(LCD_ENTRYMODESET | _displaymode); command(LCD_ENTRYMODESET | _displaymode);
} }
// Allows us to fill the first 8 CGRAM locations // Allows us to fill the first 8 CGRAM locations
// with custom characters // with custom characters
void LiquidCrystal_I2C::createChar(uint8_t location, uint8_t charmap[]) { void LiquidCrystalPlus_I2C::createChar(uint8_t location, uint8_t charmap[]) {
location &= 0x7; // we only have 8 locations 0-7 location &= 0x7; // we only have 8 locations 0-7
command(LCD_SETCGRAMADDR | (location << 3)); command(LCD_SETCGRAMADDR | (location << 3));
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
@ -221,7 +221,7 @@ void LiquidCrystal_I2C::createChar(uint8_t location, uint8_t charmap[]) {
} }
//createChar with PROGMEM input //createChar with PROGMEM input
void LiquidCrystal_I2C::createChar(uint8_t location, const char *charmap) { void LiquidCrystalPlus_I2C::createChar(uint8_t location, const char *charmap) {
location &= 0x7; // we only have 8 locations 0-7 location &= 0x7; // we only have 8 locations 0-7
command(LCD_SETCGRAMADDR | (location << 3)); command(LCD_SETCGRAMADDR | (location << 3));
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
@ -230,12 +230,12 @@ void LiquidCrystal_I2C::createChar(uint8_t location, const char *charmap) {
} }
// Turn the (optional) backlight off/on // Turn the (optional) backlight off/on
void LiquidCrystal_I2C::noBacklight(void) { void LiquidCrystalPlus_I2C::noBacklight(void) {
_backlightval=LCD_NOBACKLIGHT; _backlightval=LCD_NOBACKLIGHT;
expanderWrite(0); expanderWrite(0);
} }
void LiquidCrystal_I2C::backlight(void) { void LiquidCrystalPlus_I2C::backlight(void) {
_backlightval=LCD_BACKLIGHT; _backlightval=LCD_BACKLIGHT;
expanderWrite(0); expanderWrite(0);
} }
@ -244,7 +244,7 @@ void LiquidCrystal_I2C::backlight(void) {
/*********** mid level commands, for sending data/cmds */ /*********** mid level commands, for sending data/cmds */
inline void LiquidCrystal_I2C::command(uint8_t value) { inline void LiquidCrystalPlus_I2C::command(uint8_t value) {
send(value, 0); send(value, 0);
} }
@ -252,25 +252,25 @@ inline void LiquidCrystal_I2C::command(uint8_t value) {
/************ low level data pushing commands **********/ /************ low level data pushing commands **********/
// write either command or data // write either command or data
void LiquidCrystal_I2C::send(uint8_t value, uint8_t mode) { void LiquidCrystalPlus_I2C::send(uint8_t value, uint8_t mode) {
uint8_t highnib=value&0xf0; uint8_t highnib=value&0xf0;
uint8_t lownib=(value<<4)&0xf0; uint8_t lownib=(value<<4)&0xf0;
write4bits((highnib)|mode); write4bits((highnib)|mode);
write4bits((lownib)|mode); write4bits((lownib)|mode);
} }
void LiquidCrystal_I2C::write4bits(uint8_t value) { void LiquidCrystalPlus_I2C::write4bits(uint8_t value) {
expanderWrite(value); expanderWrite(value);
pulseEnable(value); pulseEnable(value);
} }
void LiquidCrystal_I2C::expanderWrite(uint8_t _data){ void LiquidCrystalPlus_I2C::expanderWrite(uint8_t _data){
Wire.beginTransmission(_Addr); Wire.beginTransmission(_Addr);
printIIC((int)(_data) | _backlightval); printIIC((int)(_data) | _backlightval);
Wire.endTransmission(); Wire.endTransmission();
} }
void LiquidCrystal_I2C::pulseEnable(uint8_t _data){ void LiquidCrystalPlus_I2C::pulseEnable(uint8_t _data){
expanderWrite(_data | En); // En high expanderWrite(_data | En); // En high
delayMicroseconds(1); // enable pulse must be >450ns delayMicroseconds(1); // enable pulse must be >450ns
@ -281,27 +281,27 @@ void LiquidCrystal_I2C::pulseEnable(uint8_t _data){
// Alias functions // Alias functions
void LiquidCrystal_I2C::cursor_on(){ void LiquidCrystalPlus_I2C::cursor_on(){
cursor(); cursor();
} }
void LiquidCrystal_I2C::cursor_off(){ void LiquidCrystalPlus_I2C::cursor_off(){
noCursor(); noCursor();
} }
void LiquidCrystal_I2C::blink_on(){ void LiquidCrystalPlus_I2C::blink_on(){
blink(); blink();
} }
void LiquidCrystal_I2C::blink_off(){ void LiquidCrystalPlus_I2C::blink_off(){
noBlink(); noBlink();
} }
void LiquidCrystal_I2C::load_custom_character(uint8_t char_num, uint8_t *rows){ void LiquidCrystalPlus_I2C::load_custom_character(uint8_t char_num, uint8_t *rows){
createChar(char_num, rows); createChar(char_num, rows);
} }
void LiquidCrystal_I2C::setBacklight(uint8_t new_val){ void LiquidCrystalPlus_I2C::setBacklight(uint8_t new_val){
if(new_val){ if(new_val){
backlight(); // turn backlight on backlight(); // turn backlight on
}else{ }else{
@ -309,24 +309,70 @@ void LiquidCrystal_I2C::setBacklight(uint8_t new_val){
} }
} }
void LiquidCrystal_I2C::printstr(const char c[]){ void LiquidCrystalPlus_I2C::printstr(const char c[]){
//This function is not identical to the function used for "real" I2C displays //This function is not identical to the function used for "real" I2C displays
//it's here so the user sketch doesn't have to be changed //it's here so the user sketch doesn't have to be changed
print(c); print(c);
} }
void LiquidCrystalPlus_I2C::show(uint8_t y, uint8_t x, uint8_t fs, char *str)
{
_show(y, x, fs, str, false, false);
}
void LiquidCrystalPlus_I2C::show(uint8_t y, uint8_t x, uint8_t fs, long num)
{
char _buf10[11];
_show(y, x, fs, itoa(num, _buf10, 10), true, true);
}
void LiquidCrystalPlus_I2C::_show(uint8_t pos_y, uint8_t pos_x, uint8_t field_size, char *str, bool justify_right, bool fill_zero)
{
char tmp[_cols + 1];
char *s = tmp;
uint8_t l = strlen(str);
if (fill_zero == true)
memset(tmp, '0', field_size);
else
memset(tmp, 0x20, field_size); // blank
tmp[field_size] = '\0';
if (l > field_size)
l = field_size;
if (justify_right == true)
s += field_size - l;
strncpy(s, str, l);
setCursor(pos_x, pos_y);
print(tmp);
#ifdef DEBUG
Serial.print(pos_y, DEC);
Serial.print(F("/"));
Serial.print(pos_x, DEC);
Serial.print(F(": ["));
Serial.print(tmp);
Serial.println(F("]"));
#endif
}
// unsupported API functions // unsupported API functions
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
void LiquidCrystal_I2C::off(){} void LiquidCrystalPlus_I2C::off(){}
void LiquidCrystal_I2C::on(){} void LiquidCrystalPlus_I2C::on(){}
void LiquidCrystal_I2C::setDelay (int cmdDelay,int charDelay) {} void LiquidCrystalPlus_I2C::setDelay (int cmdDelay,int charDelay) {}
uint8_t LiquidCrystal_I2C::status(){return 0;} uint8_t LiquidCrystalPlus_I2C::status(){return 0;}
uint8_t LiquidCrystal_I2C::keypad (){return 0;} uint8_t LiquidCrystalPlus_I2C::keypad (){return 0;}
uint8_t LiquidCrystal_I2C::init_bargraph(uint8_t graphtype){return 0;} uint8_t LiquidCrystalPlus_I2C::init_bargraph(uint8_t graphtype){return 0;}
void LiquidCrystal_I2C::draw_horizontal_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end){} void LiquidCrystalPlus_I2C::draw_horizontal_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end){}
void LiquidCrystal_I2C::draw_vertical_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_row_end){} void LiquidCrystalPlus_I2C::draw_vertical_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_row_end){}
void LiquidCrystal_I2C::setContrast(uint8_t new_val){} void LiquidCrystalPlus_I2C::setContrast(uint8_t new_val){}
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

15
LiquidCrystal_I2C.h → LiquidCrystalPlus_I2C.h
Unescape View File

@ -1,6 +1,6 @@
//YWROBOT //YWROBOT
#ifndef LiquidCrystal_I2C_h #ifndef LiquidCrystalPlus_I2C_h
#define LiquidCrystal_I2C_h #define LiquidCrystalPlus_I2C_h
#include <inttypes.h> #include <inttypes.h>
#include "Print.h" #include "Print.h"
@ -52,9 +52,9 @@
#define Rw B00000010 // Read/Write bit #define Rw B00000010 // Read/Write bit
#define Rs B00000001 // Register select bit #define Rs B00000001 // Register select bit
class LiquidCrystal_I2C : public Print { class LiquidCrystalPlus_I2C : public Print {
public: public:
LiquidCrystal_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows); LiquidCrystalPlus_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows);
void begin(uint8_t cols, uint8_t rows, uint8_t charsize = LCD_5x8DOTS ); void begin(uint8_t cols, uint8_t rows, uint8_t charsize = LCD_5x8DOTS );
void clear(); void clear();
void home(); void home();
@ -109,7 +109,9 @@ void off();
uint8_t init_bargraph(uint8_t graphtype); uint8_t init_bargraph(uint8_t graphtype);
void draw_horizontal_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end); void draw_horizontal_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end);
void draw_vertical_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end); void draw_vertical_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end);
void show(uint8_t y, uint8_t x, uint8_t fs, char *str);
void show(uint8_t y, uint8_t x, uint8_t fs, long num);
private: private:
void init_priv(); void init_priv();
@ -126,6 +128,9 @@ private:
uint8_t _cols; uint8_t _cols;
uint8_t _rows; uint8_t _rows;
uint8_t _backlightval; uint8_t _backlightval;
void _show(uint8_t pos_y, uint8_t pos_x, uint8_t field_size, char *str, bool justify_right, bool fill_zero);
}; };
#endif #endif
Write Preview
Loading…
Cancel
Save