alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-27 06:01:16 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

i2clcd: use the mraa C++ API instead of the C API

Browse Source 
Rewrite the i2c module to be based around the MRAA C++ API,
since this makes resource management easier inside of the UPM
C++ classes.

i2clcd.{h,cxx}: remove the close() function. This now automatically gets
called when the object goes out of scope, inside the destructor.

examples/i2clcd: fix C++/Python/Javascript examples that explicitly called the close function.
The I2c context now gets called by the destructor of the sensor class. This
happens when the object goes out of scope or when it gets deleted, if the
object was created using the new keyword, as is the case here.

Signed-off-by: Wouter van Verre <wouter.van.verre@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Wouter van Verre
2015-04-20 14:15:41 +01:00
committed by Mihai Tudor Panu
parent 53b58225a4
commit 31c4f470fe
17 changed files with 130 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lcd/ssd1308.cxx
View File

@ -31,9 +31,9 @@ using namespace upm;
SSD1308::SSD1308(int bus_in, int addr_in) : I2CLcd(bus_in, addr_in)
{
mraa_i2c_write_byte_data(m_i2c_lcd_control, DISPLAY_CMD_OFF, LCD_CMD); // display off
m_i2c_lcd_control.writeReg(LCD_CMD, DISPLAY_CMD_OFF); // display off
usleep(4500);
mraa_i2c_write_byte_data(m_i2c_lcd_control, DISPLAY_CMD_ON, LCD_CMD); // display on
m_i2c_lcd_control.writeReg(LCD_CMD, DISPLAY_CMD_ON); // display on
usleep(4500);
setNormalDisplay(); // set to normal display '1' is ON
@ -52,7 +52,7 @@ SSD1308::draw(uint8_t* data, int bytes)
setAddressingMode(HORIZONTAL);
for (int idx = 0; idx < bytes; idx++) {
mraa_i2c_write_byte_data(m_i2c_lcd_control, data[idx], LCD_DATA);
m_i2c_lcd_control.writeReg(LCD_DATA, data[idx]);
}
return error;
@ -82,15 +82,13 @@ SSD1308::setCursor(int row, int column)
{
mraa_result_t error = MRAA_SUCCESS;
error = mraa_i2c_write_byte_data(m_i2c_lcd_control,
BASE_PAGE_START_ADDR + row,
LCD_CMD); // set page address
error = mraa_i2c_write_byte_data(m_i2c_lcd_control,
BASE_LOW_COLUMN_ADDR + (8 * column & 0x0F),
LCD_CMD); // set column lower address
error = mraa_i2c_write_byte_data(m_i2c_lcd_control,
BASE_HIGH_COLUMN_ADDR + ((8 * column >> 4) & 0x0F),
LCD_CMD); // set column higher address
error = m_i2c_lcd_control.writeReg(LCD_CMD, BASE_PAGE_START_ADDR + row); // set page address
error = m_i2c_lcd_control.writeReg(LCD_CMD,
BASE_LOW_COLUMN_ADDR + (8 * column & 0x0F)); // set column
// lower address
error = m_i2c_lcd_control.writeReg(LCD_CMD,
BASE_HIGH_COLUMN_ADDR +
((8 * column >> 4) & 0x0F)); // set column higher address
return error;
}
@ -101,7 +99,7 @@ SSD1308::clear()
mraa_result_t error = MRAA_SUCCESS;
uint8_t columnIdx, rowIdx;
mraa_i2c_write_byte_data(m_i2c_lcd_control, DISPLAY_CMD_OFF, LCD_CMD); // display off
m_i2c_lcd_control.writeReg(LCD_CMD, DISPLAY_CMD_OFF); // display off
for (rowIdx = 0; rowIdx < 8; rowIdx++) {
setCursor(rowIdx, 0);
@ -110,7 +108,7 @@ SSD1308::clear()
writeChar(' ');
}
}
mraa_i2c_write_byte_data(m_i2c_lcd_control, DISPLAY_CMD_ON, LCD_CMD); // display on
m_i2c_lcd_control.writeReg(LCD_CMD, DISPLAY_CMD_ON); // display on
home();
return MRAA_SUCCESS;
@ -135,23 +133,21 @@ SSD1308::writeChar(uint8_t value)
}
for (uint8_t idx = 0; idx < 8; idx++) {
mraa_i2c_write_byte_data(m_i2c_lcd_control, BasicFont[value - 32][idx], LCD_DATA);
m_i2c_lcd_control.writeReg(LCD_DATA, BasicFont[value - 32][idx]);
}
}
mraa_result_t
SSD1308::setNormalDisplay()
{
return mraa_i2c_write_byte_data(m_i2c_lcd_control,
DISPLAY_CMD_SET_NORMAL_1308,
LCD_CMD); // set to normal display '1' is ON
return m_i2c_lcd_control.writeReg(LCD_CMD,
DISPLAY_CMD_SET_NORMAL_1308); // set to normal display '1' is
// ON
}
mraa_result_t
SSD1308::setAddressingMode(displayAddressingMode mode)
{
mraa_i2c_write_byte_data(m_i2c_lcd_control,
DISPLAY_CMD_MEM_ADDR_MODE,
LCD_CMD); // set addressing mode
mraa_i2c_write_byte_data(m_i2c_lcd_control, mode, LCD_CMD); // set page addressing mode
m_i2c_lcd_control.writeReg(LCD_CMD, DISPLAY_CMD_MEM_ADDR_MODE); // set addressing mode
m_i2c_lcd_control.writeReg(LCD_CMD, mode); // set page addressing mode
}