pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-24 10:19:19 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Initialize dmac array to nulls (#5538)

Browse Source 
* Initialize dmac array to nulls

* Use std::cout for print before console is init.
This commit is contained in:
Jonathan Bennett 2024-12-09 21:51:55 -06:00 committed by Tom Fifield
parent c68a28bf4d
commit ebc2c05394
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/portduino/PortduinoGlue.cpp
View File

@ -86,7 +86,6 @@ void getMacAddr(uint8_t *dmac)
if (optionMac != nullptr && strlen(optionMac) > 0) { if (optionMac != nullptr && strlen(optionMac) > 0) {
if (strlen(optionMac) >= 12) { if (strlen(optionMac) >= 12) {
MAC_from_string(optionMac, dmac); MAC_from_string(optionMac, dmac);
std::cout << optionMac << std::endl;
} else { } else {
uint32_t hwId = sscanf(optionMac, "%u", &hwId); uint32_t hwId = sscanf(optionMac, "%u", &hwId);
dmac[0] = 0x80; dmac[0] = 0x80;
@ -98,7 +97,6 @@ void getMacAddr(uint8_t *dmac)
} }
} else if (settingsStrings[mac_address].length() > 11) { } else if (settingsStrings[mac_address].length() > 11) {
MAC_from_string(settingsStrings[mac_address], dmac); MAC_from_string(settingsStrings[mac_address], dmac);
std::cout << settingsStrings[mac_address] << std::endl;
exit; exit;
} else { } else {
@ -203,14 +201,14 @@ void portduinoSetup()
} }
} }
uint8_t dmac[6]; uint8_t dmac[6] = {0};
getMacAddr(dmac); getMacAddr(dmac);
if (dmac[0] == 0 && dmac[1] == 0 && dmac[2] == 0 && dmac[3] == 0 && dmac[4] == 0 && dmac[5] == 0) { if (dmac[0] == 0 && dmac[1] == 0 && dmac[2] == 0 && dmac[3] == 0 && dmac[4] == 0 && dmac[5] == 0) {
std::cout << "*** Blank MAC Address not allowed!" << std::endl; std::cout << "*** Blank MAC Address not allowed!" << std::endl;
std::cout << "Please set a MAC Address in config.yaml using either MACAddress or MACAddressSource." << std::endl; std::cout << "Please set a MAC Address in config.yaml using either MACAddress or MACAddressSource." << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
printBytes("MAC Address: ", dmac, 6); std::cout << "MAC Address: " << std::hex << +dmac[0] << +dmac[1] << +dmac[2] << +dmac[3] << +dmac[4] << +dmac[5] << std::endl;
// Rather important to set this, if not running simulated. // Rather important to set this, if not running simulated.
randomSeed(time(NULL)); randomSeed(time(NULL));