From cea989a8f7fac19718164092e8ac47ad824e011c Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Wed, 20 Aug 2025 00:25:05 -0500 Subject: [PATCH] trunk --- src/platform/portduino/PortduinoGlue.cpp | 3 +-- src/platform/portduino/PortduinoGlue.h | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index 997471c7d..6bed98ee9 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -290,7 +290,6 @@ void portduinoSetup() } else if (devID_start == nullptr) { devID_start = autoconf_product + i + 1; } - } i++; } @@ -305,7 +304,7 @@ void portduinoSetup() if (strlen(devID_start) == 32) { std::string devID_str(devID_start); 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; } diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h index 40480419a..8c36a1180 100644 --- a/src/platform/portduino/PortduinoGlue.h +++ b/src/platform/portduino/PortduinoGlue.h @@ -11,9 +11,12 @@ // {"PRODUCT_STRING", "CONFIG.YAML"} // YAML paths are relative to `meshtastic/available.d` inline const std::unordered_map configProducts = { - {"MESHTOAD", "lora-usb-meshtoad-e22.yaml"}, {"MESHSTICK", "lora-meshstick-1262.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"}, + {"MESHTOAD", "lora-usb-meshtoad-e22.yaml"}, + {"MESHSTICK", "lora-meshstick-1262.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"}}; enum configNames {