mirror of
https://github.com/eclipse/upm.git
synced 2025-03-15 04:57:30 +03:00
Wreorder: Fixed a subset of reorder errors
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:
parent
2f31aede0e
commit
c63692b5fd
@ -330,7 +330,6 @@ namespace upm {
|
||||
mraa::Result rstLow();
|
||||
|
||||
private:
|
||||
mraa::Spi m_spi;
|
||||
uint8_t m_spiBuffer[32];
|
||||
|
||||
mraa::Gpio m_csLCDPinCtx;
|
||||
@ -338,6 +337,8 @@ namespace upm {
|
||||
mraa::Gpio m_dcPinCtx;
|
||||
mraa::Gpio m_rstPinCtx;
|
||||
|
||||
mraa::Spi m_spi;
|
||||
|
||||
std::string m_name;
|
||||
};
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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";
|
||||
|
@ -251,6 +251,16 @@ 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;
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
using namespace upm;
|
||||
|
||||
LPD8806::LPD8806 (uint16_t pixelCount, uint8_t csn) : m_csnPinCtx(csn), m_spi(0) {
|
||||
LPD8806::LPD8806 (uint16_t pixelCount, uint8_t csn) :m_spi(0), m_csnPinCtx(csn) {
|
||||
mraa::Result error = mraa::SUCCESS;
|
||||
m_name = "LPD8806";
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
using namespace upm;
|
||||
|
||||
MAX31723::MAX31723 (int csn) : m_csnPinCtx(csn), m_spi(0) {
|
||||
MAX31723::MAX31723 (int csn) : m_spi(0), m_csnPinCtx(csn) {
|
||||
mraa::Result error = mraa::SUCCESS;
|
||||
m_name = "MAX31723";
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
using namespace upm;
|
||||
|
||||
MAX5487::MAX5487 (int csn) : m_csnPinCtx(csn), m_spi(0) {
|
||||
MAX5487::MAX5487 (int csn) :m_spi(0), m_csnPinCtx(csn) {
|
||||
mraa::Result error = mraa::SUCCESS;
|
||||
m_name = "MAX5487";
|
||||
|
||||
|
@ -32,7 +32,7 @@ using namespace upm;
|
||||
using namespace std;
|
||||
|
||||
MPU9150::MPU9150 (int bus, int address, int magAddress, bool enableAk8975) :
|
||||
m_mag(0), MPU60X0(bus, address)
|
||||
MPU60X0(bus, address), m_mag(0)
|
||||
{
|
||||
m_magAddress = magAddress;
|
||||
m_i2cBus = bus;
|
||||
|
@ -35,7 +35,7 @@ using namespace upm;
|
||||
|
||||
|
||||
NRF24L01::NRF24L01 (uint8_t cs, uint8_t ce)
|
||||
: m_csnPinCtx(cs), m_cePinCtx(ce), m_spi(0)
|
||||
:m_spi(0), m_csnPinCtx(cs), m_cePinCtx(ce)
|
||||
{
|
||||
init (cs, ce);
|
||||
}
|
||||
|
@ -35,8 +35,8 @@
|
||||
using namespace upm;
|
||||
|
||||
ST7735::ST7735 (uint8_t csLCD, uint8_t cSD, uint8_t rs, uint8_t rst)
|
||||
: GFX (160, 128, m_map, font), m_csLCDPinCtx(csLCD), m_cSDPinCtx(cSD),
|
||||
m_rSTPinCtx(rst), m_rSPinCtx(rs), m_spi(0) {
|
||||
: GFX (160, 128, m_map, font), m_spi(0), m_csLCDPinCtx(csLCD), m_cSDPinCtx(cSD),
|
||||
m_rSTPinCtx(rst), m_rSPinCtx(rs) {
|
||||
|
||||
initModule ();
|
||||
configModule ();
|
||||
|
Loading…
x
Reference in New Issue
Block a user