alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

lcd: lcm1602: modifications for eventual use as a base class for jhd1313m1

Browse Source 
We add a new bool isExpander to the the I2C constructor.  This allows
us (in the case we are not dealing with an expander) to just
initialize the i2c context only and bail in the constructor.  The
default is true to preserve backward compatibility.

Additionally, add two new virtual protected methods, data() and
command() for sending data or commands to the controller.  The default
implementation in lcm1602 will work for 4bit GPIO and expander use.

In the case of jhd1313m1, they will need to be redefined in that class
as the sematics for sending data and commands are different.

All of the underlying functionality will use command() or data() as
appropriate.

Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Jon Trulson 2015-07-27 14:40:53 -06:00 committed by Mihai Tudor Panu
parent a2e4fb5d7a
commit cb62f06197
2 changed files with 94 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/lcd/lcm1602.cxx
View File

@ -38,7 +38,7 @@
using namespace upm;
Lcm1602::Lcm1602(int bus_in, int addr_in) :
Lcm1602::Lcm1602(int bus_in, int addr_in, bool isExpander) :
m_i2c_lcd_control(new mraa::I2c(bus_in)),
m_gpioRS(0), m_gpioEnable(0), m_gpioD0(0),
m_gpioD1(0), m_gpioD2(0), m_gpioD3(0)
@ -55,6 +55,15 @@ Lcm1602::Lcm1602(int bus_in, int addr_in) :
return;
}
// if we are not dealing with an expander (say via a derived class
// like Jhd1313m1), then we do not want to execute the rest of the
// code below. Rather, the derived class's constructor should
// follow up with any setup required -- we will only initialize
// the I2C context and bail.
if (!isExpander)
return;
usleep(50000);
expandWrite(LCD_BACKLIGHT);
usleep(100000);
@ -71,13 +80,13 @@ Lcm1602::Lcm1602(int bus_in, int addr_in) :
m_displayControl = LCD_DISPLAYON | LCD_CURSOROFF | LCD_BLINKOFF;
// Set numeber of lines
send(LCD_FUNCTIONSET | 0x0f, 0);
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
command(LCD_FUNCTIONSET | 0x0f);
command(LCD_DISPLAYCONTROL | m_displayControl);
clear();
// Set entry mode.
m_entryDisplayMode = LCD_ENTRYLEFT | LCD_ENTRYSHIFTDECREMENT;
send(LCD_ENTRYMODESET | m_entryDisplayMode, 0);
command(LCD_ENTRYMODESET | m_entryDisplayMode);
home();
}
@ -131,15 +140,15 @@ Lcm1602::Lcm1602(uint8_t rs, uint8_t enable, uint8_t d0,
write4bits(0x02);
// Set number of lines
send(LCD_FUNCTIONSET | LCD_2LINE | LCD_4BITMODE | LCD_5x8DOTS, 0);
command(LCD_FUNCTIONSET | LCD_2LINE | LCD_4BITMODE | LCD_5x8DOTS);
m_displayControl = LCD_DISPLAYON | LCD_CURSOROFF | LCD_BLINKOFF;
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
command(LCD_DISPLAYCONTROL | m_displayControl);
usleep(2000);
clear();
// Set entry mode.
m_entryDisplayMode = LCD_ENTRYLEFT | LCD_ENTRYSHIFTDECREMENT;
send(LCD_ENTRYMODESET | m_entryDisplayMode, 0);
command(LCD_ENTRYMODESET | m_entryDisplayMode);
home();
}
@ -173,7 +182,7 @@ Lcm1602::write(std::string msg)
{
mraa_result_t error = MRAA_SUCCESS;
for (std::string::size_type i = 0; i < msg.size(); ++i) {
error = send(msg[i], LCD_RS);
error = data(msg[i]);
}
return error;
}
@ -186,14 +195,14 @@ Lcm1602::setCursor(int row, int column)
int row_addr[] = { 0x80, 0xc0, 0x14, 0x54 };
uint8_t offset = ((column % 16) + row_addr[row]);
return send(LCD_CMD | offset, 0);
return command(LCD_CMD | offset);
}
mraa_result_t
Lcm1602::clear()
{
mraa_result_t ret;
ret = send(LCD_CLEARDISPLAY, 0);
ret = command(LCD_CLEARDISPLAY);
usleep(2000); // this command takes awhile
return ret;
}
@ -202,7 +211,7 @@ mraa_result_t
Lcm1602::home()
{
mraa_result_t ret;
ret = send(LCD_RETURNHOME, 0);
ret = command(LCD_RETURNHOME);
usleep(2000); // this command takes awhile
return ret;
}
@ -212,84 +221,94 @@ Lcm1602::createChar(uint8_t charSlot, uint8_t charData[])
{
mraa_result_t error = MRAA_SUCCESS;
charSlot &= 0x07; // only have 8 positions we can set
error = send(LCD_SETCGRAMADDR | (charSlot << 3), 0);
error = command(LCD_SETCGRAMADDR | (charSlot << 3));
if (error == MRAA_SUCCESS) {
for (int i = 0; i < 8; i++) {
error = send(charData[i], LCD_RS);
error = data(charData[i]);
}
}
return error;
}
void Lcm1602::displayOn()
mraa_result_t Lcm1602::displayOn()
{
m_displayControl |= LCD_DISPLAYON;
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
return command(LCD_DISPLAYCONTROL | m_displayControl);
}
void Lcm1602::displayOff()
mraa_result_t Lcm1602::displayOff()
{
m_displayControl &= ~LCD_DISPLAYON;
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
return command(LCD_DISPLAYCONTROL | m_displayControl);
}
void Lcm1602::cursorOn()
mraa_result_t Lcm1602::cursorOn()
{
m_displayControl |= LCD_CURSORON;
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
return command(LCD_DISPLAYCONTROL | m_displayControl);
}
void Lcm1602::cursorOff()
mraa_result_t Lcm1602::cursorOff()
{
m_displayControl &= ~LCD_CURSORON;
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
return command(LCD_DISPLAYCONTROL | m_displayControl);
}
void Lcm1602::cursorBlinkOn()
mraa_result_t Lcm1602::cursorBlinkOn()
{
m_displayControl |= LCD_BLINKON;
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
return command(LCD_DISPLAYCONTROL | m_displayControl);
}
void Lcm1602::cursorBlinkOff()
mraa_result_t Lcm1602::cursorBlinkOff()
{
m_displayControl &= ~LCD_BLINKON;
send(LCD_DISPLAYCONTROL | m_displayControl, 0);
return command(LCD_DISPLAYCONTROL | m_displayControl);
}
void Lcm1602::scrollDisplayLeft()
mraa_result_t Lcm1602::scrollDisplayLeft()
{
send(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVELEFT, 0);
return command(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVELEFT);
}
void Lcm1602::scrollDisplayRight()
mraa_result_t Lcm1602::scrollDisplayRight()
{
send(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVERIGHT, 0);
return command(LCD_CURSORSHIFT | LCD_DISPLAYMOVE | LCD_MOVERIGHT);
}
void Lcm1602::entryLeftToRight()
mraa_result_t Lcm1602::entryLeftToRight()
{
m_entryDisplayMode |= LCD_ENTRYLEFT;
send(LCD_ENTRYMODESET | m_entryDisplayMode, 0);
return command(LCD_ENTRYMODESET | m_entryDisplayMode);
}
void Lcm1602::entryRightToLeft()
mraa_result_t Lcm1602::entryRightToLeft()
{
m_entryDisplayMode &= ~LCD_ENTRYLEFT;
send(LCD_ENTRYMODESET | m_entryDisplayMode, 0);
return command(LCD_ENTRYMODESET | m_entryDisplayMode);
}
void Lcm1602::autoscrollOn()
mraa_result_t Lcm1602::autoscrollOn()
{
m_entryDisplayMode |= LCD_ENTRYSHIFTINCREMENT;
send(LCD_ENTRYMODESET | m_entryDisplayMode, 0);
return command(LCD_ENTRYMODESET | m_entryDisplayMode);
}
void Lcm1602::autoscrollOff()
mraa_result_t Lcm1602::autoscrollOff()
{
m_entryDisplayMode &= ~LCD_ENTRYSHIFTINCREMENT;
send(LCD_ENTRYMODESET | m_entryDisplayMode, 0);
return command(LCD_ENTRYMODESET | m_entryDisplayMode);
}
mraa_result_t Lcm1602::command(uint8_t cmd)
{
return send(cmd, 0);
}
mraa_result_t Lcm1602::data(uint8_t cmd)
{
return send(cmd, LCD_RS); // 1
}

