From ae9b8fb13e2329ec288711f538f01a09de5f75fa Mon Sep 17 00:00:00 2001
From: Noel Eck <noel.eck@intel.com>
Date: Wed, 2 Nov 2016 22:26:41 -0700
Subject: [PATCH] Wsign-compare: Fixed all sign compare warnings in src

This commit addresses all warnings emitted from -Wunused-function
in the C++ src.

Signed-off-by: Noel Eck <noel.eck@intel.com>
---
 src/adxrs610/adxrs610.cxx       | 2 +-
 src/bno055/bno055.cxx           | 2 +-
 src/enc03r/enc03r.cxx           | 4 ++--
 src/grovevdiv/grovevdiv.cxx     | 4 ++--
 src/guvas12d/guvas12d.cxx       | 2 +-
 src/mic/mic.cxx                 | 2 +-
 src/my9221/grovecircularled.cxx | 4 ++--
 src/my9221/groveledbar.cxx      | 2 +-
 src/my9221/my9221.cxx           | 6 +++---
 src/sm130/sm130.cxx             | 6 +++---
 src/sx1276/sx1276.cxx           | 6 +++---
 src/tex00/tex00.cxx             | 5 +++--
 src/vcap/vcap.cxx               | 4 ++--
 src/vdiv/vdiv.cxx               | 4 ++--
 src/xbee/xbee.cxx               | 2 +-
 15 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/adxrs610/adxrs610.cxx b/src/adxrs610/adxrs610.cxx
index 30662bbf..c5d3f175 100644
--- a/src/adxrs610/adxrs610.cxx
+++ b/src/adxrs610/adxrs610.cxx
@@ -66,7 +66,7 @@ float ADXRS610::calibrateZeroPoint(unsigned int samples)
   // The gyro should be in a stable, non-moving state
 
   float sum = 0;
-  for (int i=0; i<samples; i++)
+  for (unsigned int i=0; i<samples; i++)
     sum += getDataVolts();
 
   return sum / samples;
