Merge remote-tracking branch 'upstream/master'

Author: sgbihu

cores/arduino/Arduino.h

@@ -43,6 +43,8 @@ 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 */

libraries/CurieIMU/src/CurieIMU.cpp

@@ -57,6 +57,11 @@ bool CurieIMUClass::begin()
     return (CURIE_IMU_CHIP_ID == getDeviceID());
 }
 
+void CurieIMUClass::end()
+{
+    ss_spi_disable();
+}
+
 int CurieIMUClass::getGyroRate()
 {
     int rate;

libraries/CurieIMU/src/CurieIMU.h

@@ -95,6 +95,7 @@ class CurieIMUClass : public BMI160Class {
 
     public:
         bool begin(void);
+        void end(void);
 
         // supported values: 25, 50, 100, 200, 400, 800, 1600, 3200 (Hz)
         int getGyroRate();

libraries/CurieIMU/src/internal/ss_spi.c

@@ -73,6 +73,12 @@ void ss_spi_init()
     SS_SPI_REG_WRITE(INTR_MASK, SPI_DISABLE_INT);
 }
 
+void ss_spi_disable()
+{
+    /* gate SPI controller clock */
+    SS_SPI_REG_WRITE(CTRL, 0);
+}
+
 static inline
 void spi_transmit(uint8_t *buf, size_t count, boolean_t waitCompletion) {
     while (count--)

libraries/CurieIMU/src/internal/ss_spi.h

@@ -25,6 +25,7 @@ extern "C" {
 #endif
 
 void ss_spi_init();
+void ss_spi_disable();
 int ss_spi_xfer(uint8_t *buf, unsigned tx_cnt, unsigned rx_cnt);
 
 #ifdef __cplusplus

libraries/Wire/examples/master_reader/master_reader.ino

@@ -15,7 +15,7 @@
 void setup()
 {
   Wire.begin();        // join i2c bus (address optional for master)
-  Serial1.begin(9600);  // start serial for output
+  Serial.begin(9600);  // start serial for output
 }
 
 void loop()
@@ -25,8 +25,8 @@ void loop()
   while (Wire.available())   // slave may send less than requested
   {
     char c = Wire.read(); // receive a byte as character
-    Serial1.print(c); // print the character
-    Serial1.println();
+    Serial.print(c); // print the character
+    Serial.println();
 
   }
 

libraries/Wire/examples/master_writer/master_writer.ino

@@ -15,7 +15,7 @@
 void setup()
 {
   Wire.begin(); // join i2c bus (address optional for master)
-  Serial1.begin(9600);
+  Serial.begin(9600);
 }
 
 byte x = 1;
@@ -26,9 +26,9 @@ void loop()
   //Wire.write("x is ");        // sends five bytes
   Wire.write(x);              // sends one byte
   int result = Wire.endTransmission();    // stop transmitting
-  Serial1.println();
-  Serial1.print("x =  ");
-  Serial1.print(x);
+  Serial.println();
+  Serial.print("x =  ");
+  Serial.print(x);
   x++;
   delay(500);
 }