From a3a1fdc81b538d58850ff067109a99201f7e8353 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Wed, 2 Nov 2016 21:42:16 -0700 Subject: [PATCH] Wunused-variable: Fixed all unused variables in src This commit addresses all warnings emitted from -Wunused-variable in the C++ src. Signed-off-by: Noel Eck --- src/ads1x15/ads1015.cxx | 1 - src/am2315/am2315.cpp | 7 ++++++- src/ecs1030/ecs1030.cxx | 1 - src/grovescam/grovescam.cxx | 1 - src/groveultrasonic/groveultrasonic.cxx | 1 - src/hcsr04/hcsr04.cxx | 1 - src/hm11/hm11.cxx | 1 - src/hmtrp/hmtrp.cxx | 1 - src/htu21d/htu21d.cpp | 3 +-- src/kxcjk1013/kxcjk1013.cxx | 1 - src/lcd/lcm1602.cxx | 2 -- src/lcd/ssd1308.cxx | 6 +----- src/lcd/ssd1327.cxx | 1 - src/lol/lol.cxx | 2 -- src/max44009/max44009.cxx | 1 - src/max5487/max5487.cxx | 4 ++-- src/mhz16/mhz16.cxx | 1 - src/mma7455/mma7455.cxx | 2 -- src/mpl3115a2/mpl3115a2.cpp | 5 ++--- src/ms5611/ms5611.cxx | 3 +-- src/pn532/pn532.cxx | 3 --- src/scam/scam.cxx | 1 - src/ultrasonic/ultrasonic.cxx | 1 - src/wt5001/wt5001.cxx | 1 - src/zfm20/zfm20.cxx | 2 -- 25 files changed, 13 insertions(+), 40 deletions(-) diff --git a/src/ads1x15/ads1015.cxx b/src/ads1x15/ads1015.cxx index d49b83d5..99fdc03a 100644 --- a/src/ads1x15/ads1015.cxx +++ b/src/ads1x15/ads1015.cxx @@ -149,7 +149,6 @@ ADS1015::setDelay(){ ADS1X15::ADSMUXMODE ADS1015::getMuxMode(unsigned int input) { - ADS1X15::ADSMUXMODE mode; switch (input) { case 0: return SINGLE_0; diff --git a/src/am2315/am2315.cpp b/src/am2315/am2315.cpp index f1e71863..1aa00b1c 100644 --- a/src/am2315/am2315.cpp +++ b/src/am2315/am2315.cpp @@ -199,7 +199,12 @@ AM2315::i2cWriteReg(uint8_t reg, uint8_t* data, uint8_t ilen) tdata[ilen+3] = crc; tdata[ilen+4] = (crc >> 8); - mraa_result_t ret = mraa_i2c_address(m_i2ControlCtx, m_controlAddr); + if (mraa_i2c_address(m_i2ControlCtx, m_controlAddr) != MRAA_SUCCESS) + { + fprintf(stdout, "Error, setting i2c address.\n"); + return -1; + } + int iLoops = 5; mraa_set_priority(HIGH_PRIORITY); do { diff --git a/src/ecs1030/ecs1030.cxx b/src/ecs1030/ecs1030.cxx index 90dd60a7..ff72f701 100644 --- a/src/ecs1030/ecs1030.cxx +++ b/src/ecs1030/ecs1030.cxx @@ -53,7 +53,6 @@ ECS1030::~ECS1030 () { double ECS1030::getCurrency_A () { int sensorValue = 0; - float rLoad = 0; float volt = 0; float rms = 0; diff --git a/src/grovescam/grovescam.cxx b/src/grovescam/grovescam.cxx index 881db9c0..e7890761 100644 --- a/src/grovescam/grovescam.cxx +++ b/src/grovescam/grovescam.cxx @@ -98,7 +98,6 @@ bool GROVESCAM::dataAvailable(unsigned int millis) timeout.tv_usec = (millis % 1000) * 1000; } - int nfds; fd_set readfds; FD_ZERO(&readfds); diff --git a/src/groveultrasonic/groveultrasonic.cxx b/src/groveultrasonic/groveultrasonic.cxx index 87ec1f65..dc9830d0 100644 --- a/src/groveultrasonic/groveultrasonic.cxx +++ b/src/groveultrasonic/groveultrasonic.cxx @@ -34,7 +34,6 @@ using namespace upm; GroveUltraSonic::GroveUltraSonic (uint8_t pin) { - mraa_result_t error = MRAA_SUCCESS; m_name = "GroveUltraSonic"; mraa_init(); diff --git a/src/hcsr04/hcsr04.cxx b/src/hcsr04/hcsr04.cxx index a05b9d5d..052f1c0f 100644 --- a/src/hcsr04/hcsr04.cxx +++ b/src/hcsr04/hcsr04.cxx @@ -39,7 +39,6 @@ using namespace upm; HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin) { - mraa_result_t error = MRAA_SUCCESS; m_name = "HCSR04"; m_triggerPinCtx = mraa_gpio_init (triggerPin); diff --git a/src/hm11/hm11.cxx b/src/hm11/hm11.cxx index bc0c3bae..5993a224 100644 --- a/src/hm11/hm11.cxx +++ b/src/hm11/hm11.cxx @@ -82,7 +82,6 @@ bool HM11::dataAvailable(unsigned int millis) timeout.tv_sec = 0; timeout.tv_usec = millis * 1000; - int nfds; fd_set readfds; FD_ZERO(&readfds); diff --git a/src/hmtrp/hmtrp.cxx b/src/hmtrp/hmtrp.cxx index 60e52d3d..b2e95df6 100644 --- a/src/hmtrp/hmtrp.cxx +++ b/src/hmtrp/hmtrp.cxx @@ -85,7 +85,6 @@ bool HMTRP::dataAvailable(unsigned int millis) timeout.tv_sec = 0; timeout.tv_usec = millis * 1000; - int nfds; fd_set readfds; FD_ZERO(&readfds); diff --git a/src/htu21d/htu21d.cpp b/src/htu21d/htu21d.cpp index 3dc5cc19..5e04cb80 100644 --- a/src/htu21d/htu21d.cpp +++ b/src/htu21d/htu21d.cpp @@ -174,7 +174,7 @@ HTU21D::getDewPoint(int bSampleData) int HTU21D::getHumidityData(float* pfHum, float* pfHumTemp, float* pfDewPt) { - float fHum = getHumidity(true); + getHumidity(true); float fTemp = getTemperature(false); float fDewPt = getDewPoint(false); float fCHum = getCompRH(false); @@ -271,7 +271,6 @@ HTU21D::i2cWriteReg (uint8_t reg, uint8_t value) { uint16_t HTU21D::i2cReadReg_16 (int reg) { - uint16_t data; m_i2ControlCtx.address(m_controlAddr); return m_i2ControlCtx.readWordReg(reg); } diff --git a/src/kxcjk1013/kxcjk1013.cxx b/src/kxcjk1013/kxcjk1013.cxx index bf1021a1..9b212976 100755 --- a/src/kxcjk1013/kxcjk1013.cxx +++ b/src/kxcjk1013/kxcjk1013.cxx @@ -179,7 +179,6 @@ KXCJK1013::extract3Axis(char* data, float* x, float* y, float* z) { mraa_iio_channel* channels = mraa_iio_get_channels(m_iio); float tmp[3]; - int i = 0; int iio_x, iio_y, iio_z; iio_x = getChannelValue((unsigned char*) (data + channels[0].location), &channels[0]); diff --git a/src/lcd/lcm1602.cxx b/src/lcd/lcm1602.cxx index e39d5939..b640b2b2 100644 --- a/src/lcd/lcm1602.cxx +++ b/src/lcd/lcm1602.cxx @@ -109,7 +109,6 @@ Lcm1602::Lcm1602(uint8_t rs, uint8_t enable, uint8_t d0, m_gpioD2(new mraa::Gpio(d2)), m_gpioD3(new mraa::Gpio(d3)), m_numColumns(numColumns), m_numRows(numRows) { - mraa::Result error = mraa::SUCCESS; m_name = "Lcm1602 (4-bit GPIO)"; m_isI2C = false; m_backlight = LCD_BACKLIGHT; @@ -202,7 +201,6 @@ Lcm1602::write(std::string msg) mraa::Result Lcm1602::setCursor(int row, int column) { - mraa::Result error = mraa::SUCCESS; column = column % m_numColumns; uint8_t offset = column; diff --git a/src/lcd/ssd1308.cxx b/src/lcd/ssd1308.cxx index a48a1f73..c4a35071 100644 --- a/src/lcd/ssd1308.cxx +++ b/src/lcd/ssd1308.cxx @@ -78,15 +78,12 @@ SSD1308::draw(uint8_t* data, int bytes) mraa::Result SSD1308::write(std::string msg) { - mraa::Result error = mraa::SUCCESS; - uint8_t data[2] = { 0x40, 0 }; - setAddressingMode(PAGE); for (std::string::size_type i = 0; i < msg.size(); ++i) { writeChar(msg[i]); } - return error; + return mraa::SUCCESS; } mraa::Result @@ -108,7 +105,6 @@ SSD1308::setCursor(int row, int column) mraa::Result SSD1308::clear() { - mraa::Result error = mraa::SUCCESS; uint8_t columnIdx, rowIdx; m_i2c_lcd_control.writeReg(LCD_CMD, DISPLAY_CMD_OFF); // display off diff --git a/src/lcd/ssd1327.cxx b/src/lcd/ssd1327.cxx index 65c5306d..1fa332f1 100644 --- a/src/lcd/ssd1327.cxx +++ b/src/lcd/ssd1327.cxx @@ -215,7 +215,6 @@ SSD1327::setCursor(int row, int column) mraa::Result SSD1327::clear() { - mraa::Result error = mraa::SUCCESS; uint8_t columnIdx, rowIdx; for (rowIdx = 0; rowIdx < 12; rowIdx++) { diff --git a/src/lol/lol.cxx b/src/lol/lol.cxx index e6672aa7..774c8128 100644 --- a/src/lol/lol.cxx +++ b/src/lol/lol.cxx @@ -136,7 +136,6 @@ void *do_draw(void *arg) LoL::LoL() { int i = 0; - mraa_result_t error; for (i = 0; i < 12; i++) { if ( !(m_LoLCtx[i] = mraa_gpio_init(i+2)) ) @@ -159,7 +158,6 @@ LoL::LoL() { LoL::~LoL() { int i = 0; - mraa_result_t error; for (i = 0; i < 12; i++) mraa_gpio_close(m_LoLCtx[i]); } diff --git a/src/max44009/max44009.cxx b/src/max44009/max44009.cxx index d7696c10..84e99f88 100644 --- a/src/max44009/max44009.cxx +++ b/src/max44009/max44009.cxx @@ -64,7 +64,6 @@ MAX44009::reset() { uint16_t MAX44009::getVisibleRaw() { - uint8_t exponent, mantissa; uint8_t data[MAX44009_LUX_LENGTH]; uint16_t* value = reinterpret_cast(&data[0]); diff --git a/src/max5487/max5487.cxx b/src/max5487/max5487.cxx index a7e93e21..f0c72634 100644 --- a/src/max5487/max5487.cxx +++ b/src/max5487/max5487.cxx @@ -57,7 +57,7 @@ MAX5487::setWiperA (uint8_t wiper) { data[0] = R_WR_WIPER_A; data[1] = wiper; - uint8_t* retData = m_spi.write(data, 2); + m_spi.write(data, 2); CSOff (); } @@ -71,7 +71,7 @@ MAX5487::setWiperB (uint8_t wiper) { data[0] = R_WR_WIPER_B; data[1] = wiper; - uint8_t* retData = m_spi.write(data, 2); + m_spi.write(data, 2); CSOff (); } diff --git a/src/mhz16/mhz16.cxx b/src/mhz16/mhz16.cxx index 161451c4..ca3162e7 100644 --- a/src/mhz16/mhz16.cxx +++ b/src/mhz16/mhz16.cxx @@ -84,7 +84,6 @@ bool MHZ16::dataAvailable(unsigned int millis) timeout.tv_sec = 0; timeout.tv_usec = millis * 1000; - int nfds; fd_set readfds; FD_ZERO(&readfds); diff --git a/src/mma7455/mma7455.cxx b/src/mma7455/mma7455.cxx index c54b5ced..d33dd609 100644 --- a/src/mma7455/mma7455.cxx +++ b/src/mma7455/mma7455.cxx @@ -37,7 +37,6 @@ using namespace upm; MMA7455::MMA7455 (int bus, int devAddr) : m_i2ControlCtx(bus) { unsigned char data = 0; - int nBytes = 0; m_name = "MMA7455"; @@ -98,7 +97,6 @@ MMA7455::calibrate () { mraa::Result MMA7455::readData (short * ptrX, short * ptrY, short * ptrZ) { accelData xyz; - unsigned char data = 0; int nBytes = 0; /*do { diff --git a/src/mpl3115a2/mpl3115a2.cpp b/src/mpl3115a2/mpl3115a2.cpp index df80c688..63bd8c92 100644 --- a/src/mpl3115a2/mpl3115a2.cpp +++ b/src/mpl3115a2/mpl3115a2.cpp @@ -72,8 +72,7 @@ MPL3115A2::MPL3115A2 (int bus, int devAddr, uint8_t mode) : m_i2ControlCtx(bus) int MPL3115A2::testSensor(void) { - int i, iTries; - int iError = 0; + int iTries; float pressure, temperature; float fPMin, fPMax, fTMin, fTMax; @@ -113,7 +112,7 @@ MPL3115A2::testSensor(void) void MPL3115A2::dumpSensor(void) { - int i, j, ival; + int i, j; fprintf(stdout, "Dumping i2c block from %s\n", MPL3115A2_NAME); for (i=0; i < 256; i+=16) { diff --git a/src/ms5611/ms5611.cxx b/src/ms5611/ms5611.cxx index 2883f7a6..29029b66 100644 --- a/src/ms5611/ms5611.cxx +++ b/src/ms5611/ms5611.cxx @@ -144,8 +144,7 @@ void MS5611::setOverSampling(OsrMode osrMode) void MS5611::delayms(int millisecs) { - struct timespec sleepTime, rem; - uint64_t nanosecs = 1000ULL * millisecs; + struct timespec sleepTime; sleepTime.tv_sec = millisecs / 1000; sleepTime.tv_nsec = (millisecs % 1000) * 1000000; while ((nanosleep( &sleepTime, &sleepTime ) != 0 ) && ( errno == EINTR ) ); diff --git a/src/pn532/pn532.cxx b/src/pn532/pn532.cxx index 4bb2b608..4d7caab7 100644 --- a/src/pn532/pn532.cxx +++ b/src/pn532/pn532.cxx @@ -200,8 +200,6 @@ uint32_t PN532::getFirmwareVersion() bool PN532::sendCommandCheckAck(uint8_t *cmd, uint8_t cmdlen, uint16_t timeout) { - uint16_t timer = 0; - // clear any outstanding irq's isReady(); @@ -747,7 +745,6 @@ bool PN532::mifareclassic_AuthenticateBlock (uint8_t * uid, uint8_t uidLen, uint8_t keyNumber, uint8_t * keyData) { - uint8_t len; uint8_t i; // Hang on to the key and uid data diff --git a/src/scam/scam.cxx b/src/scam/scam.cxx index 018c2313..e304c288 100644 --- a/src/scam/scam.cxx +++ b/src/scam/scam.cxx @@ -98,7 +98,6 @@ bool SCAM::dataAvailable(unsigned int millis) timeout.tv_usec = (millis % 1000) * 1000; } - int nfds; fd_set readfds; FD_ZERO(&readfds); diff --git a/src/ultrasonic/ultrasonic.cxx b/src/ultrasonic/ultrasonic.cxx index 9af925b0..b9f0bbe0 100644 --- a/src/ultrasonic/ultrasonic.cxx +++ b/src/ultrasonic/ultrasonic.cxx @@ -34,7 +34,6 @@ using namespace upm; UltraSonic::UltraSonic (uint8_t pin) { - mraa_result_t error = MRAA_SUCCESS; m_name = "UltraSonic"; mraa_init(); diff --git a/src/wt5001/wt5001.cxx b/src/wt5001/wt5001.cxx index 9d2e61e5..09f16359 100644 --- a/src/wt5001/wt5001.cxx +++ b/src/wt5001/wt5001.cxx @@ -85,7 +85,6 @@ bool WT5001::dataAvailable(unsigned int millis) timeout.tv_sec = 0; timeout.tv_usec = millis * 1000; - int nfds; fd_set readfds; FD_ZERO(&readfds); diff --git a/src/zfm20/zfm20.cxx b/src/zfm20/zfm20.cxx index 0c4825af..a652e14a 100644 --- a/src/zfm20/zfm20.cxx +++ b/src/zfm20/zfm20.cxx @@ -90,7 +90,6 @@ bool ZFM20::dataAvailable(unsigned int millis) timeout.tv_sec = 0; timeout.tv_usec = millis * 1000; - int nfds; fd_set readfds; FD_ZERO(&readfds); @@ -281,7 +280,6 @@ bool ZFM20::getResponse(uint8_t *pkt, int len) int idx = 0; int timer = 0; int rv; - int plen = 0; while (idx < len) {