Merge branch 'master' into ESPIDF-Rollup

protobufs

@@ -1 +1 @@
-Subproject commit 3d4c8278311045f4781af7063e9159b3724761d3
+Subproject commit 5e255c01ed8883c9e68d3d4574b300ca609407c5

src/gps/GPS.cpp

@@ -313,9 +313,9 @@ uint32_t GPS::getWakeTime() const
 uint32_t GPS::getSleepTime() const
 {
     uint32_t t = config.position.gps_update_interval;
-    bool gps_disabled = config.position.gps_disabled;
+    bool gps_enabled = config.position.gps_enabled;
 
-    if (gps_disabled)
+    if (!gps_enabled)
         t = UINT32_MAX; // Sleep forever now
 
     if (t == UINT32_MAX)
@@ -467,7 +467,7 @@ GPS *createGps()
 #if !HAS_GPS
     return nullptr;
 #else
-    if (!config.position.gps_disabled) {
+    if (config.position.gps_enabled) {
 #ifdef GPS_ALTITUDE_HAE
         DEBUG_MSG("Using HAE altitude model\n");
 #else

src/gps/NMEAGPS.cpp

@@ -176,7 +176,8 @@ bool NMEAGPS::lookForLocation()
     p.latitude_i = toDegInt(loc.lat);
     p.longitude_i = toDegInt(loc.lng);
 
-    p.altitude_hae = reader.altitude.meters() + reader.geoidHeight.meters();
+    p.altitude_geoidal_seperation = reader.geoidHeight.meters();
+    p.altitude_hae = reader.altitude.meters() + p.altitude_geoidal_seperation;
     p.altitude = reader.altitude.meters();
 
     p.fix_quality = fixQual;

src/main.cpp

@@ -157,7 +157,7 @@ void setup()
 #endif
 
 #ifdef DEBUG_PORT
-    if (!config.device.serial_disabled) {
+    if (!config.has_device || config.device.serial_enabled) {
         consoleInit(); // Set serial baud rate and init our mesh console
     }
 #endif

src/mesh/NodeDB.cpp

@@ -157,9 +157,13 @@ void NodeDB::installDefaultConfig()
     config.has_power = true;
     config.has_network = true;
     config.has_bluetooth = true;
+    config.lora.tx_enabled = true; // FIXME: maybe false in the future, and setting region to enable it. (unset region forces it off)
     config.lora.region = Config_LoRaConfig_RegionCode_UNSET;
     config.lora.modem_preset = Config_LoRaConfig_ModemPreset_LONG_FAST;
     config.lora.hop_limit = HOP_RELIABLE;
+    config.position.gps_enabled = true;
+    config.position.position_broadcast_smart_enabled = true;
+    config.device.serial_enabled = true;
     resetRadioConfig();
     strncpy(config.network.ntp_server, "0.pool.ntp.org", 32);
     // FIXME: Default to bluetooth capability of platform as default

src/mesh/RadioLibInterface.cpp

@@ -121,10 +121,10 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 #ifndef DISABLE_WELCOME_UNSET
 
     if (config.lora.region != Config_LoRaConfig_RegionCode_UNSET) {
-        if (disabled || config.lora.tx_disabled) {
+        if (disabled || !config.lora.tx_enabled) {
 
             if (config.lora.region != Config_LoRaConfig_RegionCode_UNSET) {
-                if (disabled || config.lora.tx_disabled) {
+                if (disabled || !config.lora.tx_enabled) {
                     DEBUG_MSG("send - lora_tx_disabled\n");
                     packetPool.release(p);
                     return ERRNO_DISABLED;
@@ -381,7 +381,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
     void RadioLibInterface::startSend(MeshPacket * txp)
     {
         printPacket("Starting low level send", txp);
-        if (disabled || config.lora.tx_disabled) {
+        if (disabled || !config.lora.tx_enabled) {
             DEBUG_MSG("startSend is dropping tx packet because we are disabled\n");
             packetPool.release(txp);
         } else {

src/mesh/generated/apponly.pb.h

@@ -54,7 +54,7 @@ extern const pb_msgdesc_t ChannelSet_msg;
 #define ChannelSet_fields &ChannelSet_msg
 
 /* Maximum encoded size of messages (where known) */
-#define ChannelSet_size                          557
+#define ChannelSet_size                          559
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/config.pb.h

@@ -87,7 +87,7 @@ typedef struct _Config_BluetoothConfig {
 
 typedef struct _Config_DeviceConfig { 
     Config_DeviceConfig_Role role;
-    bool serial_disabled;
+    bool serial_enabled;
     bool debug_log_enabled;
 } Config_DeviceConfig;
 
@@ -99,7 +99,7 @@ typedef struct _Config_DisplayConfig {
 } Config_DisplayConfig;
 
 typedef struct _Config_LoRaConfig { 
-    int32_t tx_power;
+    bool use_preset;
     Config_LoRaConfig_ModemPreset modem_preset;
     uint32_t bandwidth;
     uint32_t spread_factor;
@@ -107,7 +107,8 @@ typedef struct _Config_LoRaConfig {
     float frequency_offset;
     Config_LoRaConfig_RegionCode region;
     uint32_t hop_limit;
-    bool tx_disabled;
+    bool tx_enabled;
+    int32_t tx_power;
     pb_size_t ignore_incoming_count;
     uint32_t ignore_incoming[3];
 } Config_LoRaConfig;
@@ -122,9 +123,9 @@ typedef struct _Config_NetworkConfig {
 
 typedef struct _Config_PositionConfig { 
     uint32_t position_broadcast_secs;
-    bool position_broadcast_smart_disabled;
+    bool position_broadcast_smart_enabled;
     bool fixed_position;
-    bool gps_disabled;
+    bool gps_enabled;
     uint32_t gps_update_interval;
     uint32_t gps_attempt_time;
     uint32_t position_flags;
@@ -196,7 +197,7 @@ extern "C" {
 #define Config_PowerConfig_init_default          {0, 0, 0, 0, 0, 0, 0, 0}
 #define Config_NetworkConfig_init_default        {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", ""}
 #define Config_DisplayConfig_init_default        {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0}
-#define Config_LoRaConfig_init_default           {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, {0, 0, 0}}
+#define Config_LoRaConfig_init_default           {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, {0, 0, 0}}
 #define Config_BluetoothConfig_init_default      {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
 #define Config_init_zero                         {0, {Config_DeviceConfig_init_zero}}
 #define Config_DeviceConfig_init_zero            {_Config_DeviceConfig_Role_MIN, 0, 0}
@@ -204,7 +205,7 @@ extern "C" {
 #define Config_PowerConfig_init_zero             {0, 0, 0, 0, 0, 0, 0, 0}
 #define Config_NetworkConfig_init_zero           {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", ""}
 #define Config_DisplayConfig_init_zero           {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0}
-#define Config_LoRaConfig_init_zero              {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, {0, 0, 0}}
+#define Config_LoRaConfig_init_zero              {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, {0, 0, 0}}
 #define Config_BluetoothConfig_init_zero         {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
@@ -212,13 +213,13 @@ extern "C" {
 #define Config_BluetoothConfig_mode_tag          2
 #define Config_BluetoothConfig_fixed_pin_tag     3
 #define Config_DeviceConfig_role_tag             1
-#define Config_DeviceConfig_serial_disabled_tag  2
+#define Config_DeviceConfig_serial_enabled_tag   2
 #define Config_DeviceConfig_debug_log_enabled_tag 3
 #define Config_DisplayConfig_screen_on_secs_tag  1
 #define Config_DisplayConfig_gps_format_tag      2
 #define Config_DisplayConfig_auto_screen_carousel_secs_tag 3
 #define Config_DisplayConfig_compass_north_top_tag 4
-#define Config_LoRaConfig_tx_power_tag           1
+#define Config_LoRaConfig_use_preset_tag         1
 #define Config_LoRaConfig_modem_preset_tag       2
 #define Config_LoRaConfig_bandwidth_tag          3
 #define Config_LoRaConfig_spread_factor_tag      4
@@ -226,7 +227,8 @@ extern "C" {
 #define Config_LoRaConfig_frequency_offset_tag   6
 #define Config_LoRaConfig_region_tag             7
 #define Config_LoRaConfig_hop_limit_tag          8
-#define Config_LoRaConfig_tx_disabled_tag        9
+#define Config_LoRaConfig_tx_enabled_tag         9
+#define Config_LoRaConfig_tx_power_tag           10
 #define Config_LoRaConfig_ignore_incoming_tag    103
 #define Config_NetworkConfig_wifi_enabled_tag    1
 #define Config_NetworkConfig_wifi_mode_tag       2
@@ -234,9 +236,9 @@ extern "C" {
 #define Config_NetworkConfig_wifi_psk_tag        4
 #define Config_NetworkConfig_ntp_server_tag      5
 #define Config_PositionConfig_position_broadcast_secs_tag 1
-#define Config_PositionConfig_position_broadcast_smart_disabled_tag 2
+#define Config_PositionConfig_position_broadcast_smart_enabled_tag 2
 #define Config_PositionConfig_fixed_position_tag 3
-#define Config_PositionConfig_gps_disabled_tag   4
+#define Config_PositionConfig_gps_enabled_tag    4
 #define Config_PositionConfig_gps_update_interval_tag 5
 #define Config_PositionConfig_gps_attempt_time_tag 6
 #define Config_PositionConfig_position_flags_tag 7
@@ -277,16 +279,16 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,bluetooth,payload_variant.bl
 
 #define Config_DeviceConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UENUM,    role,              1) \
-X(a, STATIC,   SINGULAR, BOOL,     serial_disabled,   2) \
+X(a, STATIC,   SINGULAR, BOOL,     serial_enabled,    2) \
 X(a, STATIC,   SINGULAR, BOOL,     debug_log_enabled,   3)
 #define Config_DeviceConfig_CALLBACK NULL
 #define Config_DeviceConfig_DEFAULT NULL
 
 #define Config_PositionConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   position_broadcast_secs,   1) \
-X(a, STATIC,   SINGULAR, BOOL,     position_broadcast_smart_disabled,   2) \
+X(a, STATIC,   SINGULAR, BOOL,     position_broadcast_smart_enabled,   2) \
 X(a, STATIC,   SINGULAR, BOOL,     fixed_position,    3) \
-X(a, STATIC,   SINGULAR, BOOL,     gps_disabled,      4) \
+X(a, STATIC,   SINGULAR, BOOL,     gps_enabled,       4) \
 X(a, STATIC,   SINGULAR, UINT32,   gps_update_interval,   5) \
 X(a, STATIC,   SINGULAR, UINT32,   gps_attempt_time,   6) \
 X(a, STATIC,   SINGULAR, UINT32,   position_flags,    7)
@@ -323,7 +325,7 @@ X(a, STATIC,   SINGULAR, BOOL,     compass_north_top,   4)
 #define Config_DisplayConfig_DEFAULT NULL
 
 #define Config_LoRaConfig_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, INT32,    tx_power,          1) \
+X(a, STATIC,   SINGULAR, BOOL,     use_preset,        1) \
 X(a, STATIC,   SINGULAR, UENUM,    modem_preset,      2) \
 X(a, STATIC,   SINGULAR, UINT32,   bandwidth,         3) \
 X(a, STATIC,   SINGULAR, UINT32,   spread_factor,     4) \
@@ -331,7 +333,8 @@ X(a, STATIC,   SINGULAR, UINT32,   coding_rate,       5) \
 X(a, STATIC,   SINGULAR, FLOAT,    frequency_offset,   6) \
 X(a, STATIC,   SINGULAR, UENUM,    region,            7) \
 X(a, STATIC,   SINGULAR, UINT32,   hop_limit,         8) \
-X(a, STATIC,   SINGULAR, BOOL,     tx_disabled,       9) \
+X(a, STATIC,   SINGULAR, BOOL,     tx_enabled,        9) \
+X(a, STATIC,   SINGULAR, INT32,    tx_power,         10) \
 X(a, STATIC,   REPEATED, UINT32,   ignore_incoming, 103)
 #define Config_LoRaConfig_CALLBACK NULL
 #define Config_LoRaConfig_DEFAULT NULL
@@ -366,7 +369,7 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg;
 #define Config_BluetoothConfig_size              10
 #define Config_DeviceConfig_size                 6
 #define Config_DisplayConfig_size                16
-#define Config_LoRaConfig_size                   67
+#define Config_LoRaConfig_size                   69
 #define Config_NetworkConfig_size                137
 #define Config_PositionConfig_size               30
 #define Config_PowerConfig_size                  43

src/mesh/generated/localonly.pb.h

@@ -144,7 +144,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
 #define LocalModuleConfig_fields &LocalModuleConfig_msg
 
 /* Maximum encoded size of messages (where known) */
-#define LocalConfig_size                         330
+#define LocalConfig_size                         332
 #define LocalModuleConfig_size                   270
 
 #ifdef __cplusplus

src/modules/Modules.cpp

@@ -19,11 +19,13 @@
 #endif
 #ifdef ARCH_ESP32
 #include "modules/esp32/RangeTestModule.h"
-#include "modules/esp32/SerialModule.h"
 #include "modules/esp32/StoreForwardModule.h"
 #endif
 #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
 #include "modules/ExternalNotificationModule.h"
+#if !defined(TTGO_T_ECHO)
+#include "modules/SerialModule.h"
+#endif
 #endif
 /**
  * Create module instances here.  If you are adding a new module, you must 'new' it here (or somewhere else)

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.PDOP ? "PDOP " : "", p.HDOP ? "HDOP " : "", p.VDOP ? "VDOP " : "",
+              p.altitude_geoidal_seperation ? "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 " : "");
 
@@ -75,6 +75,9 @@ MeshPacket *PositionModule::allocReply()
             p.altitude = node->position.altitude;
         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_DOP) {
@@ -148,7 +151,7 @@ int32_t PositionModule::runOnce()
             DEBUG_MSG("Channel utilization is >40 percent. Skipping this opportunity to send.\n");
         }
 
-    } else if (!config.position.position_broadcast_smart_disabled) {
+    } else if (config.position.position_broadcast_smart_enabled) {
 
         // Only send packets if the channel is less than 25% utilized.
         if (airTime->channelUtilizationPercent() < 25) {

src/modules/SerialModule.cpp

@@ -69,8 +69,7 @@ SerialModuleRadio::SerialModuleRadio() : SinglePortModule("SerialModuleRadio", P
 
 int32_t SerialModule::runOnce()
 {
-#ifdef ARCH_ESP32
+#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO)
-
     /*
         Uncomment the preferences below if you want to use the module
         without having to configure it from the PythonAPI or WebUI.
@@ -140,22 +139,29 @@ int32_t SerialModule::runOnce()
                 baud = 921600;
             }
 
+#ifdef ARCH_ESP32
             if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
                 Serial2.begin(baud, SERIAL_8N1, moduleConfig.serial.rxd, moduleConfig.serial.txd);
 
             } else {
                 Serial2.begin(baud, SERIAL_8N1, RXD2, TXD2);
             }
+#else
+            if (moduleConfig.serial.rxd && moduleConfig.serial.txd)
+                Serial2.setPins(moduleConfig.serial.rxd, moduleConfig.serial.txd);
 
+            Serial2.begin(baud, SERIAL_8N1);
+
+#endif
             if (moduleConfig.serial.timeout) {
-                Serial2.setTimeout(
+                Serial2.setTimeout(moduleConfig.serial.timeout); // Number of MS to wait to set the timeout for the string.
-                    moduleConfig.serial.timeout); // Number of MS to wait to set the timeout for the string.
-
             } else {
                 Serial2.setTimeout(TIMEOUT); // Number of MS to wait to set the timeout for the string.
             }
 
+#ifdef ARCH_ESP32 
             Serial2.setRxBufferSize(RX_BUFFER);
+#endif
 
             serialModuleRadio = new SerialModuleRadio();
 
@@ -209,8 +215,7 @@ void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 
 ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp)
 {
-#ifdef ARCH_ESP32
+#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO)
-
     if (moduleConfig.serial.enabled) {
 
         auto &p = mp.decoded;
@@ -244,6 +249,7 @@ ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp)
                 Serial2.printf("%s", p.payload.bytes);
 
             } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_PROTO) {
+                // TODO this needs to be implemented
             }
         }