pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-06 13:48:29 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

revert serial reading

Browse Source
This commit is contained in:
Patrick Siegl 2025-01-14 19:55:13 +01:00
parent 53e15663e3
commit f721f302fb
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,7 @@ void portduinoSetup()
} }
} }
// if we're using a usermode driver, we need to initialize it here, to get a serial number back for mac address // if we're using a usermode driver, we need to initialize it here, to get a serial number back for mac address
uint8_t dmac[6] = {0};
if (settingsStrings[spidev] == "ch341") { if (settingsStrings[spidev] == "ch341") {
try { try {
ch341Hal = ch341Hal =
@ -207,15 +208,21 @@ void portduinoSetup()
ch341Hal->getSerialString(serial, 8); ch341Hal->getSerialString(serial, 8);
std::cout << "Serial " << serial << std::endl; std::cout << "Serial " << serial << std::endl;
if (strlen(serial) == 8 && settingsStrings[mac_address].length() < 12) { if (strlen(serial) == 8 && settingsStrings[mac_address].length() < 12) {
uint8_t *hash = (uint8_t *)serial; uint8_t hash[32] = {0};
memcpy(hash, serial, 8);
crypto->hash(hash, 8); crypto->hash(hash, 8);
dmac[0] = (hash[0] << 4) | 2;
dmac[1] = hash[1];
dmac[2] = hash[2];
dmac[3] = hash[3];
dmac[4] = hash[4];
dmac[5] = hash[5];
char macBuf[13] = {0}; char macBuf[13] = {0};
sprintf(macBuf, "%02X%02X%02X%02X%02X%02X", ((hash[0] << 4) | 2), hash[1], hash[2], hash[3], hash[4], hash[5]); sprintf(macBuf, "%02X%02X%02X%02X%02X%02X", dmac[0], dmac[1], dmac[2], dmac[3], dmac[4], dmac[5]);
settingsStrings[mac_address] = macBuf; settingsStrings[mac_address] = macBuf;
} }
} }
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;