diff --git a/knx-linux/main.cpp b/knx-linux/main.cpp
index e84b3c6..31723b6 100644
--- a/knx-linux/main.cpp
+++ b/knx-linux/main.cpp
@@ -18,7 +18,7 @@ long lastsend = 0;
 
 void measureTemp()
 {
-    long now = platform->millis();
+    long now = millis();
     if ((now - lastsend) < 10000)
         return;
 
@@ -97,6 +97,6 @@ int main(int argc, char **argv)
         knx->loop();
         if(knx->configured())
             appLoop();
-        platform->mdelay(100);
+        delay(100);
     }
 }
\ No newline at end of file
diff --git a/src/esp_platform.cpp b/src/esp_platform.cpp
index 663e5a9..626804f 100644
--- a/src/esp_platform.cpp
+++ b/src/esp_platform.cpp
@@ -31,16 +31,6 @@ void EspPlatform::macAddress(uint8_t * addr)
     wifi_get_macaddr(STATION_IF, addr);
 }
 
-uint32_t EspPlatform::millis()
-{
-    return ::millis();
-}
-
-void EspPlatform::mdelay(uint32_t millis)
-{
-    delay(millis);
-}
-
 void EspPlatform::restart()
 {
     Serial.println("restart");
diff --git a/src/esp_platform.h b/src/esp_platform.h
index 85c0bb7..2be3e2d 100644
--- a/src/esp_platform.h
+++ b/src/esp_platform.h
@@ -1,27 +1,25 @@
-#ifdef ARDUINO_ARCH_ESP8266
-#include "knx/platform.h"
-#include <ESP8266WiFi.h>
-#include <WiFiUdp.h>
-
-#define SerialDBG Serial
-
-class EspPlatform : public Platform
-{
-public:
-    EspPlatform();
-
-    // ip stuff
-    uint32_t currentIpAddress();
-    uint32_t currentSubnetMask();
-    uint32_t currentDefaultGateway();
-    void macAddress(uint8_t* addr);
-
-    // basic stuff
-    uint32_t millis();
-    void mdelay(uint32_t millis);
-    void restart();
-    void fatalError();
-
+#ifdef ARDUINO_ARCH_ESP8266
+#include "knx/platform.h"
+#include <ESP8266WiFi.h>
+#include <WiFiUdp.h>
+
+#define SerialDBG Serial
+
+class EspPlatform : public Platform
+{
+public:
+    EspPlatform();
+
+    // 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();
@@ -29,21 +27,21 @@ public:
     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();
+    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);
     
     //memory
     uint8_t* getEepromBuffer(uint16_t size);
     void commitToEeprom();
-private:
-    uint32_t _mulitcastAddr;
-    uint16_t _mulitcastPort;
-    WiFiUDP _udp;
-};
-
+private:
+    uint32_t _mulitcastAddr;
+    uint16_t _mulitcastPort;
+    WiFiUDP _udp;
+};
+
 #endif
\ No newline at end of file
diff --git a/src/knx/bau_systemB.cpp b/src/knx/bau_systemB.cpp
index 4917894..4e66daa 100644
--- a/src/knx/bau_systemB.cpp
+++ b/src/knx/bau_systemB.cpp
@@ -5,7 +5,7 @@
 BauSystemB::BauSystemB(Platform& platform): _memory(platform), _addrTable(platform),
     _assocTable(platform), _groupObjTable(platform), _appProgram(platform),
     _platform(platform), _appLayer(_assocTable, *this),
