Port Wire to namespaced API

Author: facchinm

libraries/Wire/Wire.cpp

@@ -26,6 +26,8 @@ extern "C" {
 
 #include "Wire.h"
 
+using namespace arduino;
+
 TwoWire::TwoWire(SERCOM * s, uint8_t pinSDA, uint8_t pinSCL)
 {
   this->sercom = s;
@@ -288,47 +290,47 @@ void TwoWire::onService(void)
     #define PERIPH_WIRE          sercom3
     #define WIRE_IT_HANDLER      SERCOM3_Handler
   #endif // PERIPH_WIRE
-  TwoWire Wire(&PERIPH_WIRE, PIN_WIRE_SDA, PIN_WIRE_SCL);
+  arduino::TwoWire Wire(&PERIPH_WIRE, PIN_WIRE_SDA, PIN_WIRE_SCL);
 
   void WIRE_IT_HANDLER(void) {
     Wire.onService();
   }
 #endif
 
 #if WIRE_INTERFACES_COUNT > 1
-  TwoWire Wire1(&PERIPH_WIRE1, PIN_WIRE1_SDA, PIN_WIRE1_SCL);
+  arduino::TwoWire Wire1(&PERIPH_WIRE1, PIN_WIRE1_SDA, PIN_WIRE1_SCL);
 
   void WIRE1_IT_HANDLER(void) {
     Wire1.onService();
   }
 #endif
 
 #if WIRE_INTERFACES_COUNT > 2
-  TwoWire Wire2(&PERIPH_WIRE2, PIN_WIRE2_SDA, PIN_WIRE2_SCL);
+  arduino::TwoWire Wire2(&PERIPH_WIRE2, PIN_WIRE2_SDA, PIN_WIRE2_SCL);
 
   void WIRE2_IT_HANDLER(void) {
     Wire2.onService();
   }
 #endif
 
 #if WIRE_INTERFACES_COUNT > 3
-  TwoWire Wire3(&PERIPH_WIRE3, PIN_WIRE3_SDA, PIN_WIRE3_SCL);
+  arduino::TwoWire Wire3(&PERIPH_WIRE3, PIN_WIRE3_SDA, PIN_WIRE3_SCL);
 
   void WIRE3_IT_HANDLER(void) {
     Wire3.onService();
   }
 #endif
 
 #if WIRE_INTERFACES_COUNT > 4
-  TwoWire Wire4(&PERIPH_WIRE4, PIN_WIRE4_SDA, PIN_WIRE4_SCL);
+  arduino::TwoWire Wire4(&PERIPH_WIRE4, PIN_WIRE4_SDA, PIN_WIRE4_SCL);
 
   void WIRE4_IT_HANDLER(void) {
     Wire4.onService();
   }
 #endif
 
 #if WIRE_INTERFACES_COUNT > 5
-  TwoWire Wire5(&PERIPH_WIRE5, PIN_WIRE5_SDA, PIN_WIRE5_SCL);
+  arduino::TwoWire Wire5(&PERIPH_WIRE5, PIN_WIRE5_SDA, PIN_WIRE5_SCL);
 
   void WIRE5_IT_HANDLER(void) {
     Wire5.onService();

libraries/Wire/Wire.h

@@ -27,12 +27,17 @@
  // WIRE_HAS_END means Wire has end()
 #define WIRE_HAS_END 1
 
+namespace arduino {
+
 class TwoWire : public HardwareI2C
 {
   public:
     TwoWire(SERCOM *s, uint8_t pinSDA, uint8_t pinSCL);
     void begin();
-    void begin(uint8_t, bool enableGeneralCall = false);
+    void begin(uint8_t address, bool enableGeneralCall);
+    void begin(uint8_t address) {
+        begin(address, false);
+    }
     void end();
     void setClock(uint32_t);
 
@@ -69,10 +74,10 @@ class TwoWire : public HardwareI2C
     bool transmissionBegun;
 
     // RX Buffer
-    RingBufferN<256> rxBuffer;
+    arduino::RingBufferN<256> rxBuffer;
 
     //TX buffer
-    RingBufferN<256> txBuffer;
+    arduino::RingBufferN<256> txBuffer;
     uint8_t txAddress;
 
     // Callback user functions
@@ -83,23 +88,25 @@ class TwoWire : public HardwareI2C
     static const uint32_t TWI_CLOCK = 100000;
 };
 
+}
+
 #if WIRE_INTERFACES_COUNT > 0
-  extern TwoWire Wire;
+  extern arduino::TwoWire Wire;
 #endif
 #if WIRE_INTERFACES_COUNT > 1
-  extern TwoWire Wire1;
+  extern arduino::TwoWire Wire1;
 #endif
 #if WIRE_INTERFACES_COUNT > 2
-  extern TwoWire Wire2;
+  extern arduino::TwoWire Wire2;
 #endif
 #if WIRE_INTERFACES_COUNT > 3
-  extern TwoWire Wire3;
+  extern arduino::TwoWire Wire3;
 #endif
 #if WIRE_INTERFACES_COUNT > 4
-  extern TwoWire Wire4;
+  extern arduino::TwoWire Wire4;
 #endif
 #if WIRE_INTERFACES_COUNT > 5
-  extern TwoWire Wire5;
+  extern arduino::TwoWire Wire5;
 #endif
 
 #endif