rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-22 18:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

trunk

Browse Source
This commit is contained in:
Jonathan Bennett
2025-08-20 00:25:05 -05:00
parent b8b408b4cb
commit cea989a8f7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,6 @@ void portduinoSetup()
} else if (devID_start == nullptr) { } else if (devID_start == nullptr) {
devID_start = autoconf_product + i + 1; devID_start = autoconf_product + i + 1;
} }
} }
i++; i++;
} }
@@ -305,7 +304,7 @@ void portduinoSetup()
if (strlen(devID_start) == 32) { if (strlen(devID_start) == 32) {
std::string devID_str(devID_start); std::string devID_str(devID_start);
for (int j = 0; j < 16; j++) { for (int j = 0; j < 16; j++) {
portduino_config.device_id[j] = std::stoi(devID_str.substr(j*2, 2), nullptr, 16); portduino_config.device_id[j] = std::stoi(devID_str.substr(j * 2, 2), nullptr, 16);
} }
portduino_config.has_device_id = true; portduino_config.has_device_id = true;
} }

9
src/platform/portduino/PortduinoGlue.h
View File

@@ -11,9 +11,12 @@
// {"PRODUCT_STRING", "CONFIG.YAML"} // {"PRODUCT_STRING", "CONFIG.YAML"}
// YAML paths are relative to `meshtastic/available.d` // YAML paths are relative to `meshtastic/available.d`
inline const std::unordered_map<std::string, std::string> configProducts = { inline const std::unordered_map<std::string, std::string> configProducts = {
{"MESHTOAD", "lora-usb-meshtoad-e22.yaml"}, {"MESHSTICK", "lora-meshstick-1262.yaml"}, {"MESHTOAD", "lora-usb-meshtoad-e22.yaml"},
{"MESHADV-PI", "lora-MeshAdv-900M30S.yaml"}, {"MeshAdv Mini", "lora-MeshAdv-Mini-900M22S.yaml"}, {"MESHSTICK", "lora-meshstick-1262.yaml"},
{"POWERPI", "lora-MeshAdv-900M30S.yaml"}, {"RAK6421-13300-S1", "lora-RAK6421-13300-slot1.yaml"}, {"MESHADV-PI", "lora-MeshAdv-900M30S.yaml"},
{"MeshAdv Mini", "lora-MeshAdv-Mini-900M22S.yaml"},
{"POWERPI", "lora-MeshAdv-900M30S.yaml"},
{"RAK6421-13300-S1", "lora-RAK6421-13300-slot1.yaml"},
{"RAK6421-13300-S2", "lora-RAK6421-13300-slot2.yaml"}}; {"RAK6421-13300-S2", "lora-RAK6421-13300-slot2.yaml"}};
enum configNames { enum configNames {