Small refactoring

include/loraprs_service.h

@@ -46,7 +46,8 @@ private:
   bool reconnectAprsis();
   void attachKissNetworkClient();
 
-  bool isRigRxBusy() const;
+  inline bool isRigRxBusy() const { return config_.LoraUseCad && rigIsRxActive_; }
+
   void onRigTaskRxPacket();
   void onRigTaskTxPacket();
   static void rigTask(void *self);
@@ -84,6 +85,9 @@ private:
     return config_.LoraFreqRx != config_.LoraFreqTx;
   }
 
+  inline int getSpeed(int sf, int cr, long bw) const { return (int)(sf * (4.0 / cr) / (pow(2.0, sf) / bw)); }
+  float getSnrLimit(int sf, long bw) const;
+
 protected:
   virtual bool onRigTxBegin() override;
   virtual void onRigTx(byte b) override;

src/loraprs_service.cpp

@@ -41,8 +41,6 @@ void Service::setup(const Config &conf)
     LOG_SET_LEVEL(config_.LogLevel);
   }
 
-  printConfig();
-  
   // KISS extensions are disabled in TNC2 mode
   if (disableKiss_) {
     LOG_INFO("KISS extensions are disabled in TNC2 mode");
@@ -188,24 +186,8 @@ bool Service::reconnectAprsis()
   return true;
 }
 
-void Service::setupRig(long loraFreq, long bw, int sf, int cr, int pwr, int sync, int crcBytes, bool isExplicit)
+float Service::getSnrLimit(int sf, long bw) const
 {
-  rigIsImplicitMode_ = !isExplicit;
-  rigIsImplicitMode_ = sf == 6;      // must be implicit for SF6
-  int loraSpeed = (int)(sf * (4.0 / cr) / (pow(2.0, sf) / bw));
-        
-  LOG_INFO("Initializing LoRa");
-  LOG_INFO("Frequency:", loraFreq, "Hz");
-  LOG_INFO("Bandwidth:", bw, "Hz");
-  LOG_INFO("Spreading:", sf);
-  LOG_INFO("Coding rate:", cr);
-  LOG_INFO("Power:", pwr, "dBm");
-  LOG_INFO("Sync:", "0x" + String(sync, HEX));
-  LOG_INFO("CRC:", crcBytes);
-  LOG_INFO("Header:", rigIsImplicitMode_ ? "implicit" : "explicit");
-  LOG_INFO("Speed:", loraSpeed, "bps");
-  LOG_INFO("TOA (compressed):", 37.0 / ((double)loraSpeed / 8.0), "sec");
-  LOG_INFO("TOA (uncompressed):", 64.0 / ((double)loraSpeed / 8.0), "sec");
   float snrLimit = -7;
   switch (sf) {
     case 7:
@@ -227,7 +209,30 @@ void Service::setupRig(long loraFreq, long bw, int sf, int cr, int pwr, int sync
         snrLimit = -20.0;
         break;
   }
-  LOG_INFO("Min level:", -174 + 10 * log10(bw) + 6 + snrLimit, "dBm");
+  return -174 + 10 * log10(bw) + 6 + snrLimit;
+}
+
+void Service::setupRig(long loraFreq, long bw, int sf, int cr, int pwr, int sync, int crcBytes, bool isExplicit)
+{
+  rigIsImplicitMode_ = !isExplicit;
+  rigIsImplicitMode_ = sf == 6;      // must be implicit for SF6
+  int loraSpeed = getSpeed(sf, cr, bw);
+        
+  LOG_INFO("Initializing LoRa");
+  LOG_INFO("Frequency:", loraFreq, "Hz");
+  LOG_INFO("Bandwidth:", bw, "Hz");
+  LOG_INFO("Spreading:", sf);
+  LOG_INFO("Coding rate:", cr);
+  LOG_INFO("Power:", pwr, "dBm");
+  LOG_INFO("Sync:", "0x" + String(sync, HEX));
+  LOG_INFO("CRC:", crcBytes);
+  LOG_INFO("Header:", rigIsImplicitMode_ ? "implicit" : "explicit");
+  LOG_INFO("Speed:", loraSpeed, "bps");
+  LOG_INFO("TOA (compressed): ~", 37.0 / ((double)loraSpeed / 8.0), "sec");
+  LOG_INFO("TOA (uncompressed): ~", 64.0 / ((double)loraSpeed / 8.0), "sec");
+  LOG_INFO("Min level:", getSnrLimit(sf, bw), "dBm");
+  printConfig();
+
   rig_ = std::make_shared<MODULE_NAME>(new Module(config_.LoraPinSs, config_.LoraPinA, config_.LoraPinRst, config_.LoraPinB));
   int state = rig_->begin((float)loraFreq / 1e6, (float)bw / 1e3, sf, cr, sync, pwr);
   if (state != RADIOLIB_ERR_NONE) {
@@ -282,31 +287,34 @@ void Service::setupBt(const String &btName)
 
 void Service::loop()
 { 
+  // wifi connectivity check
   if (needsWifi() && WiFi.status() != WL_CONNECTED) {
     reconnectWifi();
   }
+  // aprs connectivity check
   if (needsAprsis() && !aprsisConnection_.connected() && config_.EnablePersistentAprsConnection) {
     reconnectAprsis();
   }
+  // tcp/ip kiss client connectivity check
   if (config_.KissEnableTcpIp) {
     attachKissNetworkClient();
   }
 
   // RX path, Rig -> Serial
-  bool isRigToSerialProcessed = false;
-  isRigToSerialProcessed = processRigToSerial();
-
-  // TX path, Serial -> Rig
-  if (!isRigToSerialProcessed) {
+  if (!processRigToSerial()) {
 
+    // TX path, Serial -> Rig
     long currentTime = millis();
     if (!isRigRxBusy() && currentTime > csmaSlotTimePrev_ + csmaSlotTime_ && random(0, 255) < csmaP_) {
+      // new data from aprsis
       if (aprsisConnection_.available() > 0) {
         onAprsisDataAvailable();
       }
+      // periodic beacon
       if (needsBeacon()) {
         sendPeriodicBeacon();
       }
+      // tx if data available
       processSerialToRig();
       csmaSlotTimePrev_ = currentTime;
     }
@@ -318,10 +326,6 @@ void Service::loop()
   }
 }
 
-bool Service::isRigRxBusy() const {
-  return config_.LoraUseCad && rigIsRxActive_;
-}
-
 ICACHE_RAM_ATTR void Service::onRigIsrRxPacket() {
   BaseType_t xHigherPriorityTaskWoken;
   if (rigIsRxIsrEnabled_) {