Changes based on code review

Author: sgbihu

README.md

@@ -56,9 +56,9 @@ them to the [support forum](https://forum.arduino.cc/index.php?board=103).
 
 # Enable debug interface on Serail1
 
-*Default disable the debug interface.
+* Default disable the debug interface.
 
-If you want to enable debug trace on Serail1 to debug corelib,  follow these instructions.
+If you want to enable debug trace on Serial1 to debug corelib,  follow these instructions.
 
 1. Shut down the IDE
 2. Go to Arduino15 directory

cores/arduino/printk.cpp

@@ -29,202 +29,24 @@
  */
 
 #include <stdarg.h>
+#include <cstdio>
 #include "UARTClass.h"
 
 extern "C" void printk(const char *fmt, va_list args);
-int __vsnprintf(char *dest, int size, const char *fmt, va_list args)
-{
-	int might_format = 0;
-	int len = 0;
-	char lastchar = 0;
-	bool binary_format = false;
-
-	if (!dest || !size)
-		return 0;
-
-	while (*fmt && len < size) {
-		if (!might_format) {
-			if (*fmt == '\n' && lastchar != '\r') {
-				if (len < size) {
-					lastchar = *dest++ = '\r', len++;
-					continue;
-				} else
-					break;
-			} else if (*fmt != '%') {
-				if (len < size)
-					lastchar = *dest++ = *fmt, len++;
-				else
-					break;
-			} else
-				might_format = 1;
-		} else {
-			if (*fmt == '%') {
-				if (len < size)
-					*dest++ = '%', len++;
-				else
-					break;
-				might_format = 0;
-			} else {
-				switch (*fmt) {
-				case '0':
-				case '1':
-					might_format |= 2;
-					goto still_format;
-					break;
-				case '2':
-					might_format |= 4;
-					goto still_format;
-					break;
-				case '4':
-					might_format |= 8;
-					goto still_format;
-					break;
-				case 'b':
-					binary_format = true;
-					goto still_format;
-					break;
-				case 'd':
-				case 'i':
-				case 'u':
-					if (!binary_format) {
-						unsigned long num =
-							va_arg(args,
-							       unsigned long);
-						unsigned long pos = 999999999;
-						unsigned long remainder = num;
-						int found_largest_digit = 0;
-
-						if (*fmt != 'u'
-						    && (num & (1 << 31))) {
-							if (len < size)
-								*dest++ =
-									'-',
-								len++;
-							num = (~num) + 1;
-							remainder = num;
-						}
-						while (pos >= 9) {
-							if (found_largest_digit
-							    || remainder >
-							    pos) {
-								found_largest_digit
-									= 1;
-								if (len < size)
-									*dest++
-										=
-											(
-												char)
-											((
-												 remainder
-												 / (
-													 pos
-													 +
-													 1))
-											 +
-											 48),
-									len++;
-								else
-									break;
-							}
-							remainder %= (pos + 1);
-							pos /= 10;
-						}
-						if (len < size)
-							*dest++ =
-								(char)(
-									remainder
-									+
-									48),
-							len++;
-						break;
-					}
-				case 'x':
-				case 'X':
-				case 'p': {
-					unsigned long num =
-						va_arg(args, unsigned long);
-					int sz = sizeof(num) * 2;
-
-					if (might_format & 8) {
-						sz = 4;
-					} else if (might_format & 4) {
-						sz = 2;
-					} else if (might_format & 2) {
-						sz = 1;
-					}
-					for (; sz; sz--) {
-						char nibble;
-						if (!binary_format) {
-							nibble =
-								(num >>
-								 ((sz -
-								   1) <<
-								  2) & 0xf);
-							nibble +=
-								nibble >
-								9 ? 87 : 48;
-						} else {
-							nibble =
-								(num >>
-								 ((sz -
-								   1) <<
-								  3) & 0xff);
-						}
-						if (len < size)
-							*dest++ =
-								nibble,
-							len++;
-						else
-							break;
-					}
-					break;
-				}
-				case 's': {
-					char *s = va_arg(args, char *);
-					while (*s)
-						if (len < size)
-							*dest++ =
-								*s++, len++;
-						else
-							break;
-					break;
-				}
-				case 'c': {
-					char c = va_arg(args, int);
-					if (len < size)
-						*dest++ = c, len++;
-					break;
-				}
-				default:
-					if (len < size)
-						*dest++ = '%', len++;
-					if (len < size)
-						*dest++ = *fmt, len++;
-					break;
-				}
-				might_format = 0;
-still_format:
-				(void)might_format;
-			}
-		}
-		++fmt;
-	}
-	*dest = '\0';
-	return len;
-}
-
 extern UARTClass Serial1;
 #define PRINTK_BUFSIZ 256
+
 void printk(const char *fmt, va_list args)
 {
 #ifdef CONFIGURE_DEBUG_CORELIB_ENABLED
-	int len = 0;
+    int len = 0;
 
     char tmp[PRINTK_BUFSIZ];
 
-    len = __vsnprintf(tmp, PRINTK_BUFSIZ, fmt, args);
+    len = vsnprintf(tmp, PRINTK_BUFSIZ, fmt, args);
 
     tmp[len] = '\0';
     Serial1.println(tmp);
 #endif
 }
+

libraries/CurieBLE/examples/IMUBleCentral/IMUBleCentral.ino

@@ -15,6 +15,7 @@
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
 #include <CurieBLE.h>
 
 /*
@@ -31,18 +32,12 @@ typedef struct {
 } imuFrameType;
 
 imuFrameType imuBuf[MAX_IMU_RECORD];
-
-unsigned seqNum = 0;
-
-long previousMillis = 0;  // last time the battery level was checked, in ms
-
-BLECentral bleCentral;;       // BLE Central Device (the board you're programming)
+BLECentral bleCentral;      // BLE Central Device (the board you're programming)
 
 BLEService bleImuService("F7580001-153E-D4F6-F26D-43D8D98EEB13");
-// Tx IMU data Characteristic
-BLECharacteristic bleImuChar("F7580003-153E-D4F6-F26D-43D8D98EEB13",       // standard 16-bit characteristic UUID
-                             BLERead | BLENotify, sizeof(imuBuf));     // remote clients will be able to
-                                               // get notifications if this characteristic changes
+BLECharacteristic bleImuChar("F7580003-153E-D4F6-F26D-43D8D98EEB13",    // standard 128-bit characteristic UUID
+                             BLERead | BLENotify, sizeof(imuBuf));      // remote clients will be able to
+                                                                        // get notifications if this characteristic changes
 
 void ble_connected(BLEHelper &role)
 {
@@ -66,7 +61,6 @@ void bleImuCharacteristicWritten(BLEHelper& central, BLECharacteristic& characte
     Serial.print(value->slot[1]);
     Serial.print("\t");
     Serial.println(value->slot[2]);
-    Serial1.print("\r\n");
 }
 
 bool adv_found(uint8_t type, 
@@ -117,9 +111,7 @@ bool adv_found(uint8_t type,
     return true;
 }
 
-void setup() {
-    Serial1.begin(115200);
-    
+void setup() {    
     Serial.begin(115200);    // initialize serial communication
     pinMode(13, OUTPUT);   // initialize the LED on pin 13 to indicate when a central is connected
 
@@ -147,6 +139,5 @@ void setup() {
 void loop()
 {
     delay(2000);
-    Serial1.println("Live..");
 }
 

libraries/CurieBLE/examples/IMUBleNotification/IMUBleNotification.ino

@@ -15,6 +15,7 @@
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
 #include <CurieBLE.h>
 #include <CurieIMU.h>
 
@@ -34,19 +35,12 @@ imuFrameType imuBuf[MAX_IMU_RECORD];
 
 unsigned seqNum = 0;
 
-long previousMillis = 0;  // last time the battery level was checked, in ms
-
-
 BLEPeripheral blePeripheral;       // BLE Peripheral Device (the board you're programming)
-BLEService bleImuService("F7580001-153E-D4F6-F26D-43D8D98EEB13");
-
-// Tx IMU data Characteristic
-
-BLECharacteristic bleImuChar("F7580003-153E-D4F6-F26D-43D8D98EEB13",       // standard 16-bit characteristic UUID
-                             BLERead | BLENotify, sizeof(imuBuf)); 	   // remote clients will be able to
-			     	       		  			   // get notifications if this characteristic changes
+BLEService bleImuService("F7580001-153E-D4F6-F26D-43D8D98EEB13"); // Tx IMU data Characteristic
+BLECharacteristic bleImuChar("F7580003-153E-D4F6-F26D-43D8D98EEB13", // standard 128-bit characteristic UUID
+                             BLERead | BLENotify, sizeof(imuBuf));   // remote clients will be able to
+                                                                     // get notifications if this characteristic changes
 void setup() {
-    Serial1.begin(115200); // For corelib debug
 
     Serial.begin(9600);    // initialize serial communication
     pinMode(13, OUTPUT);   // initialize the LED on pin 13 to indicate when a central is connected

libraries/CurieBLE/examples/LEDCentral/LEDCentral.ino

@@ -27,9 +27,7 @@ BLECentral bleCentral; // create central instance
 BLEPeripheralHelper *blePeripheral1 = NULL;
 
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // create service
-// create switch characteristic and allow remote device to read and write
-BLECharCharacteristic switchChar("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
+BLECharCharacteristic switchChar("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);// create switch characteristic and allow remote device to read and write
 
 void bleCentralConnectHandler(BLEHelper& peripheral)
 {
@@ -116,8 +114,6 @@ bool adv_found(uint8_t type,
 }
 
 void setup() {
-    Serial1.begin(115200);
-	
     Serial.begin(9600);
     pinMode(ledPin, OUTPUT); // use the LED on pin 13 as an output
 
@@ -141,7 +137,7 @@ void setup() {
 
 void loop()
 {
-    static unsigned char counter = 0;
+    static unsigned int counter = 0;
     static char ledstate = 0;
     delay(2000);
     if (blePeripheral1)

libraries/CurieBLE/examples/Scanning/Scanning.ino

@@ -94,9 +94,6 @@ bool adv_found(uint8_t type,
 }
 
 void setup() {
-    log_init();
-    Serial1.begin(115200);
-
     Serial.begin(115200);    // initialize serial communication
 
     /* Setup callback */
@@ -106,27 +103,27 @@ void setup() {
        It will start continuously scanning BLE advertising
      */
     bleCentral.begin();
-    Serial1.println("Bluetooth device active, start scanning...");
+    Serial.println("Bluetooth device active, start scanning...");
 }
 
 void loop() {
     // Output the scanned device per 3s
     delay(3000);
-    Serial1.print("\r\n\r\n\t\t\tScaning result\r\n \tMAC\t\t\t\tLocal Name\r\n");
-    Serial1.print("-------------------------------------------------------------\r\n");
+    Serial.print("\r\n\r\n\t\t\tScaning result\r\n \tMAC\t\t\t\tLocal Name\r\n");
+    Serial.print("-------------------------------------------------------------\r\n");
 
     for (int i = 0; i < list_index; i++)
     {
 
-        Serial1.print(device_list[i].macaddr);
-        Serial1.print(" | ");
-        Serial1.println(device_list[i].loacalname);
+        Serial.print(device_list[i].macaddr);
+        Serial.print(" | ");
+        Serial.println(device_list[i].loacalname);
     }
     if (list_index == 0)
     {
-        Serial1.print("No device found\r\n");
+        Serial.print("No device found\r\n");
     }
-    Serial1.print("-------------------------------------------------------------\r\n");
+    Serial.print("-------------------------------------------------------------\r\n");
     adv_list_clear();
 }