Merge branch 'master' of https://github.com/sgbihu/corelibs-arduino101

Author: sgbihu

README.md

@@ -21,6 +21,12 @@ Future upgrades may fail since the internal contents were modified by hand. In
 order to recover, shut down the IDE, delete the entire `Arduino15` directory,
 then restart the IDE.
 
+# Pull Requests
+
+Before submitting a pull request, please see our
+[guidelines](https://github.com/01org/corelibs-arduino101/wiki/Writing-a-commit-message)
+for writing a considerate commit message.
+
 # Support & Issues
 
 If you have found a bug, or you believe a new feature should be added, please
@@ -47,3 +53,21 @@ them to the [support forum](https://forum.arduino.cc/index.php?board=103).
 > "How do I use this library?"
 
 > "I can't get this example sketch to work. What am I doing wrong?"
+
+# Enable debug interface on Serail1
+
+*Default disable the debug interface.
+
+If you want to enable debug trace on Serail1 to debug corelib,  follow these instructions.
+
+1. Shut down the IDE
+2. Go to Arduino15 directory
+  * Windows: `C:\Users\<user>\AppData\Roaming\Arduino15`
+  * OS X: `~/Library/Arduino15`
+  * Linux: `~/.arduino15`
+3. Modify the platform.txt
+  * Find `compiler.c.flags` and add `-DCONFIGURE_DEBUG_CORELIB_ENABLED` at the end of this line
+  * Find `compiler.cpp.flags` and add `-DCONFIGURE_DEBUG_CORELIB_ENABLED` at the end of this line
+4. Initial Serial1 in your sketch
+  * Add `Serial1.begin(115200);` in your `setup()`
+5. Adjust the output level at log_init function in log.c

cores/arduino/Arduino.h

@@ -43,8 +43,6 @@ extern "C"{
 #define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (SYSTEM_CORE_CLOCK / 1000L) )
 #define microsecondsToClockCycles(a) ( (a) * (SYSTEM_CORE_CLOCK / 1000000L) )
 
-#define digitalPinToInterrupt(P)   ( P )
-
 void yield(void);
 
 /* sketch */

cores/arduino/UARTClass.cpp

@@ -25,6 +25,8 @@
 #include "wiring_constants.h"
 #include "wiring_digital.h"
 
+#define SETTLING_TIME  400
+
 extern void UART_Handler(void);
 extern void serialEventRun(void) __attribute__((weak));
 extern void serialEvent(void) __attribute__((weak));
@@ -112,6 +114,10 @@ void UARTClass::end( void )
   opened = false;
   // Clear any received data
   _rx_buffer->_iHead = _rx_buffer->_iTail;
+
+  SET_PIN_MODE(17, GPIO_MUX_MODE); // Rdx SOC PIN (Arduino header pin 0)
+  SET_PIN_MODE(16, GPIO_MUX_MODE); // Txd SOC PIN (Arduino header pin 1)
+  delayMicroseconds(SETTLING_TIME); // wait for lines to settle
 }
 
 void UARTClass::setInterruptPriority(uint32_t priority)

cores/arduino/i2c.c

@@ -48,7 +48,8 @@ static void ss_i2c_err(uint32_t dev_id)
 	i2c_err_source = dev_id;
 }
 
-static int wait_rx_or_err(bool no_stop){
+static int wait_rx_or_err()
+{
 	uint64_t timeout = TIMEOUT_MS * 200;
 	while(timeout--) {
 		if (i2c_err_detect) {
@@ -65,20 +66,17 @@ static int wait_rx_or_err(bool no_stop){
 				return I2C_ERROR_OTHER; // other error
 			}
 		}
-		if (!no_stop) {
-			if (i2c_rx_complete) {
-				return I2C_OK;
-			}
+		if (i2c_rx_complete) {
+			return I2C_OK;
 		}
 		delayMicroseconds(10);
 	}
-	if (!no_stop)
-		return I2C_TIMEOUT;
-	else
-		return I2C_OK;
+
+	return I2C_TIMEOUT;
 }
 
-static int wait_tx_or_err(bool no_stop){
+static int wait_tx_or_err()
+{
 	uint64_t timeout = TIMEOUT_MS * 200;
 	while(timeout--) {
 		if (i2c_err_detect) {
@@ -95,17 +93,12 @@ static int wait_tx_or_err(bool no_stop){
 				return I2C_ERROR_OTHER; // other error
 			}
 		}
-		if (!no_stop) {
-			if (i2c_tx_complete) {
+		if (i2c_tx_complete) {
 			return I2C_OK;
-			}
 		}
 		delayMicroseconds(10);
 	}
-	if (!no_stop)
-		return I2C_TIMEOUT;
-	else
-		return I2C_OK;
+	return I2C_TIMEOUT;
 }
 
 static int wait_dev_ready(I2C_CONTROLLER controller_id, bool no_stop){
@@ -116,9 +109,13 @@ static int wait_dev_ready(I2C_CONTROLLER controller_id, bool no_stop){
 		if (ret == I2C_OK) {
 			return I2C_OK;
 		}
-		if (ret == I2C_BUSY) {
+		else if (ret == I2C_BUSY) {
 			delayMicroseconds(10);
 		}
+		else
+		{
+			return I2C_TIMEOUT - ret;
+		}
 	}
 	return I2C_TIMEOUT - ret;
 }
@@ -202,7 +199,7 @@ int i2c_writebytes(uint8_t *bytes, uint8_t length, bool no_stop)
 	i2c_err_detect = 0;
 	i2c_err_source = 0;
 	ss_i2c_transfer(I2C_SENSING_0, bytes, length, 0, 0, i2c_slave, no_stop);
-	ret = wait_tx_or_err(no_stop);
+	ret = wait_tx_or_err();
 	if (ret)
 		return ret;
 	ret = wait_dev_ready(I2C_SENSING_0, no_stop);
@@ -219,7 +216,7 @@ int i2c_readbytes(uint8_t *buf, int length, bool no_stop)
 	i2c_err_detect = 0;
 	i2c_err_source = 0;
 	ss_i2c_transfer(I2C_SENSING_0, 0, 0, buf, length, i2c_slave, no_stop);
-	ret = wait_rx_or_err(no_stop);
+	ret = wait_rx_or_err();
 	if (ret)
 		return ret;
 	ret = wait_dev_ready(I2C_SENSING_0, no_stop);

cores/arduino/printk.cpp

@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2015, Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdarg.h>
+#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;
+
+    char tmp[PRINTK_BUFSIZ];
+
+    len = __vsnprintf(tmp, PRINTK_BUFSIZ, fmt, args);
+    
+    tmp[len] = '\0';
+    Serial1.println(tmp);
+#endif
+}

libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino

@@ -45,7 +45,7 @@ void setup() {
 
 void loop() {
   // listen for BLE peripherals to connect:
-  BLECentral central = blePeripheral.central();
+  BLECentralHelper central = blePeripheral.central();
 
   // if a central is connected to peripheral:
   if (central) {