use KnxFacade for linux too

doc/Doxyfile

@@ -162,7 +162,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        = ..
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which

knx-linux/CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 2.7)
 project(knx-linux)
 set(LIBRARIES_FROM_REFERENCES "")
-add_executable(knx-linux ../src/knx/address_table_object.cpp ../src/knx/apdu.cpp ../src/knx/application_layer.cpp ../src/knx/application_program_object.cpp ../src/knx/association_table_object.cpp ../src/knx/bau.cpp ../src/knx/bau07B0.cpp ../src/knx/bau57B0.cpp ../src/knx/bau_systemB.cpp ../src/knx/bits.cpp ../src/knx/cemi_frame.cpp ../src/knx/data_link_layer.cpp ../src/knx/datapoint_types.cpp ../src/knx/device_object.cpp ../src/knx/group_object.cpp ../src/knx/group_object_table_object.cpp ../src/knx/interface_object.cpp ../src/knx/ip_data_link_layer.cpp ../src/knx/ip_parameter_object.cpp ../src/knx/memory.cpp ../src/knx/network_layer.cpp ../src/knx/npdu.cpp ../src/knx/table_object.cpp ../src/knx/tpdu.cpp ../src/knx/tpuart_data_link_layer.cpp ../src/knx/transport_layer.cpp ../src/knx/platform.cpp main.cpp ../src/linux_platform.cpp)
+add_executable(knx-linux ../src/knx/address_table_object.cpp ../src/knx/apdu.cpp ../src/knx/application_layer.cpp ../src/knx/application_program_object.cpp ../src/knx/association_table_object.cpp ../src/knx/bau.cpp ../src/knx/bau07B0.cpp ../src/knx/bau57B0.cpp ../src/knx/bau_systemB.cpp ../src/knx/bits.cpp ../src/knx/cemi_frame.cpp ../src/knx/data_link_layer.cpp ../src/knx/datapoint_types.cpp ../src/knx/device_object.cpp ../src/knx/group_object.cpp ../src/knx/group_object_table_object.cpp ../src/knx/interface_object.cpp ../src/knx/ip_data_link_layer.cpp ../src/knx/ip_parameter_object.cpp ../src/knx/memory.cpp ../src/knx/network_layer.cpp ../src/knx/npdu.cpp ../src/knx/table_object.cpp ../src/knx/tpdu.cpp ../src/knx/tpuart_data_link_layer.cpp ../src/knx/transport_layer.cpp ../src/knx/platform.cpp main.cpp ../src/linux_platform.cpp ../src/knx_facade.cpp)
 target_link_libraries(knx-linux  "${LIBRARIES_FROM_REFERENCES}")
 include_directories(../src)
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -Wno-switch -g -O0")

knx-linux/knx-linux-Debug.vgdbsettings

@@ -115,7 +115,7 @@
       <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
       <SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
       <DiscoverySettings>
-        <Mode>Enabled</Mode>
+        <Mode>Disabled</Mode>
         <SearchInProjectDir>true</SearchInProjectDir>
         <SearchInSourceDirs>true</SearchInSourceDirs>
         <SearchInIncludeSubdirs>true</SearchInIncludeSubdirs>

knx-linux/knx-linux.vcxproj

@@ -44,7 +44,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeIncludeSearchPath>$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\c++\6;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\x86_64-linux-gnu\c++\6;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\c++\6\backward;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0003\include;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0005\include;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0004\include-fixed;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\x86_64-linux-gnu;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <NMakeIncludeSearchPath>$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\c++\6;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\x86_64-linux-gnu\c++\6;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\c++\6\backward;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0003\include;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0005\include;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0004\include-fixed;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include\x86_64-linux-gnu;$(LOCALAPPDATA)\VisualGDB\RemoteSourceCache\Suzail\0000\include;..\src;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <NMakeForcedIncludes>$(ProjectDir)\gcc_Debug.h;$(VISUALGDB_DIR)\gcc_compat.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
     <NMakeBuildCommandLine>"$(VISUALGDB_DIR)\VisualGDB.exe" /build "$(ProjectPath)" "/solution:$(SolutionPath)"  "/config:$(Configuration)" "/platform:$(Platform)"</NMakeBuildCommandLine>
     <NMakeCleanCommandLine>"$(VISUALGDB_DIR)\VisualGDB.exe" /clean "$(ProjectPath)" "/solution:$(SolutionPath)"  "/config:$(Configuration)" "/platform:$(Platform)"</NMakeCleanCommandLine>
