cleanup applyModemConfig based on porduino testing, share with sim

docs/software/TODO.md

@@ -4,6 +4,8 @@ You probably don't care about this section - skip to the next one.
 
 ## before next release
 
+* don't store User admin or position broadcasts in the ToPhone queue
+* DONE tcp stream problem in python+pordtuino, server thinks client dropped when client DID NOT DROP
 * TCP mode for android, localhost is at 10.0.2.2
 * make sure USB still works in android
 * add portduino builds to zip

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = tbeam
+;default_envs = tbeam
 ;default_envs = tbeam0.7
 ;default_envs = heltec
 ;default_envs = tlora-v1
@@ -18,7 +18,7 @@ default_envs = tbeam
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = eink
 ;default_envs = nrf52840dk-geeksville
-;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
+default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
 
 [common]
 ; common is not currently used

src/mesh/RF95Interface.cpp

@@ -36,8 +36,6 @@ bool RF95Interface::init()
 {
     RadioLibInterface::init();
 
-    applyModemConfig();
-
     if (power == 0)
         power = POWER_DEFAULT;
 
@@ -86,24 +84,25 @@ void INTERRUPT_ATTR RF95Interface::disableInterrupt()
     lora->clearDio0Action();
 }
 
-
-
 bool RF95Interface::reconfigure()
 {
-    applyModemConfig();
+    RadioLibInterface::reconfigure();
 
     // set mode to standby
     setStandby();
 
     // configure publicly accessible settings
     int err = lora->setSpreadingFactor(sf);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora->setBandwidth(bw);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora->setCodingRate(cr);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora->setSyncWord(syncWord);
     assert(err == ERR_NONE);
@@ -115,12 +114,14 @@ bool RF95Interface::reconfigure()
     assert(err == ERR_NONE);
 
     err = lora->setFrequency(freq);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     if (power > MAX_POWER) // This chip has lower power limits than some
         power = MAX_POWER;
     err = lora->setOutputPower(power);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     startReceive(); // restart receiving
 

src/mesh/RadioInterface.cpp

@@ -1,12 +1,12 @@
 
-#include "configuration.h"
 #include "RadioInterface.h"
 #include "Channels.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "assert.h"
 #include "Router.h"
+#include "assert.h"
+#include "configuration.h"
 #include "sleep.h"
 #include <assert.h>
 #include <pb_decode.h>
@@ -31,8 +31,8 @@ const RegionInfo regions[] = {
 
 /* Notes about the RU bandplan (from @denis-d in https://meshtastic.discourse.group/t/russian-band-plan-proposal/2786/2):
 
-According to Annex 12 to GKRCh (National Radio Frequency Commission) decision № 18-46-03-1 (September 11th 2018) https://digital.gov.ru/uploaded/files/prilozhenie-12-k-reshenyu-gkrch-18-46-03-1.pdf 1
-We have 3 options for 868 MHz:
+According to Annex 12 to GKRCh (National Radio Frequency Commission) decision № 18-46-03-1 (September 11th 2018)
+https://digital.gov.ru/uploaded/files/prilozhenie-12-k-reshenyu-gkrch-18-46-03-1.pdf 1 We have 3 options for 868 MHz:
 
 864,0 - 865,0 MHz ERP 25mW, Duty Cycle 0.1% (3.6 sec in hour) or LBT (Listen Before Talk), prohibited in airports.
 866,0 - 868,0 MHz ERP 25mW, Duty Cycle 1% or LBT, PSD (Power Spectrum Density) 1000mW/MHz, prohibited in airports
@@ -153,7 +153,7 @@ void printPacket(const char *prefix, const MeshPacket *p)
         if (s.dest != 0)
             DEBUG_MSG(" dest=%08x", s.dest);
 
-        if(s.request_id)
+        if (s.request_id)
             DEBUG_MSG(" requestId=%0x", s.request_id);
 
         /* now inside Data and therefore kinda opaque
@@ -185,6 +185,12 @@ RadioInterface::RadioInterface()
     // DEBUG_MSG("Set meshradio defaults name=%s\n", channelSettings.name);
 }
 
+bool RadioInterface::reconfigure()
+{
+    applyModemConfig();
+    return true;
+}
+
 bool RadioInterface::init()
 {
     DEBUG_MSG("Starting meshradio init...\n");
@@ -197,6 +203,8 @@ bool RadioInterface::init()
     // radioIf.setThisAddress(nodeDB.getNodeNum()); // Note: we must do this here, because the nodenum isn't inited at constructor
     // time.
 
+    applyModemConfig();
+
     return true;
 }
 

src/mesh/RadioInterface.h

@@ -104,7 +104,11 @@ class RadioInterface
     virtual bool sleep() { return true; }
 
     /// Disable this interface (while disabled, no packets can be sent or received)
-    void disable() { disabled = true; sleep(); }
+    void disable()
+    {
+        disabled = true;
+        sleep();
+    }
 
     /**
      * Send a packet (possibly by enquing in a private fifo).  This routine will
@@ -126,7 +130,7 @@ class RadioInterface
     /// Apply any radio provisioning changes
     /// Make sure the Driver is properly configured before calling init().
     /// \return true if initialisation succeeded.
-    virtual bool reconfigure() = 0;
+    virtual bool reconfigure();
 
     /** The delay to use for retransmitting dropped packets */
     uint32_t getRetransmissionMsec(const MeshPacket *p);
@@ -174,13 +178,6 @@ class RadioInterface
      */
     void limitPower();
 
-    /**
-     * Convert our modemConfig enum into wf, sf, etc...
-     *
-     * These paramaters will be pull from the channelSettings global
-     */
-    virtual void applyModemConfig();
-
     /**
      * Save the frequency we selected for later reuse.
      */
@@ -192,6 +189,13 @@ class RadioInterface
     virtual void saveChannelNum(uint32_t savedChannelNum);
 
   private:
+    /**
+     * Convert our modemConfig enum into wf, sf, etc...
+     *
+     * These paramaters will be pull from the channelSettings global
+     */
+    void applyModemConfig();
+
     /// Return 0 if sleep is okay
     int preflightSleepCb(void *unused = NULL) { return canSleep() ? 0 : 1; }
 
@@ -215,11 +219,6 @@ class SimRadio : public RadioInterface
     /// Make sure the Driver is properly configured before calling init().
     /// \return true if initialisation succeeded.
     virtual bool init() { return true; }
-
-    /// Apply any radio provisioning changes
-    /// Make sure the Driver is properly configured before calling init().
-    /// \return true if initialisation succeeded.
-    virtual bool reconfigure() { return true; }
 };
 
 /// Debug printing for packets

src/mesh/SX1262Interface.cpp

@@ -23,8 +23,6 @@ bool SX1262Interface::init()
     pinMode(SX1262_POWER_EN, OUTPUT);
 #endif
 
-    RadioLibInterface::init();
-
 #ifdef SX1262_RXEN                  // set not rx or tx mode
     digitalWrite(SX1262_RXEN, LOW); // Set low before becoming an output
     pinMode(SX1262_RXEN, OUTPUT);
@@ -38,11 +36,11 @@ bool SX1262Interface::init()
     float tcxoVoltage = 0; // None - we use an XTAL
 #else
     // Use DIO3 to power tcxo per https://github.com/jgromes/RadioLib/issues/12#issuecomment-520695575
-    float tcxoVoltage = 1.8; 
+    float tcxoVoltage = 1.8;
 #endif
     bool useRegulatorLDO = false; // Seems to depend on the connection to pin 9/DCC_SW - if an inductor DCDC?
 
-    applyModemConfig();
+    RadioLibInterface::init();
 
     if (power == 0)
         power = SX1262_MAX_POWER;
@@ -72,20 +70,23 @@ bool SX1262Interface::init()
 
 bool SX1262Interface::reconfigure()
 {
-    applyModemConfig();
+    RadioLibInterface::reconfigure();
 
     // set mode to standby
     setStandby();
 
     // configure publicly accessible settings
     int err = lora.setSpreadingFactor(sf);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora.setBandwidth(bw);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora.setCodingRate(cr);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     // Hmm - seems to lower SNR when the signal levels are high.  Leaving off for now...
     err = lora.setRxGain(true);
@@ -101,7 +102,8 @@ bool SX1262Interface::reconfigure()
     assert(err == ERR_NONE);
 
     err = lora.setFrequency(freq);
-    if(err != ERR_NONE) recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
+    if (err != ERR_NONE)
+        recordCriticalError(CriticalErrorCode_InvalidRadioSetting);
 
     if (power > 22) // This chip has lower power limits than some
         power = 22;