Merge branch 'dev' into ppr1

# Conflicts: # src/gps/NMEAGPS.cpp
2025-12-30 22:50:57 +00:00 · 2020-10-16 15:59:55 +08:00
parent 5f2f3c94b9 b32e3f1269
commit 22f23bb07d
12 changed files with 251 additions and 130 deletions
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -147,6 +147,7 @@ bool NodeDB::resetRadioConfig()
        radioConfig.preferences.wait_bluetooth_secs = 30;
        radioConfig.preferences.position_broadcast_secs = 6 * 60;
        radioConfig.preferences.ls_secs = 60;
+        radioConfig.preferences.region = RegionCode_TW;
    }

    return didFactoryReset;