Explicitely used mbed namespace where needed

Author: facchinm

cores/arduino/Arduino.h

@@ -27,17 +27,14 @@ inline void NVIC_SystemReset() {}
 
 #ifdef __cplusplus
 #define PinMode MbedPinMode
-#define Stream MbedStream
 #include "mbed.h"
 #undef PinMode
-#undef Stream
 #endif
 
-#define PinMode ArduinoPinMode
-#define Stream ArduinoStream
 #include "api/ArduinoAPI.h"
 
 #ifdef __cplusplus
+using namespace arduino;
 extern "C"{
 #endif
 

cores/arduino/Interrupts.cpp

@@ -19,11 +19,11 @@
 #include "Arduino.h"
 
 void attachInterruptParam(pin_size_t interruptNum, voidFuncPtrParam func, PinStatus mode, void* param) {
-  InterruptIn* irq = new InterruptIn((PinName)interruptNum);
+  mbed::InterruptIn* irq = new mbed::InterruptIn((PinName)interruptNum);
   if (mode == FALLING) {
-    irq->fall(callback(func, param));
+    irq->fall(mbed::callback(func, param));
   } else {
-    irq->rise(callback(func, param));
+    irq->rise(mbed::callback(func, param));
   }
 }
 

cores/arduino/mbed/mbed.h

@@ -102,7 +102,6 @@
 #include "platform/FunctionPointer.h"
 #include "platform/ScopedLock.h"
 
-using namespace mbed;
 using namespace std;
 
 #endif

cores/arduino/wiring_digital.cpp

@@ -27,27 +27,27 @@ void pinMode(uint8_t pin, PinMode mode)
 {
   switch (mode) {
     case INPUT:
-      DigitalIn((PinName)pin).mode(PullNone);
+      mbed::DigitalIn((PinName)pin).mode(PullNone);
       break;
     case OUTPUT:
-      DigitalOut((PinName)pin);
+      mbed::DigitalOut((PinName)pin);
       break;
     case INPUT_PULLUP:
-      DigitalIn((PinName)pin).mode(PullUp);
+      mbed::DigitalIn((PinName)pin).mode(PullUp);
       break;
     case INPUT_PULLDOWN:
-      DigitalIn((PinName)pin).mode(PullDown);
+      mbed::DigitalIn((PinName)pin).mode(PullDown);
       break;
   }
 }
 
 
 void digitalWrite(uint8_t pin, PinStatus val)
 {
-	DigitalOut((PinName)pin).write((int)val);
+	mbed::DigitalOut((PinName)pin).write((int)val);
 }
 
 PinStatus digitalRead(uint8_t pin)
 {
-	return (PinStatus)DigitalIn((PinName)pin).read();
+	return (PinStatus)mbed::DigitalIn((PinName)pin).read();
 }

cores/arduino/wiring_shift.c renamed to cores/arduino/wiring_shift.cpp

@@ -22,7 +22,7 @@
 
 #include <Arduino.h>
 
-uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, BitOrder bitOrder) {
+uint8_t shiftIn(pin_size_t dataPin, uint8_t clockPin, BitOrder bitOrder) {
 	uint8_t value = 0;
 	uint8_t i;
 
@@ -37,15 +37,15 @@ uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, BitOrder bitOrder) {
 	return value;
 }
 
-void shiftOut(uint8_t dataPin, uint8_t clockPin, BitOrder bitOrder, uint8_t val)
+void shiftOut(pin_size_t dataPin, uint8_t clockPin, BitOrder bitOrder, uint8_t val)
 {
 	uint8_t i;
 
 	for (i = 0; i < 8; i++)  {
 		if (bitOrder == LSBFIRST)
-			digitalWrite(dataPin, !!(val & (1 << i)));
+			digitalWrite(dataPin, !!(val & (1 << i)) ? HIGH : LOW);
 		else	
-			digitalWrite(dataPin, !!(val & (1 << (7 - i))));
+			digitalWrite(dataPin, !!(val & (1 << (7 - i))) ? HIGH : LOW);
 
 		digitalWrite(clockPin, HIGH);
 		digitalWrite(clockPin, LOW);		

mbed-os-to-arduino

@@ -11,6 +11,7 @@ cat $BOARDNAME.macros.txt | cut -f2 -d":" > $ARDUINOCORE/defines.txt
 xargs -n 1 < ./BUILD/$BOARDNAME/GCC_ARM/.include* | sed -e 's#./mbed-os#{build.core.path}/mbed#g' | sed -e 's#-I/.*$##' | tac  > $ARDUINOCORE/includes.txt
 
 #TODO: remove -MDD from flags
+#TODO: remove "using namespace mbed" from mbed.h
 
 gron ./BUILD/$BOARDNAME/GCC_ARM/.profile-c | grep json.flags | cut -f2 -d"\"" > $ARDUINOCORE/cflags.txt
 gron ./BUILD/$BOARDNAME/GCC_ARM/.profile-cxx | grep json.flags | cut -f2 -d"\"" > $ARDUINOCORE/cxxflags.txt