@@ -70,6 +70,7 @@
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\src\knx.h" />
     <ClInclude Include="..\src\knx\address_table_object.h" />
     <ClInclude Include="..\src\knx\apdu.h" />
     <ClInclude Include="..\src\knx\application_layer.h" />
@@ -100,6 +101,7 @@
     <ClInclude Include="..\src\knx\tpdu.h" />
     <ClInclude Include="..\src\knx\tpuart_data_link_layer.h" />
     <ClInclude Include="..\src\knx\transport_layer.h" />
+    <ClInclude Include="..\src\knx_facade.h" />
     <ClInclude Include="..\src\linux_platform.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -139,6 +141,7 @@
     <ClCompile Include="..\src\knx\tpdu.cpp" />
     <ClCompile Include="..\src\knx\tpuart_data_link_layer.cpp" />
     <ClCompile Include="..\src\knx\transport_layer.cpp" />
+    <ClCompile Include="..\src\knx_facade.cpp" />
     <ClCompile Include="..\src\linux_platform.cpp" />
     <ClCompile Include="main.cpp" />
   </ItemGroup>

knx-linux/knx-linux.vcxproj.filters

@@ -129,6 +129,12 @@
     <ClInclude Include="..\src\knx\transport_layer.h">
       <Filter>Header files\knx</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\knx_facade.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\knx.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\knx\address_table_object.cpp">
@@ -218,5 +224,8 @@
     <ClCompile Include="main.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\knx_facade.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

knx-linux/main.cpp

@@ -1,4 +1,4 @@
-#include "linux_platform.h"
+#include "knx_facade.h"
 #include "knx/bau57B0.h"
 #include "knx/group_object_table_object.h"
 #include <time.h>
@@ -7,16 +7,17 @@
 
 LinuxPlatform platfrom;
 Bau57B0 bau(platfrom);
+KnxFacade knx(bau);
 
 float currentValue = 0;
 float maxValue = 0;
 float minValue = RAND_MAX;
 long lastsend = 0;
 
-#define CURR bau.groupObjectTable().get(1)
+#define CURR knx.getGroupObject(1)
-#define MAX bau.groupObjectTable().get(2)
+#define MAX knx.getGroupObject(2)
-#define MIN bau.groupObjectTable().get(3)
+#define MIN knx.getGroupObject(3)
-#define RESET bau.groupObjectTable().get(4)
+#define RESET knx.getGroupObject(4)
 
 void measureTemp()
 {
@@ -65,23 +66,21 @@ void appLoop()
 void setup()
 {
     srand((unsigned int)time(NULL));
-    bau.readMemory();
+    knx.readMemory();
 
-    if (bau.configured())
+    if (knx.induvidualAddress() == 0)
-        RESET.callback(resetCallback);
+        knx.progMode(true);
 
-    if (bau.deviceObject().induvidualAddress() == 0)
+    if (knx.configured())
-        bau.deviceObject().progMode(true);
-
-    if (bau.parameters().loadState() == LS_LOADED)
     {
+        RESET.callback(resetCallback);
         printf("Timeout: %d\n", bau.parameters().getWord(0));
         printf("Zykl. senden: %d\n", bau.parameters().getByte(2));
         printf("Min/Max senden: %d\n", bau.parameters().getByte(3));
         printf("Aenderung senden: %d\n", bau.parameters().getByte(4));
         printf("Abgleich %d\n", bau.parameters().getByte(5));
     }
-    bau.enabled(true);
+    knx.start();
 }
 
 int main(int argc, char **argv)
@@ -90,8 +89,9 @@ int main(int argc, char **argv)
     
     while (1)
     {
-        bau.loop();
+        knx.loop();
-        appLoop();
+        if(knx.configured())
+            appLoop();
         platfrom.mdelay(100);
     }
 }