-    _transLayer(_appLayer, _addrTable, _platform), _netLayer(_transLayer)
+    _transLayer(_appLayer, _addrTable), _netLayer(_transLayer)
 {
     _appLayer.transportLayer(_transLayer);
     _transLayer.networkLayer(_netLayer);
diff --git a/src/knx/bits.h b/src/knx/bits.h
index ee9ed64..b261cec 100644
--- a/src/knx/bits.h
+++ b/src/knx/bits.h
@@ -14,6 +14,9 @@
 #define DEC 10
 #define HEX 16
 
+void delay(uint32_t millis);
+uint32_t millis();
+
 #elif ARDUINO_ARCH_SAMD
 #include <Arduino.h>
 #define htons(x) ( (((x)<<8)&0xFF00) | (((x)>>8)&0xFF) )
diff --git a/src/knx/ip_data_link_layer.cpp b/src/knx/ip_data_link_layer.cpp
index 9467e55..2472d05 100644
--- a/src/knx/ip_data_link_layer.cpp
+++ b/src/knx/ip_data_link_layer.cpp
@@ -35,7 +35,7 @@ bool IpDataLinkLayer::sendFrame(CemiFrame& frame)
     
     bool success = sendBytes(buffer, length);
     // only send 50 packet per second: see KNX 3.2.6 p.6
-    _platform.mdelay(20);
+    delay(20);
     dataConReceived(frame, success);
     delete[] buffer;
     return success;
diff --git a/src/knx/platform.h b/src/knx/platform.h
index e680920..16c9bf0 100644
--- a/src/knx/platform.h
+++ b/src/knx/platform.h
@@ -13,10 +13,10 @@ class Platform
     virtual uint32_t currentDefaultGateway() = 0;
     virtual void macAddress(uint8_t* data) = 0;
 
-    virtual uint32_t millis() = 0;
+    //virtual uint32_t millis() = 0;
     virtual void restart() = 0;
     virtual void fatalError() = 0;
-    virtual void mdelay(uint32_t millis) = 0;
+    //virtual void mdelay(uint32_t millis) = 0;
 
     virtual void setupMultiCast(uint32_t addr, uint16_t port) = 0;
     virtual void closeMultiCast() = 0;
diff --git a/src/knx/tpuart_data_link_layer.cpp b/src/knx/tpuart_data_link_layer.cpp
index 12b45fe..48fef44 100644
--- a/src/knx/tpuart_data_link_layer.cpp
+++ b/src/knx/tpuart_data_link_layer.cpp
@@ -115,13 +115,13 @@ void TpUartDataLinkLayer::loop()
             if (sendSingleFrameByte() == false)
             {
                 _waitConfirm = true;
-                _waitConfirmStartTime = _platform.millis();
+                _waitConfirmStartTime = millis();
                 _loopState = IDLE;
             }
             break;
         case RX_FIRST_BYTE:
             rxByte = _platform.readUart();
-            _lastByteRxTime = _platform.millis();
+            _lastByteRxTime = millis();
             _RxByteCnt = 0;
             _xorSum = 0;
             if ((rxByte & L_DATA_MASK) == L_DATA_STANDARD_IND)
@@ -208,7 +208,7 @@ void TpUartDataLinkLayer::loop()
             _loopState = IDLE;
             break;
         case RX_L_DATA:
-            if (_platform.millis() - _lastByteRxTime > BYTE_TIMEOUT)
+            if (millis() - _lastByteRxTime > BYTE_TIMEOUT)
             {
                 _RxByteCnt = 0;
                 _loopState = IDLE;
@@ -217,7 +217,7 @@ void TpUartDataLinkLayer::loop()
             }
             if (!_platform.uartAvailable())
                 break;
-            _lastByteRxTime = _platform.millis();
+            _lastByteRxTime = millis();
             rxByte = _platform.readUart();
 
             if (_RxByteCnt == MAX_KNX_TELEGRAM_SIZE)
@@ -314,7 +314,7 @@ void TpUartDataLinkLayer::loop()
             if (!_platform.uartAvailable())
                 break;
             rxByte = _platform.readUart();
-            _lastByteRxTime = _platform.millis();
+            _lastByteRxTime = millis();
             if ((rxByte & L_DATA_CON_MASK) == L_DATA_CON)
             {
                 //println("L_DATA_CON received");
@@ -343,7 +343,7 @@ void TpUartDataLinkLayer::loop()
 
     if (_waitConfirm)
     {
-        if (_platform.millis() - _waitConfirmStartTime > CONFIRM_TIMEOUT)
+        if (millis() - _waitConfirmStartTime > CONFIRM_TIMEOUT)
         {
             println("L_DATA_CON not received within expected time");
             uint8_t cemiBuffer[MAX_KNX_TELEGRAM_SIZE];
@@ -374,13 +374,13 @@ bool TpUartDataLinkLayer::resetChip()
 {
     uint8_t cmd = U_RESET_REQ;
     _platform.writeUart(cmd);
-    _waitConfirmStartTime = _platform.millis();
+    _waitConfirmStartTime = millis();
     while (true)
     {
         int resp = _platform.readUart();
         if (resp == U_RESET_IND)
             return true;
-        else if (_platform.millis() - _waitConfirmStartTime > RESET_TIMEOUT)
+        else if (millis() - _waitConfirmStartTime > RESET_TIMEOUT)
             return false;
     }
 }
diff --git a/src/knx/transport_layer.cpp b/src/knx/transport_layer.cpp
index 4686716..eb00d64 100644
--- a/src/knx/transport_layer.cpp
+++ b/src/knx/transport_layer.cpp
@@ -4,10 +4,11 @@
 #include "network_layer.h"
 #include "application_layer.h"
 #include "platform.h"
+#include "bits.h"
 #include <stdio.h>
 
-TransportLayer::TransportLayer(ApplicationLayer& layer, AddressTableObject& gat, Platform& platform): _savedFrame(0), 
-    _savedFrameConnecting(0), _applicationLayer(layer), _groupAddressTable(gat), _platform(platform)
+TransportLayer::TransportLayer(ApplicationLayer& layer, AddressTableObject& gat): _savedFrame(0), 
+    _savedFrameConnecting(0), _applicationLayer(layer), _groupAddressTable(gat)
 {
     _currentState = Closed;
 }
@@ -528,13 +529,13 @@ void TransportLayer::ackTimeoutIndication()
 
 void TransportLayer::loop()
 {
-    uint32_t millis = _platform.millis();
-    if (_connectionTimeoutEnabled
-        && (millis - _connectionTimeoutStartMillis) > _connectionTimeoutMillis)
+    uint32_t milliseconds = millis();
+    if (_connectionTimeoutEnabled 
+        && (milliseconds - _connectionTimeoutStartMillis) > _connectionTimeoutMillis)
         connectionTimeoutIndication();
 
     if (_ackTimeoutEnabled
-        && (millis - _ackTimeoutStartMillis) > _ackTimeoutMillis)
+        && (milliseconds - _ackTimeoutStartMillis) > _ackTimeoutMillis)
         ackTimeoutIndication();
 
     if (_savedConnectingValid)
@@ -696,7 +697,7 @@ void TransportLayer::A15(Priority priority, uint16_t tsap)
 
 void TransportLayer::enableConnectionTimeout()
 {
-    _connectionTimeoutStartMillis = _platform.millis();
+    _connectionTimeoutStartMillis = millis();
     _connectionTimeoutEnabled = true;
 }
 
@@ -707,7 +708,7 @@ void TransportLayer::disableConnectionTimeout()
 
 void TransportLayer::enableAckTimeout()
 {
-    _ackTimeoutStartMillis = _platform.millis();
+    _ackTimeoutStartMillis = millis();
     _ackTimeoutEnabled = true;
 }
 
diff --git a/src/knx/transport_layer.h b/src/knx/transport_layer.h
index 57d69c5..f2d6c5e 100644
--- a/src/knx/transport_layer.h
+++ b/src/knx/transport_layer.h
@@ -16,7 +16,7 @@ enum StateType { Closed, OpenIdle, OpenWait, Connecting };
 class TransportLayer
 {
 public:
-    TransportLayer(ApplicationLayer& layer, AddressTableObject& gat, Platform& platform);
+    TransportLayer(ApplicationLayer& layer, AddressTableObject& gat);
     void networkLayer(NetworkLayer& layer);
 
 #pragma region from network layer
@@ -114,5 +114,4 @@ private:
     ApplicationLayer& _applicationLayer;
     AddressTableObject& _groupAddressTable;
     NetworkLayer* _networkLayer;
-    Platform& _platform;
 };
diff --git a/src/linux_platform.cpp b/src/linux_platform.cpp
index 958d288..80bf42e 100644
--- a/src/linux_platform.cpp
+++ b/src/linux_platform.cpp
@@ -58,7 +58,7 @@ uint32_t LinuxPlatform::currentDefaultGateway()
     return 0;
 }
 
-uint32_t LinuxPlatform::millis()
+uint32_t millis()
 {
     struct timespec spec;
 
@@ -66,7 +66,7 @@ uint32_t LinuxPlatform::millis()
     return spec.tv_sec * 1000 + round(spec.tv_nsec / 1.0e6);
 }
 
-void LinuxPlatform::mdelay(uint32_t millis)
+void delay(uint32_t millis)
 {
     struct timespec ts;
     ts.tv_sec = millis / 1000;
diff --git a/src/linux_platform.h b/src/linux_platform.h
index 4881d8a..6fa91d5 100644
--- a/src/linux_platform.h
+++ b/src/linux_platform.h
@@ -23,8 +23,6 @@ public:
     void macAddress(uint8_t* addr) override;
 
     // basic stuff
-    uint32_t millis() override;
-    void mdelay(uint32_t millis) override;
     void restart() override;
     void fatalError() override;
 
diff --git a/src/samd_platform.cpp b/src/samd_platform.cpp
index d222621..01214cf 100644
--- a/src/samd_platform.cpp
+++ b/src/samd_platform.cpp
@@ -33,16 +33,6 @@ void SamdPlatform::macAddress(uint8_t * addr)
     // not needed
 }
 
-uint32_t SamdPlatform::millis()
-{
-    return::millis();
-}
-
-void SamdPlatform::mdelay(uint32_t millis)
-{
-    delay(millis);
-}
-
 void SamdPlatform::restart()
 {
     SerialDBG.println("restart");
diff --git a/src/samd_platform.h b/src/samd_platform.h
index df7acdb..92af8ed 100644
--- a/src/samd_platform.h
+++ b/src/samd_platform.h
@@ -1,29 +1,27 @@
-#include "knx/platform.h"
-
-#include "Arduino.h"
-
-#ifdef ARDUINO_ARCH_SAMD
-
-#define SerialDBG SerialUSB
-#define SerialKNX Serial1
-
-class SamdPlatform : public Platform
-{
-public:
-    SamdPlatform();
-
-    // ip stuff
-    uint32_t currentIpAddress();
-    uint32_t currentSubnetMask();
-    uint32_t currentDefaultGateway();
-    void macAddress(uint8_t* addr);
-
-    // basic stuff
-    uint32_t millis();
-    void mdelay(uint32_t millis);
-    void restart();
-    void fatalError();
-
+#include "knx/platform.h"
+
+#include "Arduino.h"
+
+#ifdef ARDUINO_ARCH_SAMD
+
+#define SerialDBG SerialUSB
+#define SerialKNX Serial1
+
+class SamdPlatform : public Platform
+{
+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();
@@ -31,20 +29,20 @@ public:
     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 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;
-};
-
+private:
+    uint32_t _mulitcastAddr;
+    uint16_t _mulitcastPort;
+};
+
 #endif
\ No newline at end of file
diff --git a/visualstudio/knx-bme680.vgdbproj b/visualstudio/knx-bme680.vgdbproj
index 2998acb..e9a2452 100644
--- a/visualstudio/knx-bme680.vgdbproj
+++ b/visualstudio/knx-bme680.vgdbproj
@@ -272,63 +272,6 @@
         <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
       </BuildSettingsExtension>
     </VisualGDBConfiguration>
-    <VisualGDBConfiguration>
-      <PlatformName>Arduino_Genuino_Zero_(Native_USB_Port)</PlatformName>
-      <DebugSettingsOverride xsi:type="com.visualgdb.debug.embedded">
-        <AdditionalStartupCommands />
-        <AdditionalGDBSettings>
-          <Features>
-            <DisableAutoDetection>false</DisableAutoDetection>
-            <UseFrameParameter>false</UseFrameParameter>
-            <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
-            <ListLocalsSupported>false</ListLocalsSupported>
-            <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
-            <ThreadInfoSupported>false</ThreadInfoSupported>
-            <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
-            <SupportTargetCommand>false</SupportTargetCommand>
-            <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
-          </Features>
-          <EnableSmartStepping>false</EnableSmartStepping>
-          <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-          <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-          <UseAppleExtensions>false</UseAppleExtensions>
-          <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-          <MakeLogFile>false</MakeLogFile>
-          <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-          <UseRelativePathsOnly>false</UseRelativePathsOnly>
-          <ExitAction>None</ExitAction>
-          <DisableDisassembly>false</DisableDisassembly>
-          <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-          <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-          <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-          <DisableSignals>false</DisableSignals>
-          <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
-          <EnableNonStopMode>false</EnableNonStopMode>
-          <MaxBreakpointLimit>0</MaxBreakpointLimit>
-        </AdditionalGDBSettings>
-        <DebugMethod />
-        <AutoDetectRTOS>true</AutoDetectRTOS>
-        <SemihostingSupport>Auto</SemihostingSupport>
-        <SemihostingPollingDelay>0</SemihostingPollingDelay>
-        <StepIntoEntryPoint>false</StepIntoEntryPoint>
-        <ReloadFirmwareOnReset>false</ReloadFirmwareOnReset>
-        <ValidateEndOfStackAddress>true</ValidateEndOfStackAddress>
-        <StopAtEntryPoint>false</StopAtEntryPoint>
-        <EnableVirtualHalts>false</EnableVirtualHalts>
-        <DynamicAnalysisSettings />
-        <EndOfStackSymbol>_estack</EndOfStackSymbol>
-        <TimestampProviderTicksPerSecond>0</TimestampProviderTicksPerSecond>
-        <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
-        <CheckInterfaceDrivers>true</CheckInterfaceDrivers>
-      </DebugSettingsOverride>
-      <BuildSettingsExtension xsi:type="com.visualgdb.build.external.arduino.extension">
-        <BoardID>arduino:samd:arduino_zero_native</BoardID>
-        <Properties>
-          <Entries />
-        </Properties>
-        <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
-      </BuildSettingsExtension>
-    </VisualGDBConfiguration>
   </Configurations>
   <ProgramArgumentsSuggestions />
 </VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/visualstudio/knx-demo.vgdbproj b/visualstudio/knx-demo.vgdbproj
index f74ad5d..56b2942 100644
--- a/visualstudio/knx-demo.vgdbproj
+++ b/visualstudio/knx-demo.vgdbproj
@@ -173,69 +173,6 @@
     </CodeAnalyzerSettings>
   </CodeSense>
   <Configurations>
-    <VisualGDBConfiguration>
-      <PlatformName>Arduino Genuino Zero (Native USB Port)</PlatformName>
-      <DebugSettingsOverride xsi:type="com.visualgdb.debug.embedded">
-        <AdditionalStartupCommands />
-        <AdditionalGDBSettings>
-          <Features>
-            <DisableAutoDetection>false</DisableAutoDetection>
-            <UseFrameParameter>false</UseFrameParameter>
-            <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
-            <ListLocalsSupported>false</ListLocalsSupported>
-            <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
-            <ThreadInfoSupported>false</ThreadInfoSupported>
-            <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
-            <SupportTargetCommand>false</SupportTargetCommand>
-            <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
-          </Features>
-          <EnableSmartStepping>false</EnableSmartStepping>
-          <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-          <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-          <UseAppleExtensions>false</UseAppleExtensions>
-          <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-          <MakeLogFile>false</MakeLogFile>
-          <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-          <UseRelativePathsOnly>false</UseRelativePathsOnly>
-          <ExitAction>None</ExitAction>
-          <DisableDisassembly>false</DisableDisassembly>
-          <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-          <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-          <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-          <DisableSignals>false</DisableSignals>
-          <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
-          <EnableNonStopMode>false</EnableNonStopMode>
-          <MaxBreakpointLimit>0</MaxBreakpointLimit>
-        </AdditionalGDBSettings>
-        <DebugMethod>
-          <ID>gdbsim</ID>
-          <Configuration>
-            <Entries />
-          </Configuration>
-        </DebugMethod>
-        <AutoDetectRTOS>true</AutoDetectRTOS>
-        <SemihostingSupport>Disabled</SemihostingSupport>
-        <SemihostingPollingDelay>0</SemihostingPollingDelay>
-        <StepIntoEntryPoint>false</StepIntoEntryPoint>
-        <ReloadFirmwareOnReset>false</ReloadFirmwareOnReset>
-        <ValidateEndOfStackAddress>true</ValidateEndOfStackAddress>
-        <StopAtEntryPoint>false</StopAtEntryPoint>
-        <EnableVirtualHalts>false</EnableVirtualHalts>
-        <DynamicAnalysisSettings />
-        <EndOfStackSymbol>_estack</EndOfStackSymbol>
-        <TimestampProviderTicksPerSecond>0</TimestampProviderTicksPerSecond>
-        <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
-        <CheckInterfaceDrivers>true</CheckInterfaceDrivers>
-      </DebugSettingsOverride>
-      <BuildSettingsExtension xsi:type="com.visualgdb.build.external.arduino.extension">
-        <BoardID>arduino:samd:arduino_zero_native</BoardID>
-        <COMPort>COM11</COMPort>
-        <Properties>
-          <Entries />
-        </Properties>
-        <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
-      </BuildSettingsExtension>
-    </VisualGDBConfiguration>
     <VisualGDBConfiguration>
       <PlatformName>NodeMCU_1 0_(ESP-12E_Module)</PlatformName>
       <DebugSettingsOverride xsi:type="com.visualgdb.debug.embedded">
@@ -334,6 +271,63 @@
         <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
       </BuildSettingsExtension>
     </VisualGDBConfiguration>
+    <VisualGDBConfiguration>
+      <PlatformName>Arduino_Genuino_Zero_(Native_USB_Port)</PlatformName>
+      <DebugSettingsOverride xsi:type="com.visualgdb.debug.embedded">
+        <AdditionalStartupCommands />
+        <AdditionalGDBSettings>
+          <Features>
+            <DisableAutoDetection>false</DisableAutoDetection>
+            <UseFrameParameter>false</UseFrameParameter>
+            <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
+            <ListLocalsSupported>false</ListLocalsSupported>
+            <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
+            <ThreadInfoSupported>false</ThreadInfoSupported>
+            <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
+            <SupportTargetCommand>false</SupportTargetCommand>
+            <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
+          </Features>
+          <EnableSmartStepping>false</EnableSmartStepping>
+          <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
+          <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
+          <UseAppleExtensions>false</UseAppleExtensions>
+          <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
+          <MakeLogFile>false</MakeLogFile>
+          <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
+          <UseRelativePathsOnly>false</UseRelativePathsOnly>
+          <ExitAction>None</ExitAction>
+          <DisableDisassembly>false</DisableDisassembly>
+          <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
+          <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
+          <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
+          <DisableSignals>false</DisableSignals>
+          <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
+          <EnableNonStopMode>false</EnableNonStopMode>
+          <MaxBreakpointLimit>0</MaxBreakpointLimit>
+        </AdditionalGDBSettings>
+        <DebugMethod />
+        <AutoDetectRTOS>true</AutoDetectRTOS>
+        <SemihostingSupport>Auto</SemihostingSupport>
+        <SemihostingPollingDelay>0</SemihostingPollingDelay>
+        <StepIntoEntryPoint>false</StepIntoEntryPoint>
+        <ReloadFirmwareOnReset>false</ReloadFirmwareOnReset>
+        <ValidateEndOfStackAddress>true</ValidateEndOfStackAddress>
+        <StopAtEntryPoint>false</StopAtEntryPoint>
+        <EnableVirtualHalts>false</EnableVirtualHalts>
+        <DynamicAnalysisSettings />
+        <EndOfStackSymbol>_estack</EndOfStackSymbol>
+        <TimestampProviderTicksPerSecond>0</TimestampProviderTicksPerSecond>
+        <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
+        <CheckInterfaceDrivers>true</CheckInterfaceDrivers>
+      </DebugSettingsOverride>
+      <BuildSettingsExtension xsi:type="com.visualgdb.build.external.arduino.extension">
+        <BoardID>arduino:samd:arduino_zero_native</BoardID>
+        <Properties>
+          <Entries />
+        </Properties>
+        <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
+      </BuildSettingsExtension>
+    </VisualGDBConfiguration>
   </Configurations>
   <ProgramArgumentsSuggestions />
 </VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/visualstudio/knx-sonoffS20.vgdbproj b/visualstudio/knx-sonoffS20.vgdbproj
index 3b957d8..53b75db 100644
--- a/visualstudio/knx-sonoffS20.vgdbproj
+++ b/visualstudio/knx-sonoffS20.vgdbproj
@@ -25,8 +25,10 @@
     <AdditionalLibraryDirectories>
       <string>..\..</string>
     </AdditionalLibraryDirectories>
+    <IgnoreNormalLibraryDirectories>false</IgnoreNormalLibraryDirectories>
     <OutputSubdirectory>Output\$(PlatformName.defuse)\$(ConfigurationName.defuse)</OutputSubdirectory>
     <EnableVerboseBuild>true</EnableVerboseBuild>
+    <PreprocessorMacros />
   </Build>
   <CustomBuild>
     <PreSyncActions />
@@ -171,69 +173,6 @@
     </CodeAnalyzerSettings>
   </CodeSense>
   <Configurations>
-    <VisualGDBConfiguration>
-      <PlatformName>Arduino Genuino Zero (Native USB Port)</PlatformName>
-      <DebugSettingsOverride xsi:type="com.visualgdb.debug.embedded">
-        <AdditionalStartupCommands />
-        <AdditionalGDBSettings>
-          <Features>
-            <DisableAutoDetection>false</DisableAutoDetection>
-            <UseFrameParameter>false</UseFrameParameter>
-            <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
-            <ListLocalsSupported>false</ListLocalsSupported>
-            <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
-            <ThreadInfoSupported>false</ThreadInfoSupported>
-            <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
-            <SupportTargetCommand>false</SupportTargetCommand>
-            <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
-          </Features>
-          <EnableSmartStepping>false</EnableSmartStepping>
-          <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-          <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-          <UseAppleExtensions>false</UseAppleExtensions>
-          <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-          <MakeLogFile>false</MakeLogFile>
-          <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-          <UseRelativePathsOnly>false</UseRelativePathsOnly>
-          <ExitAction>None</ExitAction>
-          <DisableDisassembly>false</DisableDisassembly>
-          <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-          <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-          <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-          <DisableSignals>false</DisableSignals>
-          <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
-          <EnableNonStopMode>false</EnableNonStopMode>
-          <MaxBreakpointLimit>0</MaxBreakpointLimit>
-        </AdditionalGDBSettings>
-        <DebugMethod>
-          <ID>gdbsim</ID>
-          <Configuration>
-            <Entries />
-          </Configuration>
-        </DebugMethod>
-        <AutoDetectRTOS>true</AutoDetectRTOS>
-        <SemihostingSupport>Disabled</SemihostingSupport>
-        <SemihostingPollingDelay>0</SemihostingPollingDelay>
-        <StepIntoEntryPoint>false</StepIntoEntryPoint>
-        <ReloadFirmwareOnReset>false</ReloadFirmwareOnReset>
-        <ValidateEndOfStackAddress>true</ValidateEndOfStackAddress>
-        <StopAtEntryPoint>false</StopAtEntryPoint>
-        <EnableVirtualHalts>false</EnableVirtualHalts>
-        <DynamicAnalysisSettings />
-        <EndOfStackSymbol>_estack</EndOfStackSymbol>
-        <TimestampProviderTicksPerSecond>0</TimestampProviderTicksPerSecond>
-        <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
-        <CheckInterfaceDrivers>true</CheckInterfaceDrivers>
-      </DebugSettingsOverride>
-      <BuildSettingsExtension xsi:type="com.visualgdb.build.external.arduino.extension">
-        <BoardID>arduino:samd:arduino_zero_native</BoardID>
-        <COMPort>COM11</COMPort>
-        <Properties>
-          <Entries />
-        </Properties>
-        <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
-      </BuildSettingsExtension>
-    </VisualGDBConfiguration>
     <VisualGDBConfiguration>
       <PlatformName>NodeMCU 1 0 (ESP-12E Module)</PlatformName>
       <DebugSettingsOverride xsi:type="com.visualgdb.debug.embedded">
diff --git a/visualstudio/knx.sln b/visualstudio/knx.sln
index 0d5f69e..166482e 100644
--- a/visualstudio/knx.sln
+++ b/visualstudio/knx.sln
@@ -18,124 +18,101 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Arduino_Genuino_Zero_(Native_USB_Port) = Debug|Arduino_Genuino_Zero_(Native_USB_Port)
 		Debug|Mixed = Debug|Mixed
-		Debug|NodeMCU_1 0_(ESP-12E_Module) = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		Debug|VisualGDB = Debug|VisualGDB
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port) = MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port)
 		MinSizeRel|Mixed = MinSizeRel|Mixed
-		MinSizeRel|NodeMCU_1 0_(ESP-12E_Module) = MinSizeRel|NodeMCU_1 0_(ESP-12E_Module)
 		MinSizeRel|VisualGDB = MinSizeRel|VisualGDB
 		MinSizeRel|x64 = MinSizeRel|x64
 		MinSizeRel|x86 = MinSizeRel|x86
 		Release|Arduino_Genuino_Zero_(Native_USB_Port) = Release|Arduino_Genuino_Zero_(Native_USB_Port)
 		Release|Mixed = Release|Mixed
-		Release|NodeMCU_1 0_(ESP-12E_Module) = Release|NodeMCU_1 0_(ESP-12E_Module)
 		Release|VisualGDB = Release|VisualGDB
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 		RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port) = RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port)
 		RelWithDebInfo|Mixed = RelWithDebInfo|Mixed
