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

i2clcd: improve error handling in the I2CLcd and Jhd1313m1 classes

Browse Source 
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-09 17:38:29 +01:00
committed by Mihai Tudor Panu
parent dea82728af
commit 67bd592ed9
2 changed files with 65 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lcd/i2clcd.cxx
View File

@@ -26,6 +26,7 @@
#include <unistd.h> #include <unistd.h>
#include "i2clcd.h" #include "i2clcd.h"
#include "i2clcd_private.h"
using namespace upm; using namespace upm;
@@ -79,25 +80,29 @@ I2CLcd::name()
mraa_result_t mraa_result_t
I2CLcd::i2cReg(mraa_i2c_context ctx, int deviceAdress, int addr, uint8_t value) I2CLcd::i2cReg(mraa_i2c_context ctx, int deviceAdress, int addr, uint8_t value)
{ {
mraa_result_t error = MRAA_SUCCESS; mraa_result_t ret;
uint8_t data[2] = { addr, value }; uint8_t data[2] = { addr, value };
error = mraa_i2c_address(ctx, deviceAdress); ret = mraa_i2c_address(ctx, deviceAdress);
error = mraa_i2c_write(ctx, data, 2); UPM_GOTO_ON_MRAA_FAIL(ret, beach);
ret = mraa_i2c_write(ctx, data, 2);
return error; beach:
return ret;
} }
mraa_result_t mraa_result_t
I2CLcd::i2Cmd(mraa_i2c_context ctx, uint8_t value) I2CLcd::i2Cmd(mraa_i2c_context ctx, uint8_t value)
{ {
mraa_result_t error = MRAA_SUCCESS; mraa_result_t ret;
uint8_t data[2] = { LCD_CMD, value }; uint8_t data[2] = { LCD_CMD, value };
error = mraa_i2c_address(ctx, m_lcd_control_address);
error = mraa_i2c_write(ctx, data, 2);
return error; ret = mraa_i2c_address(ctx, m_lcd_control_address);
UPM_GOTO_ON_MRAA_FAIL(ret, beach);
ret = mraa_i2c_write(ctx, data, 2);
beach:
return ret;
} }
mraa_result_t mraa_result_t

77
src/lcd/jhd1313m1.cxx
View File

@@ -23,16 +23,16 @@
*/ */
#include <iostream> #include <iostream>
#include <stdexcept>
#include <unistd.h> #include <unistd.h>
#include "i2clcd_private.h"
#include "jhd1313m1.h" #include "jhd1313m1.h"
using namespace upm; using namespace upm;
Jhd1313m1::Jhd1313m1(int bus, int lcdAddress, int rgbAddress) : I2CLcd(bus, lcdAddress) Jhd1313m1::Jhd1313m1(int bus, int lcdAddress, int rgbAddress) : I2CLcd(bus, lcdAddress)
{ {
mraa_result_t error = MRAA_SUCCESS;
m_rgb_address = rgbAddress; m_rgb_address = rgbAddress;
m_i2c_lcd_rgb = mraa_i2c_init(m_bus); m_i2c_lcd_rgb = mraa_i2c_init(m_bus);
@@ -42,22 +42,33 @@ Jhd1313m1::Jhd1313m1(int bus, int lcdAddress, int rgbAddress) : I2CLcd(bus, lcdA
} }
usleep(50000); usleep(50000);
i2Cmd(m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); ret = i2Cmd(m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the LCD controller");
usleep(4500); usleep(4500);
ret = i2Cmd(m_i2c_lcd_control, LCD_DISPLAYCONTROL | LCD_DISPLAYON);
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the LCD controller");
ret = clear();
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the LCD controller");
i2Cmd(m_i2c_lcd_control, LCD_DISPLAYCONTROL | LCD_DISPLAYON);
clear();
usleep(4500); usleep(4500);
ret = i2Cmd(m_i2c_lcd_control, LCD_ENTRYMODESET | LCD_ENTRYLEFT | LCD_ENTRYSHIFTDECREMENT);
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the LCD controller");
i2Cmd(m_i2c_lcd_control, LCD_ENTRYMODESET | LCD_ENTRYLEFT | LCD_ENTRYSHIFTDECREMENT); ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0, 0);
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the RGB controller");
ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 1, 0);
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the RGB controller");
ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA);
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the RGB controller");
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0, 0); ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x04, 255);
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 1, 0); UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the RGB controller");
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA); ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x03, 255);
UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the RGB controller");
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x04, 255); ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x02, 255);
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x03, 255); UPM_CHECK_MRAA_SUCCESS(ret, "Unable to initialise the RGB controller");
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x02, 255);
} }
Jhd1313m1::~Jhd1313m1() Jhd1313m1::~Jhd1313m1()
@@ -67,15 +78,23 @@ Jhd1313m1::~Jhd1313m1()
mraa_result_t mraa_result_t
Jhd1313m1::setColor(uint8_t r, uint8_t g, uint8_t b) Jhd1313m1::setColor(uint8_t r, uint8_t g, uint8_t b)
{ {
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0, 0); mraa_result_t ret;
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 1, 0);
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA);
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x04, r); ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0, 0);
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x03, g); UPM_GOTO_ON_MRAA_FAIL(ret, beach);
i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x02, b); ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 1, 0);
UPM_GOTO_ON_MRAA_FAIL(ret, beach);
ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA);
UPM_GOTO_ON_MRAA_FAIL(ret, beach);
return MRAA_SUCCESS; ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x04, r);
UPM_GOTO_ON_MRAA_FAIL(ret, beach);
ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x03, g);
UPM_GOTO_ON_MRAA_FAIL(ret, beach);
ret = i2cReg(m_i2c_lcd_rgb, m_rgb_address, 0x02, b);
beach:
return ret;
} }
mraa_result_t mraa_result_t
@@ -94,24 +113,30 @@ Jhd1313m1::scroll(bool direction)
mraa_result_t mraa_result_t
Jhd1313m1::write(std::string msg) Jhd1313m1::write(std::string msg)
{ {
mraa_result_t ret = MRAA_SUCCESS;
usleep(1000); usleep(1000);
mraa_result_t error = MRAA_SUCCESS;
for (std::string::size_type i = 0; i < msg.size(); ++i) { for (std::string::size_type i = 0; i < msg.size(); ++i) {
error = i2cData(m_i2c_lcd_control, msg[i]); ret = i2cData(m_i2c_lcd_control, msg[i]);
UPM_GOTO_ON_MRAA_FAIL(ret, beach);
} }
return error; beach:
return ret;
} }
mraa_result_t mraa_result_t
Jhd1313m1::setCursor(int row, int column) Jhd1313m1::setCursor(int row, int column)
{ {
mraa_result_t error = MRAA_SUCCESS; mraa_result_t ret;
int row_addr[] = { 0x80, 0xc0, 0x14, 0x54 }; int row_addr[] = { 0x80, 0xc0, 0x14, 0x54 };
uint8_t offset = ((column % 16) + row_addr[row]); uint8_t offset = ((column % 16) + row_addr[row]);
error = i2Cmd(m_i2c_lcd_control, offset);
return error; ret = i2Cmd(m_i2c_lcd_control, offset);
return ret;
} }
mraa_result_t mraa_result_t