src/knx/table_object.h

@@ -58,6 +58,13 @@ protected:
     void loadEventLoaded(uint8_t* data);
     void loadEventError(uint8_t* data);
     void additionalLoadControls(uint8_t* data);
+    /**
+     * @brief set the ::LoadState of the interface object.
+     * 
+     * Calls beforeStateChange().
+     * 
+     * @param newState the new ::LoadState 
+     */
     void loadState(LoadState newState);
     LoadState _state = LS_UNLOADED;
     Platform& _platform;

src/knx_facade.cpp

@@ -1,12 +1,21 @@
 #include "knx_facade.h"
 
+#include "knx/bits.h"
+
 #ifdef ARDUINO_ARCH_SAMD
 SamdPlatform platform;
 Bau07B0 bau(platform);
-#else
+#elif ARDUINO_ARCH_ESP8266
 EspPlatform platform;
 Bau57B0 bau(platform);
+#elif __linux__ //linux
+// noops on linux
+#define digitalWrite(a, b)
+#define pinMode(a, b)
+#define attachInterrupt(a, b, c)
 #endif
+
+#ifndef __linux__
 KnxFacade knx(bau);
 
 void buttonUp()
@@ -22,6 +31,7 @@ void buttonUp()
         knx.progMode(true);
     }
 }
+#endif
 
 KnxFacade::KnxFacade(BauSystemB& bau) : _bau(bau)
 {
@@ -46,7 +56,12 @@ bool KnxFacade::progMode()
 
 void KnxFacade::progMode(bool value)
 {
-    Serial.println("progmode");
+    print("progmode ");
+    if (value)
+        println("on");
+    else
+        println("off");
+
     _bau.deviceObject().progMode(value);
 }
 
@@ -100,6 +115,11 @@ void KnxFacade::bauNumber(uint32_t value)
     _bau.deviceObject().bauNumber(value);
 }
 
+uint16_t KnxFacade::induvidualAddress()
+{
+    return _bau.deviceObject().induvidualAddress();
+}
+
 void KnxFacade::orderNumber(const char* value)
 {
     _bau.deviceObject().orderNumber(value);

src/knx_facade.h

@@ -3,14 +3,17 @@
 #ifdef ARDUINO_ARCH_SAMD
 #include "samd_platform.h"
 #include "knx/bau07B0.h"
-#endif
+#elif ARDUINO_ARCH_ESP8266
-
-#ifdef ARDUINO_ARCH_ESP8266
 #include "esp_platform.h"
 #include "knx/bau57B0.h"
+#else
+#include "linux_platform.h"
+#include "knx/bau57B0.h"
+#define LED_BUILTIN 0
 #endif
 
 
+
 typedef uint8_t* (*saveRestoreCallback)(uint8_t* buffer);
 
 class KnxFacade : private SaveRestore
@@ -28,6 +31,7 @@ public:
     void buttonPin(uint32_t value);
     void readMemory();
     void writeMemory();
+    uint16_t induvidualAddress();
     void loop();
     void manufacturerId(uint16_t value);
     void bauNumber(uint32_t value);
@@ -56,4 +60,6 @@ private:
     uint8_t* restore(uint8_t* buffer);
 };
 
+#ifndef __linux__
 extern KnxFacade knx;
+#endif

visualstudio/knx-bme680.vgdbproj

