create ArduinoPlatform to reduce code duplication

src/arduino_platform.cpp

@@ -0,0 +1,260 @@
+#include "arduino_platform.h"
+#include <knx/bits.h>
+
+#include <Arduino.h>
+
+Stream& ArduinoPlatform::SerialDebug = Serial;
+
+ArduinoPlatform::ArduinoPlatform(HardwareSerial& knxSerial) : _knxSerial(knxSerial)
+{
+}
+
+uint32_t ArduinoPlatform::currentIpAddress()
+{
+    // not needed
+    return 0;
+}
+
+uint32_t ArduinoPlatform::currentSubnetMask()
+{
+    // not needed
+    return 0;
+}
+
+uint32_t ArduinoPlatform::currentDefaultGateway()
+{
+    // not needed
+    return 0;
+}
+
+void ArduinoPlatform::macAddress(uint8_t * addr)
+{
+    // not needed
+}
+
+
+void ArduinoPlatform::fatalError()
+{
+    const int period = 200;
+    while (true)
+    {
+#ifdef LED_BUILTIN
+        if ((millis() % period) > (period / 2))
+            digitalWrite(LED_BUILTIN, HIGH);
+        else
+            digitalWrite(LED_BUILTIN, LOW);
+#endif
+    }
+}
+
+void ArduinoPlatform::setupMultiCast(uint32_t addr, uint16_t port)
+{
+    //not needed
+}
+
+void ArduinoPlatform::closeMultiCast()
+{
+    //not needed
+}
+
+bool ArduinoPlatform::sendBytes(uint8_t * buffer, uint16_t len)
+{
+    //not needed
+}
+
+int ArduinoPlatform::readBytes(uint8_t * buffer, uint16_t maxLen)
+{
+    //not needed
+    return 0;
+}
+
+void ArduinoPlatform::setupUart()
+{
+    _knxSerial.begin(19200, SERIAL_8E1);
+    while (!_knxSerial) 
+        ;
+}
+
+
+void ArduinoPlatform::closeUart()
+{
+    _knxSerial.end();
+}
+
+
+int ArduinoPlatform::uartAvailable()
+{
+    return _knxSerial.available();
+}
+
+
+size_t ArduinoPlatform::writeUart(const uint8_t data)
+{
+    //printHex("<p", &data, 1);
+    return _knxSerial.write(data);
+}
+
+
+size_t ArduinoPlatform::writeUart(const uint8_t *buffer, size_t size)
+{
+    //printHex("<p", buffer, size);
+    return _knxSerial.write(buffer, size);
+}
+
+
+int ArduinoPlatform::readUart()
+{
+    int val = _knxSerial.read();
+    //if(val > 0)
+    //    printHex("p>", (uint8_t*)&val, 1);
+    return val;
+}
+
+
+size_t ArduinoPlatform::readBytesUart(uint8_t *buffer, size_t length)
+{
+    size_t toRead = length;
+    uint8_t* pos = buffer;
+    while (toRead > 0)
+    {
+        size_t val = _knxSerial.readBytes(pos, toRead);
+        pos += val;
+        toRead -= val;
+    }
+    //printHex("p>", buffer, length);
+    return length;
+}
+
+void print(const char* s)
+{
+    ArduinoPlatform::SerialDebug.print(s);
+}
+void print(char c)
+{
+    ArduinoPlatform::SerialDebug.print(c);
+}
+
+void print(unsigned char num)
+{
+    ArduinoPlatform::SerialDebug.print(num);
+}
+
+void print(unsigned char num, int base)
+{
+    ArduinoPlatform::SerialDebug.print(num, base);
+}
+
+void print(int num)
+{
+    ArduinoPlatform::SerialDebug.print(num);
+}
+
+void print(int num, int base)
+{
+    ArduinoPlatform::SerialDebug.print(num, base);
+}
+
+void print(unsigned int num)
+{
+    ArduinoPlatform::SerialDebug.print(num);
+}
+
+void print(unsigned int num, int base)
+{
+    ArduinoPlatform::SerialDebug.print(num, base);
+}
+
+void print(long num)
+{
+    ArduinoPlatform::SerialDebug.print(num);
+}
+
+void print(long num, int base)
+{
+    ArduinoPlatform::SerialDebug.print(num, base);
+}
+
+void print(unsigned long num)
+{
+    ArduinoPlatform::SerialDebug.print(num);
+}
+
+void print(unsigned long num, int base)
+{
+    ArduinoPlatform::SerialDebug.print(num, base);
+}
+
+void print(double num)
+{
+    ArduinoPlatform::SerialDebug.print(num);
+}
+
+void println(const char* s)
+{
+    ArduinoPlatform::SerialDebug.println(s);
+}
+
+void println(char c)
+{
+    ArduinoPlatform::SerialDebug.println(c);
+}
+
+void println(unsigned char num)
+{
+    ArduinoPlatform::SerialDebug.println(num);
+}
+
+void println(unsigned char num, int base)
+{
+    ArduinoPlatform::SerialDebug.println(num, base);
+}
+
+void println(int num)
+{
+    ArduinoPlatform::SerialDebug.println(num);
+}
+
+void println(int num, int base)
+{
+    ArduinoPlatform::SerialDebug.println(num, base);
+}
+
+void println(unsigned int num)
+{
+    ArduinoPlatform::SerialDebug.println(num);
+}
+
+void println(unsigned int num, int base)
+{
+    ArduinoPlatform::SerialDebug.println(num, base);
+}
+
+void println(long num)
+{
+    ArduinoPlatform::SerialDebug.println(num);
+}
+
+void println(long num, int base)
+{
+    ArduinoPlatform::SerialDebug.println(num, base);
+}
+
+void println(unsigned long num)
+{
+    ArduinoPlatform::SerialDebug.println(num);
+}
+
+void println(unsigned long num, int base)
+{
+    ArduinoPlatform::SerialDebug.println(num, base);
+}
+
+void println(double num)
+{
+    ArduinoPlatform::SerialDebug.println(num);
+}
+
+void println(void)
+{
+    ArduinoPlatform::SerialDebug.println();
+}

