andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-08 12:49:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

MAC address setup refactored (for ESPx and DUE - embedded addresses by default)

Browse Source
This commit is contained in:
Andrey Klimov
2019-03-24 01:46:10 +03:00
parent 8b9584f975
commit 8b56ea4378
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
custom-build-flags/build_flags_template.sh
View File

@@ -10,7 +10,7 @@
# export FLAGS="$FLAGS -DSERIAL_BAUD=115200" # export FLAGS="$FLAGS -DSERIAL_BAUD=115200"
# export FLAGS="$FLAGS -DWiz5500" # export FLAGS="$FLAGS -DWiz5500"
# export FLAGS="$FLAGS -DDISABLE_FREERAM_PRINT" # export FLAGS="$FLAGS -DDISABLE_FREERAM_PRINT"
export FLAGS="$FLAGS -DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:ff" # export FLAGS="$FLAGS -DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:ff"
# export FLAGS="$FLAGS -DDMX_DISABLE" # export FLAGS="$FLAGS -DDMX_DISABLE"
# export FLAGS="$FLAGS -DMODBUS_DISABLE" # export FLAGS="$FLAGS -DMODBUS_DISABLE"
# export FLAGS="$FLAGS -DOWIRE_DISABLE" # export FLAGS="$FLAGS -DOWIRE_DISABLE"

42
lighthub/main.cpp
View File

@@ -1010,6 +1010,7 @@ void cmdFunctionIp(int arg_cnt, char **args)
case 1: //dynamic IP case 1: //dynamic IP
saveFlash(OFFSET_IP,ip0); saveFlash(OFFSET_IP,ip0);
debugSerial<<F("Set dynamic IP\n");
/* /*
IPAddress current_ip = Ethernet.localIP(); IPAddress current_ip = Ethernet.localIP();
IPAddress current_mask = Ethernet.subnetMask(); IPAddress current_mask = Ethernet.subnetMask();
@@ -1430,23 +1431,7 @@ void publishStat(){
} }
void setupMacAddress() { void setupMacAddress() {
#if defined(__SAM3X8E__) //Check MAC, stored in NVRAM
byte firmwareMacAddress[6];
firmwareMacAddress[0]=0xDE;
firmwareMacAddress[1]=0xAD;
for (byte b = 0 ; b < 4 ; b++)
firmwareMacAddress[b+2]=UniqueID [b] ;
#else
#ifdef DEFAULT_FIRMWARE_MAC
byte firmwareMacAddress[6] = DEFAULT_FIRMWARE_MAC;//comma(,) separated hex-array, hard-coded
#endif
#endif
#ifdef CUSTOM_FIRMWARE_MAC
byte firmwareMacAddress[6];
const char *macStr = QUOTE(CUSTOM_FIRMWARE_MAC);//colon(:) separated from build options
parseBytes(macStr, ':', firmwareMacAddress, 6, 16);
#endif
bool isMacValid = false; bool isMacValid = false;
for (short i = 0; i < 6; i++) { for (short i = 0; i < 6; i++) {
mac[i] = EEPROM.read(i); mac[i] = EEPROM.read(i);
@@ -1454,8 +1439,29 @@ for (byte b = 0 ; b < 4 ; b++)
} }
if (!isMacValid) { if (!isMacValid) {
debugSerial<<F("No MAC configured: set firmware's MAC\n"); debugSerial<<F("No MAC configured: set firmware's MAC\n");
memcpy(mac, firmwareMacAddress, 6);
#if defined (CUSTOM_FIRMWARE_MAC) //Forced MAC from compiler's directive
const char *macStr = QUOTE(CUSTOM_FIRMWARE_MAC);//colon(:) separated from build options
parseBytes(macStr, ':', mac, 6, 16);
#elif defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
//Using original MPU MAC
WiFi.begin();
WiFi.macAddress(mac);
#elif defined(__SAM3X8E__)
//Lets make MAC from MPU serial#
mac[0]=0xDE;
//firmwareMacAddress[1]=0xAD;
for (byte b = 0 ; b < 5 ; b++)
mac[b+1]=UniqueID [b] ;
#elif defined DEFAULT_FIRMWARE_MAC
uint8_t defaultMac[6] = DEFAULT_FIRMWARE_MAC;//comma(,) separated hex-array, hard-coded
memcpy(mac,defaultMac,6);
#endif
} }
printMACAddress(); printMACAddress();
} }