@@ -25,6 +25,7 @@
     <AdditionalLibraryDirectories>
       <string>..\..</string>
     </AdditionalLibraryDirectories>
+    <IgnoreNormalLibraryDirectories>false</IgnoreNormalLibraryDirectories>
     <OutputSubdirectory>Output\$(PlatformName.defuse)\$(ConfigurationName.defuse)</OutputSubdirectory>
     <EnableVerboseBuild>true</EnableVerboseBuild>
     <PreprocessorMacros />
@@ -229,100 +230,6 @@
         <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
       </BuildSettingsExtension>
     </VisualGDBConfiguration>
-    <VisualGDBConfiguration>
-      <PlatformName>NodeMCU_1 0_(ESP-12E_Module)</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>esp8266:esp8266:nodemcuv2</BoardID>
-        <Properties>
-          <Entries>
-            <KeyValue>
-              <Key>xtal</Key>
-              <Value>80</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>vt</Key>
-              <Value>flash</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>exception</Key>
-              <Value>disabled</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>eesz</Key>
-              <Value>4M</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>ip</Key>
-              <Value>lm2f</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>dbg</Key>
-              <Value>Disabled</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>lvl</Key>
-              <Value>None____</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>wipe</Key>
-              <Value>none</Value>
-            </KeyValue>
-            <KeyValue>
-              <Key>baud</Key>
-              <Value>115200</Value>
-            </KeyValue>
-          </Entries>
-        </Properties>
-        <DebugUnoptimizedComponentTypes>Sketch</DebugUnoptimizedComponentTypes>
-      </BuildSettingsExtension>
-    </VisualGDBConfiguration>
   </Configurations>
   <ProgramArgumentsSuggestions />
 </VisualGDBProjectSettings2>

visualstudio/knx-demo.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 />
@@ -299,6 +301,10 @@
               <Key>exception</Key>
               <Value>disabled</Value>
             </KeyValue>
+            <KeyValue>
+              <Key>ssl</Key>
+              <Value>all</Value>
+            </KeyValue>
             <KeyValue>
               <Key>eesz</Key>
               <Value>4M</Value>

visualstudio/knx.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.28307.572
+VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "knx-bme680", "knx-bme680.vgdbproj", "{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}"
 EndProject
@@ -44,10 +44,8 @@ Global
 	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|Mixed.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|Mixed.ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
-		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|Mixed.Build.0 = Debug|NodeMCU_1 0_(ESP-12E_Module)
+		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
-		{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|Arduino Genuino Zero (Native USB Port)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|x64.ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
 		{58AFEECD-06E2-4BB7-A13F-E1D5DBAED13F}.Debug|x86.ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port)
@@ -93,8 +91,8 @@ Global
 		{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|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.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{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)
@@ -105,8 +103,7 @@ Global
 		{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|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|Mixed.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.Release|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
 		{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)
@@ -114,8 +111,8 @@ Global
 		{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|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.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module)
+		{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)
@@ -134,8 +131,8 @@ Global
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|Arduino Genuino Zero (Native USB Port).Build.0 = Debug|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU 1 0 (ESP-12E Module)
-		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
+		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU 1 0 (ESP-12E Module)
+		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|VisualGDB.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|VisualGDB.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
@@ -153,8 +150,8 @@ Global
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|Arduino Genuino Zero (Native USB Port).Build.0 = Release|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU 1 0 (ESP-12E Module)
-		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module)
+		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
-		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU 1 0 (ESP-12E Module)
+		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|VisualGDB.Build.0 = Release|Arduino Genuino Zero (Native USB Port)
 		{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port)
@@ -204,7 +201,6 @@ Global
 		{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|NodeMCU_1 0_(ESP-12E_Module).Build.0 = 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
@@ -212,8 +208,8 @@ Global
 		{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|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|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|NodeMCU 1 0 (ESP-12E 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
@@ -231,8 +227,8 @@ Global
 		{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|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|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|NodeMCU 1 0 (ESP-12E 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