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

styling: convert TAB to four SPACES

Browse Source 
Signed-off-by: Kiveisha Yevgeniy <yevgeniy.kiveisha@intel.com>
This commit is contained in:
Kiveisha Yevgeniy
2014-06-03 09:12:47 +00:00
parent 0db7af89f9
commit 5b8922f7bf
20 changed files with 635 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lcd/iiclcd.cxx
View File

@ -30,24 +30,24 @@
using namespace upm;
IICLcd::IICLcd (int bus, int lcdAddress) {
m_lcd_control_address = lcdAddress;
m_lcd_control_address = lcdAddress;
m_bus = bus;
m_i2c_lcd_control = maa_i2c_init(m_bus);
maa_result_t ret = maa_i2c_address(m_i2c_lcd_control, m_lcd_control_address);
if (ret != MAA_SUCCESS) {
if (ret != MAA_SUCCESS) {
fprintf(stderr, "Messed up i2c bus\n");
}
}
maa_result_t
IICLcd::write (int row, int column, std::string msg) {
setCursor (row, column);
write (msg);
setCursor (row, column);
write (msg);
}
maa_result_t
IICLcd::close() {
return maa_i2c_stop(m_i2c_lcd_control);
return maa_i2c_stop(m_i2c_lcd_control);
}

28
src/lcd/iiclcd.h
View File

@ -68,23 +68,23 @@ namespace upm {
#define LCD_RS 0x01 // Register select bit
class IICLcd {
public:
IICLcd (int bus, int lcdAddress);
virtual maa_result_t write (std::string msg) = 0;
maa_result_t write (int x, int y, std::string msg);
virtual maa_result_t setCursor (int row, int column) = 0;
virtual maa_result_t clear () = 0;
virtual maa_result_t home () = 0;
maa_result_t close();
std::string name()
public:
IICLcd (int bus, int lcdAddress);
virtual maa_result_t write (std::string msg) = 0;
maa_result_t write (int x, int y, std::string msg);
virtual maa_result_t setCursor (int row, int column) = 0;
virtual maa_result_t clear () = 0;
virtual maa_result_t home () = 0;
maa_result_t close();
std::string name()
{
return m_name;
}
protected:
std::string m_name;
int m_lcd_control_address;
int m_bus;
maa_i2c_context m_i2c_lcd_control;
protected:
std::string m_name;
int m_lcd_control_address;
int m_bus;
maa_i2c_context m_i2c_lcd_control;
};
}

100
src/lcd/jhd1313m1.cxx
View File

@ -30,44 +30,44 @@
using namespace upm;
Jhd1313m1::Jhd1313m1 (int bus, int lcdAddress, int rgbAddress) : IICLcd(bus, lcdAddress) {
maa_result_t error = MAA_SUCCESS;
maa_result_t error = MAA_SUCCESS;
m_rgb_address = rgbAddress;
m_i2c_lcd_rgb = maa_i2c_init(m_bus);
m_rgb_address = rgbAddress;
m_i2c_lcd_rgb = maa_i2c_init(m_bus);
maa_result_t ret = maa_i2c_address(m_i2c_lcd_rgb, m_rgb_address);
if (ret != MAA_SUCCESS) {
maa_result_t ret = maa_i2c_address(m_i2c_lcd_rgb, m_rgb_address);
if (ret != MAA_SUCCESS) {
fprintf(stderr, "Messed up i2c bus\n");
}
usleep(50000);
usleep(50000);
cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
usleep(4500);
cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
usleep(4500);
cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
usleep(4500);
cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
usleep(4500);
cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
usleep(4500);
cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
usleep(4500);
cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE);
cmd (m_i2c_lcd_control, LCD_DISPLAYCONTROL | LCD_DISPLAYON);
clear ();
usleep(4500);
cmd (m_i2c_lcd_control, LCD_ENTRYMODESET |
LCD_ENTRYLEFT |
LCD_ENTRYSHIFTDECREMENT);
cmd (m_i2c_lcd_control, LCD_DISPLAYCONTROL | LCD_DISPLAYON);
clear ();
usleep(4500);
cmd (m_i2c_lcd_control, LCD_ENTRYMODESET |
LCD_ENTRYLEFT |
LCD_ENTRYSHIFTDECREMENT);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0, 0);
setReg (m_i2c_lcd_rgb, m_rgb_address, 1, 0);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0, 0);
setReg (m_i2c_lcd_rgb, m_rgb_address, 1, 0);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0x04, 255);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0x04, 255);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0x03, 255);
setReg (m_i2c_lcd_rgb, m_rgb_address, 0x02, 255);
}
Jhd1313m1::~Jhd1313m1() {
}
/*
@ -77,39 +77,39 @@ Jhd1313m1::~Jhd1313m1() {
*/
maa_result_t
Jhd1313m1::write (std::string msg) {
maa_result_t error = MAA_SUCCESS;
uint8_t data[2] = {0x40, 0};
for (std::string::size_type i = 0; i < msg.size(); ++i) {
data[1] = msg[i];
error = maa_i2c_address (m_i2c_lcd_control, m_lcd_control_address);
error = maa_i2c_write (m_i2c_lcd_control, data, 2);
maa_result_t error = MAA_SUCCESS;
uint8_t data[2] = {0x40, 0};
for (std::string::size_type i = 0; i < msg.size(); ++i) {
data[1] = msg[i];
error = maa_i2c_address (m_i2c_lcd_control, m_lcd_control_address);
error = maa_i2c_write (m_i2c_lcd_control, data, 2);
}
return error;
return error;
}
maa_result_t
Jhd1313m1::setCursor (int row, int column) {
maa_result_t error = MAA_SUCCESS;
maa_result_t error = MAA_SUCCESS;
int row_addr[] = { 0x80, 0xc0, 0x14, 0x54};
uint8_t offset = ((column % 16) + row_addr[row]);
int row_addr[] = { 0x80, 0xc0, 0x14, 0x54};
uint8_t offset = ((column % 16) + row_addr[row]);
uint8_t data[2] = { 0x80, offset };
error = maa_i2c_address (m_i2c_lcd_control, m_lcd_control_address);
error = maa_i2c_write (m_i2c_lcd_control, data, 2);
uint8_t data[2] = { 0x80, offset };
error = maa_i2c_address (m_i2c_lcd_control, m_lcd_control_address);
error = maa_i2c_write (m_i2c_lcd_control, data, 2);
return error;
return error;
}
maa_result_t
Jhd1313m1::clear () {
return cmd (m_i2c_lcd_control, LCD_CLEARDISPLAY);
return cmd (m_i2c_lcd_control, LCD_CLEARDISPLAY);
}
maa_result_t
Jhd1313m1::home () {
return cmd (m_i2c_lcd_control, LCD_RETURNHOME);
return cmd (m_i2c_lcd_control, LCD_RETURNHOME);
}
/*
@ -119,22 +119,22 @@ Jhd1313m1::home () {
*/
maa_result_t
Jhd1313m1::setReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t value) {
maa_result_t error = MAA_SUCCESS;
maa_result_t error = MAA_SUCCESS;
uint8_t data[2] = { addr, value };
error = maa_i2c_address (ctx, deviceAdress);
error = maa_i2c_write (ctx, data, 2);
uint8_t data[2] = { addr, value };
error = maa_i2c_address (ctx, deviceAdress);
error = maa_i2c_write (ctx, data, 2);
return error;
return error;
}
maa_result_t
Jhd1313m1::cmd (maa_i2c_context ctx, uint8_t value) {
maa_result_t error = MAA_SUCCESS;
maa_result_t error = MAA_SUCCESS;
uint8_t data[2] = { 0x80, value };
error = maa_i2c_address (ctx, m_lcd_control_address);
error = maa_i2c_write (ctx, data, 2);
uint8_t data[2] = { 0x80, value };
error = maa_i2c_address (ctx, m_lcd_control_address);
error = maa_i2c_write (ctx, data, 2);
return error;
return error;
}

