Skip to content

LiquidCrystal improvements (support 16x4 displays) #1748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 5, 2014
Merged

LiquidCrystal improvements (support 16x4 displays) #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03a6b2c
Added setRowOffsets to LiquidCrystal library
msproul Dec 4, 2011
3fdda81
Make the LiquidCrystal row offsets uint8_t instead of int
matthijskooijman Dec 18, 2013
1786716
In LiquidCrystal::setCursor(), check against length of _row_offsets a…
matthijskooijman Dec 18, 2013
265ac7b
Support more LiquidCrystal displays out of the box
matthijskooijman Dec 18, 2013
8c6bcf0
In LiquidCrystal::begin(), use a define instead of a hardcoded 0
matthijskooijman Dec 18, 2013
9552db3
In LiquidCrystal, remove an unused variable
matthijskooijman Dec 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions libraries/LiquidCrystal/src/LiquidCrystal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
_displayfunction |= LCD_2LINE;
}
_numlines = lines;
_currline = 0;

setRowOffsets(0x00, 0x40, 0x00 + cols, 0x40 + cols);

// for some 1 line displays you can select a 10 pixel high font
if ((dotsize != 0) && (lines == 1)) {
if ((dotsize != LCD_5x8DOTS) && (lines == 1)) {
_displayfunction |= LCD_5x10DOTS;
}

Expand Down Expand Up @@ -157,6 +158,14 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {

}

void LiquidCrystal::setRowOffsets(int row0, int row1, int row2, int row3)
{
_row_offsets[0] = row0;
_row_offsets[1] = row1;
_row_offsets[2] = row2;
_row_offsets[3] = row3;
}

/********** high level commands, for the user! */
void LiquidCrystal::clear()
{
Expand All @@ -172,12 +181,15 @@ void LiquidCrystal::home()

void LiquidCrystal::setCursor(uint8_t col, uint8_t row)
{
int row_offsets[] = { 0x00, 0x40, 0x14, 0x54 };
const size_t max_lines = sizeof(_row_offsets) / sizeof(*_row_offsets);
if ( row >= max_lines ) {
row = max_lines - 1; // we count rows starting w/0
}
if ( row >= _numlines ) {
row = _numlines-1; // we count rows starting w/0
row = _numlines - 1; // we count rows starting w/0
}

command(LCD_SETDDRAMADDR | (col + row_offsets[row]));
command(LCD_SETDDRAMADDR | (col + _row_offsets[row]));
}

// Turn the display on/off (quickly)
Expand Down
4 changes: 3 additions & 1 deletion libraries/LiquidCrystal/src/LiquidCrystal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class LiquidCrystal : public Print {
void autoscroll();
void noAutoscroll();

void setRowOffsets(int row1, int row2, int row3, int row4);
void createChar(uint8_t, uint8_t[]);
void setCursor(uint8_t, uint8_t);
virtual size_t write(uint8_t);
Expand All @@ -100,7 +101,8 @@ class LiquidCrystal : public Print {

uint8_t _initialized;

uint8_t _numlines,_currline;
uint8_t _numlines;
uint8_t _row_offsets[4];
};

#endif