src/arduino_platform.h

@@ -0,0 +1,42 @@
+#include "knx/platform.h"
+
+#include "Arduino.h"
+
+extern Stream& _serialDBG;
+
+class ArduinoPlatform : public Platform
+{
+  public:
+    ArduinoPlatform(HardwareSerial& knxSerial);
+
+    // ip stuff
+    uint32_t currentIpAddress();
+    uint32_t currentSubnetMask();
+    uint32_t currentDefaultGateway();
+    void macAddress(uint8_t* addr);
+
+    // basic stuff
+    void fatalError();
+
+    //multicast
+    void setupMultiCast(uint32_t addr, uint16_t port);
+    void closeMultiCast();
+    bool sendBytes(uint8_t* buffer, uint16_t len);
+    int readBytes(uint8_t* buffer, uint16_t maxLen);
+
+    //uart
+    virtual void setupUart();
+    virtual void closeUart();
+    virtual int uartAvailable();
+    virtual size_t writeUart(const uint8_t data);
+    virtual size_t writeUart(const uint8_t* buffer, size_t size);
+    virtual int readUart();
+    virtual size_t readBytesUart(uint8_t* buffer, size_t length);
+
+    static Stream& SerialDebug;
+
+  protected:
+    uint32_t _mulitcastAddr;
+    uint16_t _mulitcastPort;
+    HardwareSerial& _knxSerial;
+};

src/esp32_platform.cpp

@@ -6,9 +6,8 @@
 
 #include "knx/bits.h"
 
-#define SerialDBG Serial
 
-Esp32Platform::Esp32Platform()
+Esp32Platform::Esp32Platform() : ArduinoPlatform(Serial)
 {
 }
 
@@ -38,21 +37,6 @@ void Esp32Platform::restart()
     ESP.restart();
 }
 
