From 18f37981bbd409db644599040b5c2dd003017e2d Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 12 Sep 2022 07:55:17 -0500
Subject: [PATCH] Spelling and fixing defaults

---
 src/gps/NMEAGPS.cpp            | 4 ++--
 src/mesh/NodeDB.cpp            | 1 +
 src/mesh/NodeDB.h              | 1 +
 src/mesh/RadioInterface.cpp    | 2 ++
 src/modules/PositionModule.cpp | 6 +++---
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/gps/NMEAGPS.cpp b/src/gps/NMEAGPS.cpp
index abba6fe7d..6ce52941a 100644
--- a/src/gps/NMEAGPS.cpp
+++ b/src/gps/NMEAGPS.cpp
@@ -176,8 +176,8 @@ bool NMEAGPS::lookForLocation()
     p.latitude_i = toDegInt(loc.lat);
     p.longitude_i = toDegInt(loc.lng);
 
-    p.altitude_geoidal_seperation = reader.geoidHeight.meters();
-    p.altitude_hae = reader.altitude.meters() + p.altitude_geoidal_seperation;
+    p.altitude_geoidal_separation = reader.geoidHeight.meters();
+    p.altitude_hae = reader.altitude.meters() + p.altitude_geoidal_separation;
     p.altitude = reader.altitude.meters();
 
     p.fix_quality = fixQual;
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 1e1632e47..65f983629 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -183,6 +183,7 @@ void NodeDB::installDefaultConfig()
 
 void NodeDB::initConfigIntervals() 
 {
+    config.position.gps_update_interval = default_gps_update_interval;
     config.position.position_broadcast_secs = default_broadcast_interval_secs;
 
     config.power.ls_secs = default_ls_secs;
diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
index a3e7dcde7..f7afbf774 100644
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -175,6 +175,7 @@ extern NodeDB nodeDB;
 
 #define IF_ROUTER(routerVal, normalVal) ((config.device.role == Config_DeviceConfig_Role_ROUTER) ? (routerVal) : (normalVal))
 
+#define default_gps_update_interval IF_ROUTER(30, 15 * 60)
 #define default_broadcast_interval_secs IF_ROUTER(12 * 60 * 60, 15 * 60)
 #define default_wait_bluetooth_secs IF_ROUTER(1, 60)
 #define default_mesh_sds_timeout_secs IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60)
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 6d35fc283..5f698ec0a 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -414,6 +414,8 @@ void RadioInterface::applyModemConfig()
 
     if (power == 0)
         power = 17; // Default to default power if we don't have a valid power
+
+    loraConfig.tx_power = power;
     
     // Calculate the number of channels
     uint32_t numChannels = floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000)));
diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp
index 39ef08a8e..3858e5a66 100644
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -34,7 +34,7 @@ bool PositionModule::handleReceivedProtobuf(const MeshPacket &mp, Position *pptr
     // Log packet size and list of fields
     DEBUG_MSG("POSITION node=%08x l=%d %s%s%s%s%s%s%s%s%s%s%s%s%s\n", getFrom(&mp), mp.decoded.payload.size,
               p.latitude_i ? "LAT " : "", p.longitude_i ? "LON " : "", p.altitude ? "MSL " : "", p.altitude_hae ? "HAE " : "",
-              p.altitude_geoidal_seperation ? "GEO " : "", p.PDOP ? "PDOP " : "", p.HDOP ? "HDOP " : "", p.VDOP ? "VDOP " : "",
+              p.altitude_geoidal_separation ? "GEO " : "", p.PDOP ? "PDOP " : "", p.HDOP ? "HDOP " : "", p.VDOP ? "VDOP " : "",
               p.sats_in_view ? "SIV " : "", p.fix_quality ? "FXQ " : "", p.fix_type ? "FXT " : "", p.timestamp ? "PTS " : "",
               p.time ? "TIME " : "");
 
@@ -76,8 +76,8 @@ MeshPacket *PositionModule::allocReply()
         else
             p.altitude_hae = node->position.altitude_hae;
 
-        if (pos_flags & Config_PositionConfig_PositionFlags_GEOIDAL_SEPERATION)
-            p.altitude_geoidal_seperation = node->position.altitude_geoidal_seperation;
+        if (pos_flags & Config_PositionConfig_PositionFlags_GEOIDAL_SEPARATION)
+            p.altitude_geoidal_separation = node->position.altitude_geoidal_separation;
     }
 
     if (pos_flags & Config_PositionConfig_PositionFlags_DOP) {