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

Wreorder: Fixed a subset of reorder errors

Browse Source 
This commit addresses warnings emitted from -Wreorder
in the C++ src.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2016-11-03 10:19:14 -07:00
parent 2f31aede0e
commit c63692b5fd
10 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lcd/eboled.hpp
View File

@ -364,11 +364,10 @@ namespace upm
mraa::Result setAddressingMode(displayAddressingMode mode);
private:
mraa::Spi m_spi;
mraa::Gpio m_gpioCD; // command(0)/data(1)
mraa::Gpio m_gpioRST; // reset pin
mraa::Spi m_spi;
uint8_t m_cursorX;
uint8_t m_cursorY;
uint8_t m_textSize;

2
src/lcd/jhd1313m1.cxx
View File

@ -35,7 +35,7 @@
using namespace upm;
Jhd1313m1::Jhd1313m1(int bus, int lcdAddress, int rgbAddress)
: m_i2c_lcd_rgb(bus), Lcm1602(bus, lcdAddress, false)
: Lcm1602(bus, lcdAddress, false), m_i2c_lcd_rgb(bus)
{
m_rgb_address = rgbAddress;
m_name = "Jhd1313m1";

21
src/lcd/lcm1602.hpp
View File

@ -251,10 +251,20 @@ class Lcm1602 : public LCD
uint8_t m_displayControl;
uint8_t m_entryDisplayMode;
mraa::I2c* m_i2c_lcd_control;
// gpio operation
mraa::Gpio* m_gpioRS;
mraa::Gpio* m_gpioEnable;
mraa::Gpio* m_gpioD0;
mraa::Gpio* m_gpioD1;
mraa::Gpio* m_gpioD2;
mraa::Gpio* m_gpioD3;
// Display size
uint8_t m_numColumns;
uint8_t m_numRows;
// Backlight
uint8_t m_backlight;
@ -266,19 +276,10 @@ class Lcm1602 : public LCD
virtual mraa::Result data(uint8_t data);
int m_lcd_control_address;
mraa::I2c* m_i2c_lcd_control;
private:
// true if using i2c, false otherwise (gpio)
bool m_isI2C;
// gpio operation
mraa::Gpio* m_gpioRS;
mraa::Gpio* m_gpioEnable;
mraa::Gpio* m_gpioD0;
mraa::Gpio* m_gpioD1;
mraa::Gpio* m_gpioD2;
mraa::Gpio* m_gpioD3;
};
}