22
src/lcd/jhd1313m1.h
View File

@ -30,19 +30,19 @@ namespace upm {
class Jhd1313m1 : public IICLcd {
public:
Jhd1313m1 (int bus, int lcdAddress, int rgbAddress);
~Jhd1313m1 ();
maa_result_t write (std::string msg);
maa_result_t setCursor (int row, int column);
maa_result_t clear ();
maa_result_t home ();
Jhd1313m1 (int bus, int lcdAddress, int rgbAddress);
~Jhd1313m1 ();
maa_result_t write (std::string msg);
maa_result_t setCursor (int row, int column);
maa_result_t clear ();
maa_result_t home ();
private:
maa_result_t cmd (maa_i2c_context ctx, uint8_t value);
maa_result_t setReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t data);
private:
maa_result_t cmd (maa_i2c_context ctx, uint8_t value);
maa_result_t setReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t data);
int m_rgb_address;
maa_i2c_context m_i2c_lcd_rgb;
int m_rgb_address;
maa_i2c_context m_i2c_lcd_rgb;
};
}

24
src/lcd/lcm1602.cxx
View File

@ -33,10 +33,10 @@
using namespace upm;
Lcm1602::Lcm1602(int bus_in, int addr_in) : IICLcd (bus_in, addr_in) {
maa_result_t error = MAA_SUCCESS;
maa_result_t error = MAA_SUCCESS;
usleep(50000);
expandWrite(LCD_BACKLIGHT);
usleep(50000);
expandWrite(LCD_BACKLIGHT);
usleep(100000);
write4bits(0x03 << 4);
@ -61,7 +61,7 @@ Lcm1602::Lcm1602(int bus_in, int addr_in) : IICLcd (bus_in, addr_in) {
}
Lcm1602::~Lcm1602 () {
}
/*
@ -71,7 +71,7 @@ Lcm1602::~Lcm1602 () {
*/
maa_result_t
Lcm1602::write (std::string msg) {
maa_result_t error = MAA_SUCCESS;
maa_result_t error = MAA_SUCCESS;
for (std::string::size_type i = 0; i < msg.size(); ++i) {
error = send (msg[i], LCD_RS);
}
@ -80,22 +80,22 @@ Lcm1602::write (std::string msg) {
maa_result_t
Lcm1602::setCursor (int row, int column) {
maa_result_t error = MAA_SUCCESS;
maa_result_t error = MAA_SUCCESS;
int row_addr[] = { 0x80, 0xc0, 0x14, 0x54};
uint8_t offset = ((column % 16) + row_addr[row]);
int row_addr[] = { 0x80, 0xc0, 0x14, 0x54};
uint8_t offset = ((column % 16) + row_addr[row]);
return send (LCD_SETDDRAMADDR | offset, 0);
return send (LCD_SETDDRAMADDR | offset, 0);
}
maa_result_t
Lcm1602::clear () {
return send(LCD_CLEARDISPLAY, 0);
return send(LCD_CLEARDISPLAY, 0);
}
maa_result_t
Lcm1602::home () {
return send(LCD_RETURNHOME, 0);
return send(LCD_RETURNHOME, 0);
}
/*
@ -105,7 +105,7 @@ Lcm1602::home () {
*/
maa_result_t
Lcm1602::send (uint8_t value, int mode) {
maa_result_t ret = MAA_SUCCESS;
maa_result_t ret = MAA_SUCCESS;
uint8_t h = value & 0xf0;
uint8_t l = (value << 4) & 0xf0;
ret = write4bits(h | mode);

36
src/lcd/lcm1602.h
View File

@ -33,23 +33,23 @@
namespace upm {
class Lcm1602 : public IICLcd {
public:
/** LCM1602 Constructor.
* Calls MAA initialisation functions.
* @param bus i2c bus to use
* @param address the slave address the lcd is registered on.
*/
Lcm1602(int bus, int address);
~Lcm1602();
maa_result_t write (std::string msg);
maa_result_t setCursor (int row, int column);
maa_result_t clear ();
maa_result_t home ();
public:
/** LCM1602 Constructor.
* Calls MAA initialisation functions.
* @param bus i2c bus to use
* @param address the slave address the lcd is registered on.
*/
Lcm1602(int bus, int address);
~Lcm1602();
maa_result_t write (std::string msg);
maa_result_t setCursor (int row, int column);
maa_result_t clear ();
maa_result_t home ();
private :
maa_result_t send (uint8_t value, int mode);
maa_result_t write4bits(uint8_t value);
maa_result_t expandWrite(uint8_t value);
maa_result_t pulseEnable(uint8_t value);
};
private :
maa_result_t send (uint8_t value, int mode);
maa_result_t write4bits(uint8_t value);
maa_result_t expandWrite(uint8_t value);
maa_result_t pulseEnable(uint8_t value);
};
}