Merge pull request #647 from adafruit/fix-warning

Fix warning

Author: hathach

cores/nRF5/HardwarePWM.cpp

@@ -266,12 +266,16 @@ bool HardwarePWM::takeOwnership(uint32_t token)
   bool const thread_mode = !isInISR();
 
   if (token == 0) {
-    if (thread_mode) LOG_LV1("HwPWM", "zero is not a valid ownership token (attempted use in takeOwnership)");
+    if (thread_mode) {
+      LOG_LV1("HwPWM", "zero is not a valid ownership token (attempted use in takeOwnership)");
+    }
     return false;
   }
 
   if (token == this->_owner_token) {
-    if (thread_mode) LOG_LV1("HwPWM", "failing to acquire ownership because already owned by requesting token (cannot take ownership twice)");
+    if (thread_mode) {
+      LOG_LV1("HwPWM", "failing to acquire ownership because already owned by requesting token (cannot take ownership twice)");
+    }
     return false;
   }
 
@@ -290,22 +294,30 @@ bool HardwarePWM::releaseOwnership(uint32_t token)
   bool const thread_mode = !isInISR();
 
   if (token == 0) {
-    if (thread_mode) LOG_LV1("HwPWM", "zero is not a valid ownership token (attempted use in releaseOwnership)");
+    if (thread_mode) {
+      LOG_LV1("HwPWM", "zero is not a valid ownership token (attempted use in releaseOwnership)");
+    }
     return false;
   }
 
   if (!this->isOwner(token)) {
-    if (thread_mode) LOG_LV1("HwPWM", "attempt to release ownership when not the current owner");
+    if (thread_mode) {
+      LOG_LV1("HwPWM", "attempt to release ownership when not the current owner");
+    }
     return false;
   }
 
   if (this->usedChannelCount() != 0) {
-    if (thread_mode) LOG_LV1("HwPWM", "attempt to release ownership when at least on channel is still connected");
+    if (thread_mode) {
+      LOG_LV1("HwPWM", "attempt to release ownership when at least on channel is still connected");
+    }
     return false;
   }
 
   if (this->enabled()) {
-    if (thread_mode) LOG_LV1("HwPWM", "attempt to release ownership when PWM peripheral is still enabled");
+    if (thread_mode) {
+      LOG_LV1("HwPWM", "attempt to release ownership when PWM peripheral is still enabled");
+    }
     return false; // if it's enabled, do not allow ownership to be released, even with no pins in use
   }
 

cores/nRF5/Tone.cpp

@@ -109,14 +109,14 @@ constexpr static uint64_t _calculate_pulse_count(uint32_t frequency, uint32_t du
         (((uint64_t)duration) * frequency / 1000ULL);
 };
 
-static int _bits_used(unsigned long      x) {
-    if (0 == x) return 0;
-    unsigned int result = 0;
-    do {
-        result++;
-    } while (x >>= 1);
-    return result;
-}
+//static int _bits_used(unsigned long      x) {
+//    if (0 == x) return 0;
+//    unsigned int result = 0;
+//    do {
+//        result++;
+//    } while (x >>= 1);
+//    return result;
+//}
 
 static int _bits_used(unsigned long long x) {
     if (0 == x) return 0;

cores/nRF5/WString.cpp

@@ -693,13 +693,22 @@ void String::remove(unsigned int index){
 }
 
 void String::remove(unsigned int index, unsigned int count){
-	if (index >= len) { return; }
-	if (count <= 0) { return; }
-	if (count > len - index) { count = len - index; }
-	char *writeTo = buffer + index;
-	len = len - count;
-	strncpy(writeTo, buffer + index + count,len - index);
-	buffer[len] = 0;
+  // removes characters from the middle of a string.
+  if (count <= 0) { return; }   // exit if nothing to remove
+  if (index >= len) { return; } // ensure start is within string length; thus, ensures (len-index >= 1)
+  if (count > len - index) {    // ensure characters to remove is no larger than total length remaining
+    count = len - index;
+  }
+  char *writeTo  = buffer + index;
+  char *copyFrom = buffer + index + count;
+  len = len - count;
+
+  // strncpy() cannot be used with overlapping buffers, so copy one char at a time
+  unsigned int charactersToMove = len - index; // yes, uses post-adjusted length
+  for (unsigned int i = 0; i < charactersToMove; i++, writeTo++, copyFrom++) {
+    *writeTo = *copyFrom;
+  }
+  buffer[len] = 0;
 }
 
 void String::toLowerCase(void)

libraries/Adafruit_TinyUSB_Arduino

@@ -44,8 +44,8 @@ class BLEAdafruitSensor : public BLEService
     void setNotifyCallback(notify_callback_t fp);
 
   protected:
-    BLECharacteristic _period;
     BLECharacteristic _measurement;
+    BLECharacteristic _period;
 
     Adafruit_Sensor*  _sensor;
 

libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h

@@ -310,6 +310,9 @@ void pairing_complete_callback(uint16_t conn_handle, uint8_t auth_status)
   }else
   {
     Serial.println("Failed");
+
+    // disconnect
+    conn->disconnect();
   }
 
 #ifdef USE_ARCADA
@@ -321,9 +324,6 @@ void pairing_complete_callback(uint16_t conn_handle, uint8_t auth_status)
   {
     tft->setTextColor(ARCADA_RED);
     tft->print("Failed ");
-
-    // disconnect
-    conn->disconnect();
   }
 
   tft->setTextColor(ARCADA_WHITE);

libraries/Bluefruit52Lib/examples/Central/central_pairing/central_pairing.ino

@@ -241,7 +241,7 @@ void displayNotification(int index)
   }else
   {
     // Text size = 1, max char is 21. Text size = 2, max char is 10
-    char tempbuf[22];
+    char tempbuf[30];
     sprintf(tempbuf, "%-15s %02d/%02d", myNtf->app_name, index+1, notifCount);
 
     oled.println(tempbuf);

libraries/Bluefruit52Lib/examples/Peripheral/ancs_oled/ancs_oled.ino

@@ -84,7 +84,7 @@ void onPDMdata() {
 
 uint16_t getSoundAverage() {
   uint32_t avg = 0;
-  for (int i = 0; i < sizeof(soundSampleBuffer)/sizeof(soundSampleBuffer[0]); i++) {
+  for (uint32_t i = 0; i < sizeof(soundSampleBuffer)/sizeof(soundSampleBuffer[0]); i++) {
     avg += soundSampleBuffer[i]*soundSampleBuffer[i];
   }
   return sqrt(avg);

libraries/Bluefruit52Lib/examples/Peripheral/arduino_science_journal/arduino_science_journal.ino

@@ -207,6 +207,10 @@ void bleuart_rx_callback(uint16_t conn_hdl)
       red = (c565 & 0xf800) >> 8;
       green = (c565 & 0x07e0) >> 3;
       blue = (c565 & 0x001f) << 3;
+    }else
+    {
+      Serial.println("Error: incorrect color bits ");
+      while(1) yield();
     }
 
     // Convert RGB into Eink Color

libraries/Bluefruit52Lib/examples/Peripheral/image_eink_transfer/image_eink_transfer.ino

@@ -288,7 +288,9 @@ bool bond_load_cccd(uint8_t role, uint16_t conn_hdl, ble_gap_addr_t const* id_ad
 
   file.close();
 
-  if ( !loaded ) LOG_LV1("BOND", "CCCD setting not found");
+  if ( !loaded ) {
+    LOG_LV1("BOND", "CCCD setting not found");
+  }
   return loaded;
 }