Merge pull request #8 from thelsing/master

Update fork

examples/knx-bme680/knx-bme680.ino

@@ -43,7 +43,7 @@ bool trigger = false;
 void setup(void)
 {
     Serial.begin(115200);
-    ArduinoPlatform::SerialDebug = Serial;
+    ArduinoPlatform::SerialDebug = &Serial;
     delay(5000);
     Serial.println("start");
 

examples/knx-demo/knx-demo.ino

@@ -55,7 +55,7 @@ void resetCallback(GroupObject& go)
 void setup()
 {
     Serial.begin(115200);
-    ArduinoPlatform::SerialDebug = Serial;
+    ArduinoPlatform::SerialDebug = &Serial;
 
     randomSeed(millis());
 

examples/knx-hdc1008/knx-hdc1008.ino

@@ -22,7 +22,7 @@ uint32_t cyclSend = 0;
 void setup(void)
 {
     Serial.begin(115200);
-    ArduinoPlatform::SerialDebug = Serial;
+    ArduinoPlatform::SerialDebug = &Serial;
     delay(5000);
     Serial.println("start");
 

examples/knx-sonoffS20/knx-sonoffS20.ino

@@ -25,7 +25,7 @@ void switchCallback(GroupObject& go)
 void setup()
 {
     Serial.begin(115200);
-    ArduinoPlatform::SerialDebug = Serial;
+    ArduinoPlatform::SerialDebug = &Serial;
 
 #ifdef ARDUINO_ARCH_ESP8266
     WiFiManager wifiManager;    

src/arduino_platform.cpp

@@ -3,7 +3,7 @@
 
 #include <Arduino.h>
 
-Stream& ArduinoPlatform::SerialDebug = Serial;
+Stream* ArduinoPlatform::SerialDebug = &Serial;
 
 ArduinoPlatform::ArduinoPlatform(HardwareSerial* knxSerial) : _knxSerial(knxSerial)
 {
@@ -139,134 +139,134 @@ size_t ArduinoPlatform::readBytesUart(uint8_t *buffer, size_t length)
 
 void print(const char* s)
 {
-    ArduinoPlatform::SerialDebug.print(s);
+    ArduinoPlatform::SerialDebug->print(s);
 }
 void print(char c)
 {
-    ArduinoPlatform::SerialDebug.print(c);
+    ArduinoPlatform::SerialDebug->print(c);
 }
 
 void print(unsigned char num)
 {
-    ArduinoPlatform::SerialDebug.print(num);
+    ArduinoPlatform::SerialDebug->print(num);
 }
 
 void print(unsigned char num, int base)
 {
-    ArduinoPlatform::SerialDebug.print(num, base);
+    ArduinoPlatform::SerialDebug->print(num, base);
 }
 
 void print(int num)
 {
-    ArduinoPlatform::SerialDebug.print(num);
+    ArduinoPlatform::SerialDebug->print(num);
 }
 
 void print(int num, int base)
 {
-    ArduinoPlatform::SerialDebug.print(num, base);
+    ArduinoPlatform::SerialDebug->print(num, base);
 }
 
 void print(unsigned int num)
 {
-    ArduinoPlatform::SerialDebug.print(num);
+    ArduinoPlatform::SerialDebug->print(num);
 }
 
 void print(unsigned int num, int base)
 {
-    ArduinoPlatform::SerialDebug.print(num, base);
+    ArduinoPlatform::SerialDebug->print(num, base);
 }
 
 void print(long num)
 {
-    ArduinoPlatform::SerialDebug.print(num);
+    ArduinoPlatform::SerialDebug->print(num);
 }
 
 void print(long num, int base)
 {
-    ArduinoPlatform::SerialDebug.print(num, base);
+    ArduinoPlatform::SerialDebug->print(num, base);
 }
 
 void print(unsigned long num)
 {
-    ArduinoPlatform::SerialDebug.print(num);
+    ArduinoPlatform::SerialDebug->print(num);
 }
 
 void print(unsigned long num, int base)
 {
-    ArduinoPlatform::SerialDebug.print(num, base);
+    ArduinoPlatform::SerialDebug->print(num, base);
 }
 
 void print(double num)
 {
-    ArduinoPlatform::SerialDebug.print(num);
+    ArduinoPlatform::SerialDebug->print(num);
 }
 
 void println(const char* s)
 {
-    ArduinoPlatform::SerialDebug.println(s);
+    ArduinoPlatform::SerialDebug->println(s);
 }
 
 void println(char c)
 {
-    ArduinoPlatform::SerialDebug.println(c);
+    ArduinoPlatform::SerialDebug->println(c);
 }
 
 void println(unsigned char num)
 {
-    ArduinoPlatform::SerialDebug.println(num);
+    ArduinoPlatform::SerialDebug->println(num);
 }
 
 void println(unsigned char num, int base)
 {
-    ArduinoPlatform::SerialDebug.println(num, base);
+    ArduinoPlatform::SerialDebug->println(num, base);
 }
 
 void println(int num)
 {
-    ArduinoPlatform::SerialDebug.println(num);
+    ArduinoPlatform::SerialDebug->println(num);
 }
 
 void println(int num, int base)
 {
-    ArduinoPlatform::SerialDebug.println(num, base);
+    ArduinoPlatform::SerialDebug->println(num, base);
 }
 
 void println(unsigned int num)
 {
-    ArduinoPlatform::SerialDebug.println(num);
+    ArduinoPlatform::SerialDebug->println(num);
 }
 
 void println(unsigned int num, int base)
 {
-    ArduinoPlatform::SerialDebug.println(num, base);
+    ArduinoPlatform::SerialDebug->println(num, base);
 }
 
 void println(long num)
 {
-    ArduinoPlatform::SerialDebug.println(num);
+    ArduinoPlatform::SerialDebug->println(num);
 }
 
 void println(long num, int base)
 {
-    ArduinoPlatform::SerialDebug.println(num, base);
+    ArduinoPlatform::SerialDebug->println(num, base);
 }
 
 void println(unsigned long num)
 {
-    ArduinoPlatform::SerialDebug.println(num);
+    ArduinoPlatform::SerialDebug->println(num);
 }
 
 void println(unsigned long num, int base)
 {
-    ArduinoPlatform::SerialDebug.println(num, base);
+    ArduinoPlatform::SerialDebug->println(num, base);
 }
 
 void println(double num)
 {
-    ArduinoPlatform::SerialDebug.println(num);
+    ArduinoPlatform::SerialDebug->println(num);
 }
 
 void println(void)
 {
-    ArduinoPlatform::SerialDebug.println();
+    ArduinoPlatform::SerialDebug->println();
 }

src/arduino_platform.h

@@ -35,7 +35,7 @@ class ArduinoPlatform : public Platform
     virtual int readUart();
     virtual size_t readBytesUart(uint8_t* buffer, size_t length);
 
-    static Stream& SerialDebug;
+    static Stream* SerialDebug;
 
   protected:
     uint32_t _mulitcastAddr;

src/esp32_platform.cpp

@@ -36,7 +36,7 @@ void Esp32Platform::macAddress(uint8_t * addr)
 
 void Esp32Platform::restart()
 {
-    ArduinoPlatform::SerialDebug.println("restart");
+    println("restart");
     ESP.restart();
 }
 

src/esp_platform.cpp

@@ -37,7 +37,7 @@ void EspPlatform::macAddress(uint8_t * addr)
 
 void EspPlatform::restart()
 {
-    ArduinoPlatform::SerialDebug.println("restart");
+    println("restart");
     ESP.reset();
 }
 

src/knx_facade.cpp

@@ -14,9 +14,15 @@ KnxFacade<Esp32Platform, Bau57B0> knx;
 #define ICACHE_RAM_ATTR
 #endif
 
+#ifndef __linux__
+uint32_t lastpressed=0;
+#endif
 ICACHE_RAM_ATTR void buttonUp()
 {
     #ifndef __linux__
-    knx._toogleProgMode = true;
+    if (millis() - lastpressed > 200){
+        knx._toogleProgMode = true;
+        lastpressed = millis();
+    }
     #endif
-}
+}

src/knx_facade.h

@@ -27,7 +27,10 @@ template <class P, class B> class KnxFacade : private SaveRestore
 
   public:
     KnxFacade() : _platformPtr(new P()), _bauPtr(new B(*_platformPtr)), _bau(*_bauPtr)
-    {}
+    {
+        manufacturerId(0xfa);
+        _bau.addSaveRestore(this);
+    }
     
     virtual ~KnxFacade()
     {

src/samd_platform.cpp

@@ -16,7 +16,7 @@ SamdPlatform::SamdPlatform( HardwareSerial* s) : ArduinoPlatform(s)
 
 void SamdPlatform::restart()
 {
-    ArduinoPlatform::SerialDebug.println("restart");
+    println("restart");
     NVIC_SystemReset();
 }