-		RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module) = RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module)
 		RelWithDebInfo|VisualGDB = RelWithDebInfo|VisualGDB
 		RelWithDebInfo|x64 = RelWithDebInfo|x64
 		RelWithDebInfo|x86 = RelWithDebInfo|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|Arduino_Genuino_Zero_(Native_USB_Port)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Debug|Arduino_Genuino_Zero_(Native_USB_Port)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|Mixed.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|VisualGDB.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|x64.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|x86.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino_Genuino_Zero_(Native_USB_Port)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|x64.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.MinSizeRel|x86.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino_Genuino_Zero_(Native_USB_Port)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Release|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino_Genuino_Zero_(Native_USB_Port)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|x64.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.RelWithDebInfo|x86.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|Mixed.ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|Mixed.Build.0 = Debug|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Debug|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|VisualGDB.ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|VisualGDB.Build.0 = Debug|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|x64.ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|x86.ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Mixed.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Mixed.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|VisualGDB.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|VisualGDB.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x64.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x86.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x86.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|Mixed.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|VisualGDB.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|x86.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Mixed.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Mixed.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|VisualGDB.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x64.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x86.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x86.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Debug|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|x64.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Debug|x86.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x64.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|x86.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino_Genuino_Zero_(Native_USB_Port)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x64.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x86.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|Mixed.ActiveCfg = Debug|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|Mixed.Build.0 = Debug|Win32