-void Esp32Platform::fatalError()
-{
-    Serial.println("GURU MEDITATION - fatal error!");
-    const int period = 200;
-    while (true)
-    {
-#ifdef LED_BUILTIN
-        if ((millis() % period) > (period / 2))
-            digitalWrite(LED_BUILTIN, HIGH);
-        else
-            digitalWrite(LED_BUILTIN, LOW);
-#endif
-    }
-}
-
 void Esp32Platform::setupMultiCast(uint32_t addr, uint16_t port)
 {
     _mulitcastAddr = htonl(addr);
@@ -108,224 +92,4 @@ void Esp32Platform::commitToEeprom()
     EEPROM.commit();
 }
 
-void Esp32Platform::setupUart()
-{
-    Serial.begin(19200, SERIAL_8E1);
-    while (!Serial) ;
-}
-
-
-void Esp32Platform::closeUart()
-{
-    Serial.end();
-}
-
-
-int Esp32Platform::uartAvailable()
-{
-    return Serial.available();
-}
-
-
-size_t Esp32Platform::writeUart(const uint8_t data)
-{
-    printHex("<p", &data, 1);
-    return Serial.write(data);
-}
-
-
-size_t Esp32Platform::writeUart(const uint8_t *buffer, size_t size)
-{
-    printHex("<p", buffer, size);
-    return Serial.write(buffer, size);
-}
-
-
-int Esp32Platform::readUart()
-{
-    int val = Serial.read();
-    if (val > 0)
-        printHex("p>", (uint8_t*)&val, 1);
-    return val;
-}
-
-
-size_t Esp32Platform::readBytesUart(uint8_t *buffer, size_t length)
-{
-    size_t toRead = length;
-    uint8_t* pos = buffer;
-    while (toRead > 0)
-    {
-        size_t val = Serial.readBytes(pos, toRead);
-        pos += val;
-        toRead -= val;
-    }
-    
-    
-    printHex("p>", buffer, length);
-    return length;
-}
-
-void print(const char* s)
-{
-    Serial.printf("%s", s);
-}
-void print(char c)
-{
-    Serial.printf("%c", c);
-}
-
-void print(unsigned char num)
-{
-    print(num, DEC);
-}
-
-void print(unsigned char num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X", num);
-    else
-        Serial.printf("%d", num);
-}
-
-void print(int num)
-{
-    print(num, DEC);
-}
-
-void print(int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X", num);
-    else
-        Serial.printf("%d", num);
-}
-
-void print(unsigned int num)
-{
-    print(num, DEC);
-}
-
-void print(unsigned int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X", num);
-    else
-        Serial.printf("%d", num);
-}
-
-void print(long num)
-{
-    print(num, DEC);
-}
-
-void print(long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX", num);
-    else
-        Serial.printf("%ld", num);
-}
-
-void print(unsigned long num)
-{
-    print(num, DEC);
-}
-
-void print(unsigned long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX", num);
-    else
-        Serial.printf("%ld", num);
-}
-
-void print(double num)
-{
-    Serial.printf("%f", num);
-}
-
-void println(const char* s)
-{
-    Serial.printf("%s\n", s);
-}
-void println(char c)
-{
-    Serial.printf("%c\n", c);
-}
-
-void println(unsigned char num)
-{
-    println(num, DEC);
-}
-
-void println(unsigned char num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X\n", num);
-    else
-        Serial.printf("%d\n", num);
-}
-
-void println(int num)
-{
-    println(num, DEC);
-}
-
-void println(int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X\n", num);
-    else
-        Serial.printf("%d\n", num);
-}
-
-void println(unsigned int num)
-{
-    println(num, DEC);
-}
-
-void println(unsigned int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X\n", num);
-    else
-        Serial.printf("%d\n", num);
-}
-
-void println(long num)
-{
-    println(num, DEC);
-}
-
-void println(long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX\n", num);
-    else
-        Serial.printf("%ld\n", num);
-}
-
-void println(unsigned long num)
-{
-    println(num, DEC);
-}
-
-void println(unsigned long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX\n", num);
-    else
-        Serial.printf("%ld\n", num);
-}
-
-void println(double num)
-{
-    Serial.printf("%f\n", num);
-}
-
-void println(void)
-{
-    Serial.printf("\n");
-}
-#endif
+#endif