56
src/lcd/lcm1602.h
View File

@ -67,8 +67,10 @@ class Lcm1602 : public LCD
*
* @param bus i2c bus to use
* @param address the slave address the lcd is registered on
* @param isExpander true if we are dealing with an I2C expander,
* false otherwise. Default is true.
*/
Lcm1602(int bus, int address);
Lcm1602(int bus, int address, bool isExpander=true);
/**
* Lcm1602 alternate constructor, used for GPIO based hd44780
@ -108,7 +110,7 @@ class Lcm1602 : public LCD
/**
* Clear display from characters
*
* @return Result of operatio
* @return Result of operation
*/
mraa_result_t clear();
/**
@ -130,74 +132,86 @@ class Lcm1602 : public LCD
/**
* Turn the display on
*
* @return Result of operation
*/
void displayOn();
mraa_result_t displayOn();
/**
* Turn the display off
*
* @return Result of operation
*/
void displayOff();
mraa_result_t displayOff();
/**
* Turn the cursor on
*
* @return Result of operation
*/
void cursorOn();
mraa_result_t cursorOn();
/**
* Turn the cursor off
*
* @return Result of operation
*/
void cursorOff();
mraa_result_t cursorOff();
/**
* Turn cursor blink on
*
* @return Result of operation
*/
void cursorBlinkOn();
mraa_result_t cursorBlinkOn();
/**
* Turn cursor blink off
*
* @return Result of operation
*/
void cursorBlinkOff();
mraa_result_t cursorBlinkOff();
/**
* Scroll the display left, without changing the character RAM
*
* @return Result of operation
*/
void scrollDisplayLeft();
mraa_result_t scrollDisplayLeft();
/**
* Scroll the display right, without changing the character RAM
*
* @return Result of operation
*/
void scrollDisplayRight();
mraa_result_t scrollDisplayRight();
/**
* set the entry mode so that characters are added left to right
*
* @return Result of operation
*/
void entryLeftToRight();
mraa_result_t entryLeftToRight();
/**
* set the entry mode so that characters are added right to left
*
* @return Result of operation
*/
void entryRightToLeft();
mraa_result_t entryRightToLeft();
/**
* Right justify text entered from the cursor
*
* @return Result of operation
*/
void autoscrollOn();
mraa_result_t autoscrollOn();
/**
* Left justify text entered from the cursor
*
* @return Result of operation
*/
void autoscrollOff();
mraa_result_t autoscrollOff();
protected:
@ -206,6 +220,16 @@ class Lcm1602 : public LCD
mraa_result_t expandWrite(uint8_t value);
mraa_result_t pulseEnable(uint8_t value);
uint8_t m_displayControl;
uint8_t m_entryDisplayMode;
// Add a command() and data() virtual member functions, with a
// default implementation in lcm1602. This is expected to be
// implemented by derived classes with different needs (Jhd1313m1,
// for example).
virtual mraa_result_t command(uint8_t cmd);
virtual mraa_result_t data(uint8_t data);
private:
int m_lcd_control_address;
mraa::I2c* m_i2c_lcd_control;
@ -220,9 +244,5 @@ class Lcm1602 : public LCD
mraa::Gpio* m_gpioD1;
mraa::Gpio* m_gpioD2;
mraa::Gpio* m_gpioD3;
uint8_t m_displayControl;
uint8_t m_entryDisplayMode;
};
}