Merge branch 'meshtastic:master' into master

This commit is contained in:
Mictronics 2024-12-14 20:53:56 +01:00 committed by GitHub
commit 8f9c33324b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions

View File

@ -0,0 +1,9 @@
## https://www.mikroe.com/lr-iot-click
Lora:
Module: lr1110 # OpenWRT ONE mikroBUS with LR-IOT-CLICK
# CS: 25
IRQ: 10
Busy: 12
# Reset: 2
spidev: spidev2.0
DIO3_TCXO_VOLTAGE: 1.6

View File

@ -87,7 +87,8 @@ void getMacAddr(uint8_t *dmac)
if (strlen(optionMac) >= 12) { if (strlen(optionMac) >= 12) {
MAC_from_string(optionMac, dmac); MAC_from_string(optionMac, dmac);
} else { } else {
uint32_t hwId = sscanf(optionMac, "%u", &hwId); uint32_t hwId;
sscanf(optionMac, "%u", &hwId);
dmac[0] = 0x80; dmac[0] = 0x80;
dmac[1] = 0; dmac[1] = 0;
dmac[2] = hwId >> 24; dmac[2] = hwId >> 24;
@ -532,4 +533,4 @@ bool MAC_from_string(std::string mac_str, uint8_t *dmac)
} else { } else {
return false; return false;
} }
} }