src/esp32_platform.h

@@ -1,47 +1,36 @@
 #ifdef ARDUINO_ARCH_ESP32
-#include "knx/platform.h"
-#include "knx/platform.h"
+#include "arduino_platform.h"
 #include <WiFi.h>
 #include <WiFiUdp.h>
 
 #define SerialDBG Serial
 
-class Esp32Platform : public Platform
+class Esp32Platform : public ArduinoPlatform
 {
+    using ArduinoPlatform::_mulitcastAddr;
+    using ArduinoPlatform::_mulitcastPort;
 public:
     Esp32Platform();
 
     // ip stuff
-    uint32_t currentIpAddress();
-    uint32_t currentSubnetMask();
-    uint32_t currentDefaultGateway();
-    void macAddress(uint8_t* addr);
+    uint32_t currentIpAddress() override;
+    uint32_t currentSubnetMask() override;
+    uint32_t currentDefaultGateway() override;
+    void macAddress(uint8_t* addr) override;
 
     // basic stuff
     void restart();
-    void fatalError();
 
     //multicast
-    void setupMultiCast(uint32_t addr, uint16_t port);
-    void closeMultiCast();
-    bool sendBytes(uint8_t* buffer, uint16_t len);
-    int readBytes(uint8_t* buffer, uint16_t maxLen);
-
-    //uart
-    void setupUart();
-    void closeUart();
-    int uartAvailable();
-    size_t writeUart(const uint8_t data);
-    size_t writeUart(const uint8_t *buffer, size_t size);
-    int readUart();
-    size_t readBytesUart(uint8_t *buffer, size_t length);
+    void setupMultiCast(uint32_t addr, uint16_t port) override;
+    void closeMultiCast() override;
+    bool sendBytes(uint8_t* buffer, uint16_t len) override;
+    int readBytes(uint8_t* buffer, uint16_t maxLen) override;
     
     //memory
     uint8_t* getEepromBuffer(uint16_t size);
     void commitToEeprom();
 private:
-    uint32_t _mulitcastAddr;
-    uint16_t _mulitcastPort;
     WiFiUDP _udp;
 };
 

src/esp_platform.cpp

@@ -7,7 +7,7 @@
 
 #include "knx/bits.h"
 
-EspPlatform::EspPlatform()
+EspPlatform::EspPlatform() : ArduinoPlatform(Serial)
 {
 }
 
@@ -37,18 +37,6 @@ void EspPlatform::restart()
     ESP.reset();
 }
 
