Merge remote-tracking branch 'upstream/0.1.0-dev' into 0.1.0-dev

include/hasp_conf.h

@@ -18,6 +18,10 @@
 #define HASP_USE_WIFI (HASP_HAS_NETWORK)
 #endif
 
+#ifndef HASP_USE_ETHERNET
+#define HASP_USE_ETHERNET 0
+#endif
+
 #ifndef HASP_USE_MQTT
 #define HASP_USE_MQTT 1
 #endif
@@ -102,6 +106,10 @@
 #include "hasp_wifi.h"
 #endif
 
+#if HASP_USE_ETHERNET>0
+#include "hasp_ethernet.h"
+#endif
+
 #if HASP_USE_MQTT > 0
 #include "hasp_mqtt.h"
 #endif

platformio.ini

@@ -20,12 +20,11 @@ extra_configs =
     platformio_override.ini
     ; --  Put active [env] files in this dir to be included in the build menu
     user_setups/active/*.ini
+    user_setups/*/*.ini
 
 default_envs =
     ; Uncomment the needed environments in platformio_override.ini
     ; You can also create new environments in in platformio_override.ini
-    DevEBox_STM32F4xx
-    black_f407vg
     ${override.extra_default_envs}
 
 ; -- Location of the configuration files

src/hasp_ethernet.cpp

@@ -53,8 +53,9 @@ void ethernetSetup()
 
     uint8_t * mac;
     mac = Ethernet.MACAddress();
-        Log.notice(F("ETH: MAC Address %x:%x:%x:%x:%x:%x"),*mac,*(mac+1),*(mac+2),*(mac+3),*(mac+4),*(mac+5));
-
+    Log.notice(F("ETH: MAC Address %x:%x:%x:%x:%x:%x"), *mac, *(mac + 1), *(mac + 2), *(mac + 3), *(mac + 4),
+               *(mac + 5));
+#endif
 }
 
 void ethernetLoop(void)
@@ -88,5 +89,4 @@ void ethernetLoop(void)
     }
 }
 
-
 #endif