Michel2/New-LiquidCrystal
1
0
Fork 0
mirror of https://github.com/fmalpartida/New-LiquidCrystal.git synced 2026-07-27 19:56:57 +00:00
Code Issues Releases Wiki Activity

Corrected some indentation problems.

Browse Source 
Removed redundant _cols, _rows from child classes and moved them to parent virtual class.
closes #7 - Support for 16x4 LCDs and their peculiar addressing.
This commit is contained in:
FMC
2011-11-21 21:58:40 +01:00
parent 2327bc9813
commit 55ae7bad31
6 changed files with 87 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LCD.cpp
+13 -3
View File
@@ -46,7 +46,6 @@
// CLASS CONSTRUCTORS
// ---------------------------------------------------------------------------
// Constructor
LCD::LCD ()
{
@@ -72,14 +71,25 @@ void LCD::home()
void LCD::setCursor(uint8_t col, uint8_t row)
{
int row_offsets[] = { 0x00, 0x40, 0x14, 0x54 };
int row_offsetsDef[] = { 0x00, 0x40, 0x14, 0x54 }; // For regular LCDs
int row_offsetsLarge[] = { 0x00, 0x40, 0x10, 0x50 }; // For 16x4 LCDs
if ( row >= _numlines )
{
row = _numlines-1; // rows start at 0
}
command(LCD_SETDDRAMADDR | (col + row_offsets[row]));
// 16x4 LCDs have special memory map layout
// ----------------------------------------
if ( _cols == 16 && _numlines == 4 )
{
command(LCD_SETDDRAMADDR | (col + row_offsetsLarge[row]));
}
else
{
command(LCD_SETDDRAMADDR | (col + row_offsetsDef[row]));
}
}
// Turn the display on/off
LCD.h
+1
View File
@@ -393,6 +393,7 @@ protected:
// all commands are "ored" to its contents.
uint8_t _displaymode; // Text entry mode to the LCD
uint8_t _numlines; // Number of lines of the LCD, initialized with begin()
uint8_t _cols; // Number of columns in the LCD
private:
LiquidCrystal.cpp
+4 -4
View File
@@ -180,6 +180,7 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize)
_displayfunction |= LCD_2LINE;
}
_numlines = lines;
_cols = cols;
// for some 1 line displays you can select a 10 pixel high font
// ------------------------------------------------------------
@@ -283,7 +284,7 @@ void LiquidCrystal::send(uint8_t value, uint8_t mode)
write4bits ( value >> 4 );
write4bits ( value );
}
waitUsec ( EXEC_TIME );
waitUsec ( EXEC_TIME ); // wait for the command to execute by the LCD
}
//
@@ -292,9 +293,8 @@ void LiquidCrystal::pulseEnable(void)
{
// There is no need for the delays, since the digitalWrite operation
// takes longer.
digitalWrite(_enable_pin, HIGH);
waitUsec(1); // enable pulse must be > 450ns
digitalWrite(_enable_pin, HIGH);
waitUsec(1); // enable pulse must be > 450ns
digitalWrite(_enable_pin, LOW);
}
LiquidCrystal_I2C.cpp
+68 -70
View File
@@ -70,7 +70,7 @@ LiquidCrystal_I2C::LiquidCrystal_I2C( uint8_t lcd_Addr )
_En = EN;
_Rw = RW;
_Rs = RS;
// Initialise default values data[0] pin 0, data[1] pin 1, ...
for ( uint8_t i = 0; i < 4; i++ )
{
@@ -79,7 +79,7 @@ LiquidCrystal_I2C::LiquidCrystal_I2C( uint8_t lcd_Addr )
}
LiquidCrystal_I2C::LiquidCrystal_I2C( uint8_t lcd_Addr, uint8_t En, uint8_t Rw,
uint8_t Rs)
uint8_t Rs)
{
_Addr = lcd_Addr;
@@ -96,8 +96,8 @@ LiquidCrystal_I2C::LiquidCrystal_I2C( uint8_t lcd_Addr, uint8_t En, uint8_t Rw,
}
LiquidCrystal_I2C::LiquidCrystal_I2C( uint8_t lcd_Addr, uint8_t En, uint8_t Rw,
uint8_t Rs, uint8_t d0, uint8_t d1,
uint8_t d2, uint8_t d3 )
uint8_t Rs, uint8_t d0, uint8_t d1,
uint8_t d2, uint8_t d3 )
{
_Addr = lcd_Addr;
@@ -125,7 +125,7 @@ int LiquidCrystal_I2C::init()
// initialize the backpack IO expander
// and display functions.
// ------------------------------------------------------------------------
if ( _i2cio.begin ( _Addr ) == 1 )
if ( _i2cio.begin ( _Addr ) == 1 )
{
_i2cio.portMode ( OUTPUT ); // Set the entire IO extender to OUTPUT
_displayfunction = LCD_4BITMODE | LCD_1LINE | LCD_5x8DOTS;
@@ -142,68 +142,67 @@ int LiquidCrystal_I2C::init()
// begin
void LiquidCrystal_I2C::begin(uint8_t cols, uint8_t lines, uint8_t dotsize)
{
_cols = cols;
_rows = lines;
init(); // Initialise the I2C expander interface
if (lines > 1)
if (lines > 1)
{
_displayfunction |= LCD_2LINE;
}
_numlines = lines;
_displayfunction |= LCD_2LINE;
}
_numlines = lines;
_cols = cols;
// for some 1 line displays you can select a 10 pixel high font
if ((dotsize != 0) && (lines == 1)) {
_displayfunction |= LCD_5x10DOTS;
}
// for some 1 line displays you can select a 10 pixel high font
if ((dotsize != 0) && (lines == 1)) {
_displayfunction |= LCD_5x10DOTS;
}
// SEE PAGE 45/46 FOR INITIALIZATION SPECIFICATION!
// according to datasheet, we need at least 40ms after power rises above 2.7V
// before sending commands. Arduino can turn on way before 4.5V so we'll wait 50
delayMicroseconds(50000);
// SEE PAGE 45/46 FOR INITIALIZATION SPECIFICATION!
// according to datasheet, we need at least 40ms after power rises above 2.7V
// before sending commands. Arduino can turn on way before 4.5V so we'll wait 50
delayMicroseconds(50000);
// Now we pull both RS and R/W low to begin commands
expanderWrite ( _backlightval ); // reset expander and turn backlight off (Bit 8 =1)
delay(1000);
// Now we pull both RS and R/W low to begin commands
expanderWrite ( _backlightval ); // reset expander and turn backlight off (Bit 8 =1)
delay(1000);
//put the LCD into 4 bit mode
// this is according to the hitachi HD44780 datasheet
// figure 24, pg 46
// we start in 8bit mode, try to set 4 bit mode
write4bits ( 0x03, LOW );
delayMicroseconds(4500); // wait min 4.1ms
// second try
write4bits ( 0x03, LOW );
delayMicroseconds(4500); // wait min 4.1ms
// third go!
write4bits ( 0x03, LOW );
delayMicroseconds(150);
// finally, set to 4-bit interface
write4bits ( 0x02, LOW );
//put the LCD into 4 bit mode
// this is according to the hitachi HD44780 datasheet
// figure 24, pg 46
// we start in 8bit mode, try to set 4 bit mode
write4bits ( 0x03, LOW );
delayMicroseconds(4500); // wait min 4.1ms
// second try
write4bits ( 0x03, LOW );
delayMicroseconds(4500); // wait min 4.1ms
// third go!
write4bits ( 0x03, LOW );
delayMicroseconds(150);
// finally, set to 4-bit interface
write4bits ( 0x02, LOW );
// set # lines, font size, etc.
command(LCD_FUNCTIONSET | _displayfunction);
// turn the display on with no cursor or blinking default
_displaycontrol = LCD_DISPLAYON | LCD_CURSOROFF | LCD_BLINKOFF;
display();
// clear it off
clear();
// Initialize to default text direction (for roman languages)
_displaymode = LCD_ENTRYLEFT | LCD_ENTRYSHIFTDECREMENT;
// set the entry mode
command(LCD_ENTRYMODESET | _displaymode);
home();
// set # lines, font size, etc.
command(LCD_FUNCTIONSET | _displayfunction);
// turn the display on with no cursor or blinking default
_displaycontrol = LCD_DISPLAYON | LCD_CURSOROFF | LCD_BLINKOFF;
display();
// clear it off
clear();
// Initialize to default text direction (for roman languages)
_displaymode = LCD_ENTRYLEFT | LCD_ENTRYSHIFTDECREMENT;
// set the entry mode
command(LCD_ENTRYMODESET | _displaymode);
home();
}
@@ -214,14 +213,14 @@ void LiquidCrystal_I2C::begin(uint8_t cols, uint8_t lines, uint8_t dotsize)
// Turn the (optional) backlight off/on
void LiquidCrystal_I2C::noBacklight(void)
{
_backlightval=LCD_NOBACKLIGHT;
expanderWrite(0);
_backlightval=LCD_NOBACKLIGHT;
expanderWrite(0);
}
void LiquidCrystal_I2C::backlight(void)
{
_backlightval=LCD_BACKLIGHT;
expanderWrite(0);
_backlightval=LCD_BACKLIGHT;
expanderWrite(0);
}
// PRIVATE METHODS
@@ -234,9 +233,11 @@ void LiquidCrystal_I2C::backlight(void)
// send - write either command or data
void LiquidCrystal_I2C::send(uint8_t value, uint8_t mode)
{
// No need to use the delay routines since the time taken to write takes
// longer that what is needed both for toggling and enable pin an to execute
// the command.
write4bits( (value >> 4), mode );
write4bits( (value & 0x0F), mode);
write4bits( (value & 0x0F), mode);
}
//
@@ -263,19 +264,16 @@ void LiquidCrystal_I2C::write4bits ( uint8_t value, uint8_t mode )
mode = _Rs;
}
expanderWrite ( pinMapValue | mode );
pulseEnable ( pinMapValue | mode );
expanderWrite ( pinMapValue | mode );
pulseEnable ( pinMapValue | mode );
}
//
// write4bits
void LiquidCrystal_I2C::pulseEnable (uint8_t _data)
{
// No need to use the delay routines since the time taken to write takes
// longer that what is needed.
expanderWrite (_data | _En); // En HIGH
expanderWrite(_data & ~_En); // En LOW
expanderWrite (_data | _En); // En HIGH
expanderWrite(_data & ~_En); // En LOW
}
//
LiquidCrystal_I2C.h
-2
View File
@@ -201,8 +201,6 @@ private:
void expanderWrite(uint8_t);
uint8_t _Addr; // I2C Address of the IO expander
uint8_t _cols; // Number of columns of the LCD
uint8_t _rows; // Number of rows of the LCD
uint8_t _backlightval; // Backlight shadow value
I2CIO _i2cio; // I2CIO PCF8574* expansion module driver I2CLCDextraIO
uint8_t _En; // LCD expander word for enable pin
LiquidCrystal_SR.cpp
+1
View File
@@ -171,6 +171,7 @@ void LiquidCrystal_SR::begin(uint8_t cols, uint8_t lines, uint8_t dotsize)
}
_numlines = lines;
_cols = cols;
// for some 1 line displays you can select a 10 pixel high font
// ------------------------------------------------------------