-void EspPlatform::fatalError()
-{
-    const int period = 200;
-    while (true)
-    {
-        if ((millis() % period) > (period / 2))
-            digitalWrite(LED_BUILTIN, HIGH);
-        else
-            digitalWrite(LED_BUILTIN, LOW);
-    }
-}
-
 void EspPlatform::setupMultiCast(uint32_t addr, uint16_t port)
 {
     _mulitcastAddr = htonl(addr);
@@ -103,225 +91,4 @@ void EspPlatform::commitToEeprom()
 {
     EEPROM.commit();
 }
-
-void EspPlatform::setupUart()
-{
-    Serial.begin(19200, SERIAL_8E1);
-    while (!Serial) ;
-}
-
-
-void EspPlatform::closeUart()
-{
-    Serial.end();
-}
-
-
-int EspPlatform::uartAvailable()
-{
-    return Serial.available();
-}
-
-
-size_t EspPlatform::writeUart(const uint8_t data)
-{
-    printHex("<p", &data, 1);
-    return Serial.write(data);
-}
-
-
-size_t EspPlatform::writeUart(const uint8_t *buffer, size_t size)
-{
-    printHex("<p", buffer, size);
-    return Serial.write(buffer, size);
-}
-
-
-int EspPlatform::readUart()
-{
-    int val = Serial.read();
-    if (val > 0)
-        printHex("p>", (uint8_t*)&val, 1);
-    return val;
-}
-
-
-size_t EspPlatform::readBytesUart(uint8_t *buffer, size_t length)
-{
-    size_t toRead = length;
-    uint8_t* pos = buffer;
-    while (toRead > 0)
-    {
-        size_t val = Serial.readBytes(pos, toRead);
-        pos += val;
-        toRead -= val;
-    }
-    
-    
-    printHex("p>", buffer, length);
-    return length;
-}
-
-void print(const char* s)
-{
-    Serial.printf("%s", s);
-}
-void print(char c)
-{
-    Serial.printf("%c", c);
-}
-
-void print(unsigned char num)
-{
-    print(num, DEC);
-}
-
-void print(unsigned char num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X", num);
-    else
-        Serial.printf("%d", num);
-}
-
-void print(int num)
-{
-    print(num, DEC);
-}
-
-void print(int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X", num);
-    else
-        Serial.printf("%d", num);
-}
-
-void print(unsigned int num)
-{
-    print(num, DEC);
-}
-
-void print(unsigned int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X", num);
-    else
-        Serial.printf("%d", num);
-}
-
-void print(long num)
-{
-    print(num, DEC);
-}
-
-void print(long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX", num);
-    else
-        Serial.printf("%ld", num);
-}
-
-void print(unsigned long num)
-{
-    print(num, DEC);
-}
-
-void print(unsigned long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX", num);
-    else
-        Serial.printf("%ld", num);
-}
-
-void print(double num)
-{
-    Serial.printf("%f", num);
-}
-
-void println(const char* s)
-{
-    Serial.printf("%s\n", s);
-}
-void println(char c)
-{
-    Serial.printf("%c\n", c);
-}
-
-void println(unsigned char num)
-{
-    println(num, DEC);
-}
-
-void println(unsigned char num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X\n", num);
-    else
-        Serial.printf("%d\n", num);
-}
-
-void println(int num)
-{
-    println(num, DEC);
-}
-
-void println(int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X\n", num);
-    else
-        Serial.printf("%d\n", num);
-}
-
-void println(unsigned int num)
-{
-    println(num, DEC);
-}
-
-void println(unsigned int num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%X\n", num);
-    else
-        Serial.printf("%d\n", num);
-}
-
-void println(long num)
-{
-    println(num, DEC);
-}
-
-void println(long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX\n", num);
-    else
-        Serial.printf("%ld\n", num);
-}
-
-void println(unsigned long num)
-{
-    println(num, DEC);
-}
-
-void println(unsigned long num, int base)
-{
-    if (base == HEX)
-        Serial.printf("%lX\n", num);
-    else
-        Serial.printf("%ld\n", num);
-}
-
-void println(double num)
-{
-    Serial.printf("%f\n", num);
-}
-
-void println(void)
-{
-    Serial.printf("\n");
-}
 #endif

src/esp_platform.h

@@ -1,46 +1,37 @@
 #ifdef ARDUINO_ARCH_ESP8266
-#include "knx/platform.h"
+#include "arduino_platform.h"
 #include <ESP8266WiFi.h>
 #include <WiFiUdp.h>
 
 #define SerialDBG Serial
 
-class EspPlatform : public Platform
+class EspPlatform : public ArduinoPlatform
 {
-public:
+    using ArduinoPlatform::_mulitcastAddr;
+    using ArduinoPlatform::_mulitcastPort;
+
+  public:
     EspPlatform();
 
     // ip stuff
-    uint32_t currentIpAddress();
-    uint32_t currentSubnetMask();
-    uint32_t currentDefaultGateway();
-    void macAddress(uint8_t* addr);
+    uint32_t currentIpAddress() override;
+    uint32_t currentSubnetMask() override;
+    uint32_t currentDefaultGateway() override;
+    void macAddress(uint8_t* addr) override;
 
     // basic stuff
     void restart();
-    void fatalError();
 
     //multicast
-    void setupMultiCast(uint32_t addr, uint16_t port);
-    void closeMultiCast();
-    bool sendBytes(uint8_t* buffer, uint16_t len);
-    int readBytes(uint8_t* buffer, uint16_t maxLen);
-
-    //uart
-    void setupUart();
-    void closeUart();
-    int uartAvailable();
-    size_t writeUart(const uint8_t data);
-    size_t writeUart(const uint8_t *buffer, size_t size);
-    int readUart();
-    size_t readBytesUart(uint8_t *buffer, size_t length);
-    
+    void setupMultiCast(uint32_t addr, uint16_t port) override;
+    void closeMultiCast() override;
+    bool sendBytes(uint8_t* buffer, uint16_t len) override;
+    int readBytes(uint8_t* buffer, uint16_t maxLen) override;
+   
     //memory
     uint8_t* getEepromBuffer(uint16_t size);
     void commitToEeprom();
 private:
-    uint32_t _mulitcastAddr;
-    uint16_t _mulitcastPort;
     WiFiUDP _udp;
 };
 

src/samd_platform.cpp

@@ -6,72 +6,16 @@
 #include <Arduino.h>
 #include <FlashAsEEPROM.h>
 
-SamdPlatform::SamdPlatform()
+SamdPlatform::SamdPlatform() : ArduinoPlatform(Serial1)
 {
 }
 
-uint32_t SamdPlatform::currentIpAddress()
-{
-    // not needed
-    return 0;
-}
-
-uint32_t SamdPlatform::currentSubnetMask()
-{
-    // not needed
-    return 0;
-}
-
-uint32_t SamdPlatform::currentDefaultGateway()
-{
-    // not needed
-    return 0;
-}
-
-void SamdPlatform::macAddress(uint8_t * addr)
-{
-    // not needed
-}
-
 void SamdPlatform::restart()
 {
     SerialDBG.println("restart");
     NVIC_SystemReset();
 }
 
-void SamdPlatform::fatalError()
-{
-    const int period = 200;
-    while (true)
-    {
-        if ((millis() % period) > (period / 2))
-            digitalWrite(LED_BUILTIN, HIGH);
-        else
-            digitalWrite(LED_BUILTIN, LOW);
-    }
-}
-
-void SamdPlatform::setupMultiCast(uint32_t addr, uint16_t port)
-{
-    //not needed
-}
-
-void SamdPlatform::closeMultiCast()
-{
-    //not needed
-}
-
-bool SamdPlatform::sendBytes(uint8_t * buffer, uint16_t len)
-{
-    //not needed
-}
-
-int SamdPlatform::readBytes(uint8_t * buffer, uint16_t maxLen)
-{
-    //not needed
-    return 0;
-}
-
 uint8_t * SamdPlatform::getEepromBuffer(uint16_t size)
 {
     //EEPROM.begin(size);
@@ -85,196 +29,6 @@ void SamdPlatform::commitToEeprom()
 {
     EEPROM.commit();
 }
+#endif
 
 
-void SamdPlatform::setupUart()
-{
-    SerialKNX.begin(19200, SERIAL_8E1);
-    while (!SerialKNX) 
-        ;
-}
-
-
-void SamdPlatform::closeUart()
-{
-    SerialKNX.end();
-}
-
-
-int SamdPlatform::uartAvailable()
-{
-    return SerialKNX.available();
-}
-
-
-size_t SamdPlatform::writeUart(const uint8_t data)
-{
-    //printHex("<p", &data, 1);
-    return SerialKNX.write(data);
-}
-
-
-size_t SamdPlatform::writeUart(const uint8_t *buffer, size_t size)
-{
-    //printHex("<p", buffer, size);
-    return SerialKNX.write(buffer, size);
-}
-
-
-int SamdPlatform::readUart()
-{
-    int val = SerialKNX.read();
-    //if(val > 0)
-    //    printHex("p>", (uint8_t*)&val, 1);
-    return val;
-}
-
-
-size_t SamdPlatform::readBytesUart(uint8_t *buffer, size_t length)
-{
-    size_t toRead = length;
-    uint8_t* pos = buffer;
-    while (toRead > 0)
-    {
-        size_t val = SerialKNX.readBytes(pos, toRead);
-        pos += val;
-        toRead -= val;
-    }
-    //printHex("p>", buffer, length);
-    return length;
-}
-
-void print(const char* s)
-{
-    SerialDBG.print(s);
-}
-void print(char c)
-{
-    SerialDBG.print(c);
-}
-
-void print(unsigned char num)
-{
-    SerialDBG.print(num);
-}
-
-void print(unsigned char num, int base)
-{
-    SerialDBG.print(num, base);
-}
-
-void print(int num)
-{
-    SerialDBG.print(num);
-}
-
-void print(int num, int base)
-{
-    SerialDBG.print(num, base);
-}
-
-void print(unsigned int num)
-{
-    SerialDBG.print(num);
-}
-
-void print(unsigned int num, int base)
-{
-    SerialDBG.print(num, base);
-}
-
-void print(long num)
-{
-    SerialDBG.print(num);
-}
-
-void print(long num, int base)
-{
-    SerialDBG.print(num, base);
-}
-
-void print(unsigned long num)
-{
-    SerialDBG.print(num);
-}
-
-void print(unsigned long num, int base)
-{
-    SerialDBG.print(num, base);
-}
-
-void print(double num)
-{
-    SerialDBG.print(num);
-}
-
-void println(const char* s)
-{
-    SerialDBG.println(s);
-}
-
-void println(char c)
-{
-    SerialDBG.println(c);
-}
-
-void println(unsigned char num)
-{
-    SerialDBG.println(num);
-}
-
-void println(unsigned char num, int base)
-{
-    SerialDBG.println(num, base);
-}
-
-void println(int num)
-{
-    SerialDBG.println(num);
-}
-
-void println(int num, int base)
-{
-    SerialDBG.println(num, base);
-}
-
-void println(unsigned int num)
-{
-    SerialDBG.println(num);
-}
-
-void println(unsigned int num, int base)
-{
-    SerialDBG.println(num, base);
-}
-
-void println(long num)
-{
-    SerialDBG.println(num);
-}
-
-void println(long num, int base)
-{
-    SerialDBG.println(num, base);
-}
-
-void println(unsigned long num)
-{
-    SerialDBG.println(num);
-}
-
-void println(unsigned long num, int base)
-{
-    SerialDBG.println(num, base);
-}
-
-void println(double num)
-{
-    SerialDBG.println(num);
-}
-
-void println(void)
-{
-    SerialDBG.println();
-}
-#endif

src/samd_platform.h

@@ -1,48 +1,19 @@
-#include "knx/platform.h"
+#include "arduino_platform.h"
 
 #include "Arduino.h"
 
 #ifdef ARDUINO_ARCH_SAMD
 
 #define SerialDBG SerialUSB
-#define SerialKNX Serial1
 
-class SamdPlatform : public Platform
+class SamdPlatform : public ArduinoPlatform
 {
 public:
     SamdPlatform();
 
-    // ip stuff
-    uint32_t currentIpAddress();
-    uint32_t currentSubnetMask();
-    uint32_t currentDefaultGateway();
-    void macAddress(uint8_t* addr);
-
-    // basic stuff
     void restart();
-    void fatalError();
-
-    //multicast
-    void setupMultiCast(uint32_t addr, uint16_t port);
-    void closeMultiCast();
-    bool sendBytes(uint8_t* buffer, uint16_t len);
-    int readBytes(uint8_t* buffer, uint16_t maxLen);
-    
-    //uart
-    virtual void setupUart();
-    virtual void closeUart();
-    virtual int uartAvailable();
-    virtual size_t writeUart(const uint8_t data);
-    virtual size_t writeUart(const uint8_t *buffer, size_t size);
-    virtual int readUart();
-    virtual size_t readBytesUart(uint8_t *buffer, size_t length);
-
-    //memory
     uint8_t* getEepromBuffer(uint16_t size);
     void commitToEeprom();
-private:
-    uint32_t _mulitcastAddr;
-    uint16_t _mulitcastPort;
 };
 
 #endif