-		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|VisualGDB.ActiveCfg = Debug|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|x64.ActiveCfg = Debug|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|x86.ActiveCfg = Debug|Win32
-		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|x86.Build.0 = Debug|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|Mixed.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|Mixed.Build.0 = Release|Win32
-		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Win32
-		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|VisualGDB.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|VisualGDB.Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|x64.ActiveCfg = Release|Win32
@@ -144,7 +121,6 @@ Global
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.MinSizeRel|x86.Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Release|Mixed.ActiveCfg = Release|Win32
-		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Release|VisualGDB.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Release|x64.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Release|x86.ActiveCfg = Release|Win32
@@ -153,45 +129,37 @@ Global
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|Mixed.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|Mixed.Build.0 = Release|Win32
-		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Win32
-		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|VisualGDB.Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|x64.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|x64.Build.0 = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
 		{68FCB2F7-7A74-43A0-8CBE-36CB25020584}.RelWithDebInfo|x86.Build.0 = Release|Win32
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
+		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|Mixed.ActiveCfg = Debug|NodeMCU 1 0 (ESP-12E Module)
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|Mixed.Build.0 = Debug|NodeMCU 1 0 (ESP-12E Module)
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|NodeMCU 1 0 (ESP-12E Module)
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|VisualGDB.ActiveCfg = Debug|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|x64.ActiveCfg = Debug|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Debug|x86.ActiveCfg = Debug|Generic ESP8266 Module
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino Genuino Zero (Native USB Port)
+		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Generic ESP8266 Module
+		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU 1 0 (ESP-12E Module)
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Generic ESP8266 Module
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|VisualGDB.ActiveCfg = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|VisualGDB.Build.0 = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|x64.ActiveCfg = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|x64.Build.0 = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|x86.ActiveCfg = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.MinSizeRel|x86.Build.0 = Release|Generic ESP8266 Module
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
+		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Release|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Release|VisualGDB.ActiveCfg = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Release|x64.ActiveCfg = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.Release|x86.ActiveCfg = Release|Generic ESP8266 Module
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Arduino Genuino Zero (Native USB Port)
+		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Generic ESP8266 Module
+		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU 1 0 (ESP-12E Module)
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Generic ESP8266 Module
-		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|VisualGDB.Build.0 = Release|Generic ESP8266 Module
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|x64.ActiveCfg = Release|Generic ESP8266 Module
@@ -200,17 +168,13 @@ Global
 		{3DB3061B-09A3-4C8B-A197-CBEEB3336437}.RelWithDebInfo|x86.Build.0 = Release|Generic ESP8266 Module
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Debug|Mixed.ActiveCfg = Debug|Win32
-		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Debug|VisualGDB.ActiveCfg = Debug|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Debug|x64.ActiveCfg = Debug|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Debug|x86.ActiveCfg = Debug|Win32
-		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Debug|x86.Build.0 = Debug|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|Mixed.ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|Mixed.Build.0 = Release|Win32
-		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Win32
-		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|VisualGDB.ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|VisualGDB.Build.0 = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|x64.ActiveCfg = Release|Win32
@@ -219,7 +183,6 @@ Global
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.MinSizeRel|x86.Build.0 = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Release|Mixed.ActiveCfg = Release|Win32
-		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Release|VisualGDB.ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Release|x64.ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.Release|x86.ActiveCfg = Release|Win32
@@ -228,8 +191,6 @@ Global
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|Mixed.ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|Mixed.Build.0 = Release|Win32
-		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Win32
-		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|VisualGDB.Build.0 = Release|Win32
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|x64.ActiveCfg = Release|Win32
@@ -238,8 +199,6 @@ Global
 		{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|x86.Build.0 = Release|Win32
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|Mixed.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|VisualGDB.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|x64.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|x86.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
@@ -247,8 +206,6 @@ Global
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
@@ -257,8 +214,6 @@ Global
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|x86.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|Arduino_Genuino_Zero_(Native_USB_Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
@@ -266,8 +221,6 @@ Global
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|Arduino_Genuino_Zero_(Native_USB_Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
-		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module)