diff --git a/src/bno055/bno055.cxx b/src/bno055/bno055.cxx
index 359de514..0f3ececc 100644
--- a/src/bno055/bno055.cxx
+++ b/src/bno055/bno055.cxx
@@ -481,7 +481,7 @@ string BNO055::readCalibrationData()
 
 void BNO055::writeCalibrationData(string calibData)
 {
-  if (calibData.size() != calibrationDataNumBytes)
+  if (static_cast<int>(calibData.size()) != calibrationDataNumBytes)
     {
       throw std::invalid_argument(std::string(__FUNCTION__)
                                   + ": calibData string must be exactly "
diff --git a/src/enc03r/enc03r.cxx b/src/enc03r/enc03r.cxx
index 7dc4f65f..679ca08c 100644
--- a/src/enc03r/enc03r.cxx
+++ b/src/enc03r/enc03r.cxx
@@ -59,10 +59,10 @@ unsigned int ENC03R::value()
 
 void ENC03R::calibrate(unsigned int samples)
 {
-  unsigned int val;
+  int val;
   float total = 0.0;
 
-  for (int i=0; i<samples; i++)
+  for (unsigned int i=0; i<samples; i++)
     {
       val = mraa_aio_read(m_aio);
       if (val == -1) throw std::out_of_range(std::string(__FUNCTION__) +
diff --git a/src/grovevdiv/grovevdiv.cxx b/src/grovevdiv/grovevdiv.cxx
index b1ebe154..fdf62754 100644
--- a/src/grovevdiv/grovevdiv.cxx
+++ b/src/grovevdiv/grovevdiv.cxx
@@ -48,9 +48,9 @@ GroveVDiv::~GroveVDiv()
 
 unsigned int GroveVDiv::value(unsigned int samples)
 {
-  unsigned int sum = 0;
+  int sum = 0;
 
-  for (int i=0; i<samples; i++)
+  for (unsigned int i=0; i<samples; i++)
     {
       sum += mraa_aio_read(m_aio);
       if (sum == -1) return 0;
diff --git a/src/guvas12d/guvas12d.cxx b/src/guvas12d/guvas12d.cxx
index 063e42db..f3624c5a 100644
--- a/src/guvas12d/guvas12d.cxx
+++ b/src/guvas12d/guvas12d.cxx
@@ -51,7 +51,7 @@ float GUVAS12D::value(float aref, unsigned int samples)
   int val;
   unsigned long sum = 0;
 
-  for (int i=0; i<samples; i++)
+  for (unsigned int i=0; i<samples; i++)
     {
       val = mraa_aio_read(m_aio);
       if (val == -1) return -1;
diff --git a/src/mic/mic.cxx b/src/mic/mic.cxx
index 8a4978cd..970c7163 100644
--- a/src/mic/mic.cxx
+++ b/src/mic/mic.cxx
@@ -84,7 +84,7 @@ int
 Microphone::findThreshold (thresholdContext* ctx, unsigned int threshold,
                                 uint16_t * buffer, int len) {
     long sum = 0;
-    for (unsigned int i = 0; i < len; i++) {
+    for (int i = 0; i < len; i++) {
         sum += buffer[i];
     }
 
diff --git a/src/my9221/grovecircularled.cxx b/src/my9221/grovecircularled.cxx
index 4eba41d1..43a8fcee 100644
--- a/src/my9221/grovecircularled.cxx
+++ b/src/my9221/grovecircularled.cxx
@@ -77,12 +77,12 @@ void GroveCircularLED::setLevel(uint8_t level, bool direction)
 
   if (!direction)
     {
-      for (int i=0; i<(LEDS_PER_INSTANCE * m_instances); i++)
+      for (int i=0; i < static_cast<int>(LEDS_PER_INSTANCE * m_instances); i++)
         m_bitStates[i] = (i < level) ? m_highIntensity : m_lowIntensity;
     }
   else
     {
-      for (int i=0; i<(LEDS_PER_INSTANCE * m_instances); i++)
+      for (int i=0; i< static_cast<int>(LEDS_PER_INSTANCE * m_instances); i++)
         m_bitStates[i] = (((LEDS_PER_INSTANCE * m_instances) - i) <= level)
           ? m_highIntensity : m_lowIntensity;
     }
diff --git a/src/my9221/groveledbar.cxx b/src/my9221/groveledbar.cxx
index c81d0c4a..4b98af7e 100644
--- a/src/my9221/groveledbar.cxx
+++ b/src/my9221/groveledbar.cxx
@@ -61,7 +61,7 @@ void GroveLEDBar::setBarLevel(uint8_t level, bool greenToRed, int barNumber)
   if (level > 10)
     level = 10;
 
-  if (barNumber >= m_instances)
+  if (barNumber >= static_cast<int>(m_instances))
     barNumber = m_instances - 1;
 
   int start = barNumber * LEDS_PER_INSTANCE;
diff --git a/src/my9221/my9221.cxx b/src/my9221/my9221.cxx
index 4cb10c6c..c5073cf9 100644
--- a/src/my9221/my9221.cxx
+++ b/src/my9221/my9221.cxx
@@ -121,7 +121,7 @@ void MY9221::setHighIntensityValue(int intensity)
 
 void MY9221::setAll()
 {
-  for (int i=0; i<(m_instances * LEDS_PER_INSTANCE); i++)
+  for (int i=0; i< static_cast<int>(m_instances * LEDS_PER_INSTANCE); i++)
     m_bitStates[i] = m_highIntensity;
 
   if (m_autoRefresh)
@@ -130,7 +130,7 @@ void MY9221::setAll()
 
 void MY9221::clearAll()
 {
-  for (int i=0; i<(m_instances * LEDS_PER_INSTANCE); i++)
+  for (int i=0; i< static_cast<int>(m_instances * LEDS_PER_INSTANCE); i++)
     m_bitStates[i] = m_lowIntensity;
 
   if (m_autoRefresh)
@@ -139,7 +139,7 @@ void MY9221::clearAll()
 
 void MY9221::refresh()
 {
-  for (int i=0; i<(m_instances * LEDS_PER_INSTANCE); i++)
+  for (int i=0; i< static_cast<int>(m_instances * LEDS_PER_INSTANCE); i++)
     {
       if (i % 12 == 0)
         {
diff --git a/src/sm130/sm130.cxx b/src/sm130/sm130.cxx
index 79489c08..34e9fa1a 100644
--- a/src/sm130/sm130.cxx
+++ b/src/sm130/sm130.cxx
@@ -84,7 +84,7 @@ string SM130::sendCommand(CMD_T cmd, string data)
   // now the data if any
   if (!data.empty())
     {
-      for (int i=0; i<data.size(); i++)
+      for (size_t i=0; i<data.size(); i++)
         {
           command.push_back(data[i]);
           cksum += (uint8_t)data[i];
@@ -129,7 +129,7 @@ string SM130::sendCommand(CMD_T cmd, string data)
     }
     
   // check size - 2 header bytes + len + cksum.
-  if (resp.size() != ((uint8_t)resp[2] + 2 + 1 + 1))
+  if (resp.size() != static_cast<size_t>((uint8_t)resp[2] + 2 + 1 + 1))
     {
       cerr << __FUNCTION__ << ": invalid packet length, expected " 
            << int((uint8_t)resp[2] + 2 + 1 + 1) 
@@ -139,7 +139,7 @@ string SM130::sendCommand(CMD_T cmd, string data)
 
   // verify the cksum
   cksum = 0;
-  for (int i=2; i<(resp.size() - 1); i++)
+  for (size_t i=2; i<(resp.size() - 1); i++)
     cksum += (uint8_t)resp[i];
 
   if (cksum != (uint8_t)resp[resp.size() - 1])
diff --git a/src/sx1276/sx1276.cxx b/src/sx1276/sx1276.cxx
index 32119c5a..0c4664a4 100644
--- a/src/sx1276/sx1276.cxx
+++ b/src/sx1276/sx1276.cxx
@@ -312,7 +312,7 @@ void SX1276::init()
 
   setOpMode(MODE_Sleep);
 
-  for (int i = 0; i < sizeof(radioRegsInit) / sizeof(radioRegisters_t); i++ )
+  for (size_t i = 0; i < sizeof(radioRegsInit) / sizeof(radioRegisters_t); i++ )
     {
       setModem(radioRegsInit[i].Modem);
       writeReg(radioRegsInit[i].Addr, radioRegsInit[i].Value);
@@ -515,7 +515,7 @@ uint8_t SX1276::lookupFSKBandWidth(uint32_t bw)
 
   // See Table 40 in the datasheet
 
-  for (int i=0; i<(sizeof(FskBandwidths)/sizeof(FskBandwidth_t)) - 1; i++)
+  for (size_t i=0; i<(sizeof(FskBandwidths)/sizeof(FskBandwidth_t)) - 1; i++)
     {
       if ( (bw >= FskBandwidths[i].bandwidth) && 
            (bw < FskBandwidths[i + 1].bandwidth) )
@@ -1263,7 +1263,7 @@ SX1276::RADIO_EVENT_T SX1276::setTx(int timeout)
   setOpMode(MODE_TxMode);
 
   initClock();
-  while ((getMillis() < timeout) && m_radioEvent == REVENT_EXEC)
+  while ((getMillis() < static_cast<uint32_t>(timeout)) && m_radioEvent == REVENT_EXEC)
     usleep(100);
 
   if (m_radioEvent == REVENT_EXEC)
diff --git a/src/tex00/tex00.cxx b/src/tex00/tex00.cxx
index 8335b294..95e31c67 100644
--- a/src/tex00/tex00.cxx
+++ b/src/tex00/tex00.cxx
@@ -179,7 +179,7 @@ float TEX00::thermistor(float ohms)
   else
     {
       // PTC
-      for (int i=0; i<m_tempVector.size(); i++)
+      for (size_t i=0; i<m_tempVector.size(); i++)
         if (ohms < m_tempVector[i].ohms)
           {
             found = i;
@@ -189,7 +189,8 @@ float TEX00::thermistor(float ohms)
     }
 
   if (found < 0 || next < 0 || 
-      found >= m_tempVector.size() || next >= m_tempVector.size())
+      found >= static_cast<int>(m_tempVector.size()) ||
+      next >= static_cast<int>(m_tempVector.size()))
     {
       m_outOfRange = true;
       // return last measured temperature
diff --git a/src/vcap/vcap.cxx b/src/vcap/vcap.cxx
index 8a992cec..955fee6b 100644
--- a/src/vcap/vcap.cxx
+++ b/src/vcap/vcap.cxx
@@ -183,7 +183,7 @@ bool VCAP::setResolution(int width, int height)
     }
 
   // G_FMT will have adjusted these if neccessary, so verify
-  if (m_format.fmt.pix.width != m_width)
+  if (static_cast<int>(m_format.fmt.pix.width) != m_width)
     {
       if (m_debugging)
         cerr << __FUNCTION__ << ": Warning: Selected width "
@@ -195,7 +195,7 @@ bool VCAP::setResolution(int width, int height)
       m_width = m_format.fmt.pix.width;
     }
   
-  if (m_format.fmt.pix.height != m_height)
+  if (static_cast<int>(m_format.fmt.pix.height) != m_height)
     {
       if (m_debugging)
         cerr << __FUNCTION__ << ": Warning: Selected height "
diff --git a/src/vdiv/vdiv.cxx b/src/vdiv/vdiv.cxx
index 829a1ea7..867cf66e 100644
--- a/src/vdiv/vdiv.cxx
+++ b/src/vdiv/vdiv.cxx
@@ -48,9 +48,9 @@ VDiv::~VDiv()
 
 unsigned int VDiv::value(unsigned int samples)
 {
-  unsigned int sum = 0;
+  int sum = 0;
 
-  for (int i=0; i<samples; i++)
+  for (unsigned int i=0; i<samples; i++)
     {
       sum += mraa_aio_read(m_aio);
       if (sum == -1) return 0;
diff --git a/src/xbee/xbee.cxx b/src/xbee/xbee.cxx
index d3073e1b..ba7ae22b 100644
--- a/src/xbee/xbee.cxx
+++ b/src/xbee/xbee.cxx
@@ -94,7 +94,7 @@ bool XBee::commandMode(std::string cmdChars, int guardTimeMS)
 
 string XBee::stringCR2LF(string str)
 {
-  for (int i=0; i<str.size(); i++)
+  for (size_t i=0; i<str.size(); i++)
     if (str[i] == '\r')
       str[i] = '\n';