Set ch341 MAD Address via sprintf formatting (#5713)

pull/5715/head
Jonathan Bennett 2024-12-31 16:06:38 -06:00 zatwierdzone przez GitHub
rodzic fdcc0e12aa
commit 9abd07bb05
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
1 zmienionych plików z 4 dodań i 5 usunięć

Wyświetl plik

@ -18,7 +18,6 @@
#include <fstream>
#include <iostream>
#include <map>
#include <sstream>
#include <sys/ioctl.h>
#include <unistd.h>
@ -232,9 +231,9 @@ void portduinoSetup()
dmac[3] = hash[3];
dmac[4] = hash[4];
dmac[5] = hash[5];
std::stringstream mactmp;
mactmp << std::hex << +dmac[0] << +dmac[1] << +dmac[2] << +dmac[3] << +dmac[4] << +dmac[5];
settingsStrings[mac_address] = mactmp.str();
char macBuf[13] = {0};
sprintf(macBuf, "%02X%02X%02X%02X%02X%02X", dmac[0], dmac[1], dmac[2], dmac[3], dmac[4], dmac[5]);
settingsStrings[mac_address] = macBuf;
}
}
@ -244,7 +243,7 @@ void portduinoSetup()
std::cout << "Please set a MAC Address in config.yaml using either MACAddress or MACAddressSource." << std::endl;
exit(EXIT_FAILURE);
}
std::cout << "MAC Address: " << std::hex << +dmac[0] << +dmac[1] << +dmac[2] << +dmac[3] << +dmac[4] << +dmac[5] << std::endl;
printf("MAC ADDRESS: %02X:%02X:%02X:%02X:%02X:%02X\n", dmac[0], dmac[1], dmac[2], dmac[3], dmac[4], dmac[5]);
// Rather important to set this, if not running simulated.
randomSeed(time(NULL));