jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
arovak 2020-05-06 20:30:40 +02:00
commit d9a79002de
3 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/hasp_conf.h
View File

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

3
platformio.ini
View File

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

6
src/hasp_ethernet.cpp
View File

@ -53,8 +53,9 @@ void ethernetSetup()
uint8_t * mac; uint8_t * mac;
mac = Ethernet.MACAddress(); 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) void ethernetLoop(void)
@ -88,5 +89,4 @@ void ethernetLoop(void)
} }
} }
#endif #endif