Small refactoring

README.md

@@ -23,7 +23,8 @@ Modules, which are used by users and known to work
   - TTGO T-Beam (SX1276)
 
 # Building
-- Update `include/config.h` with your parameters
+- Update `include/config.h` with your radio settings
+  - If you are using lora-aprs iGate (non AX.25) then set `CFG_TEXT_PACKETS` and `CFG_TEXT_PACKETS_3` config parameters to `true` and use APRSDroid TNC2 connection protocol
 - To build for client/tracker mode use `pio run -e esp32dev`
 - To build for iGate mode use `pio run -e esp32dev_igate`
 

include/config.h

@@ -1,3 +1,6 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
 // Uncomment for SX126X module usage
 #define USE_SX126X
 
@@ -113,3 +116,5 @@
 #define CFG_TLM_ENABLE        false   // enable modem battery monitor
 #define CFG_TLM_BAT_MON_PIN   36      // battery ADC pin
 #define CFG_TLM_BAT_MON_CAL   0.37f   // calibration coefficient
+
+#endif // CONFIG_H

include/loraprs_service.h

@@ -123,7 +123,6 @@ private:
 
   // processor config
   const int CfgConnRetryMs = 500;             // connection retry delay, e.g. wifi
-  const int CfgPollDelayMs = 20;              // main loop delay
   const int CfgConnRetryMaxTimes = 10;        // number of connection retries
   const int CfgTelemetryPeriodMs = 60000;     // how often to send telemetry event
 

src/loraprs_service.cpp

@@ -315,7 +315,6 @@ void Service::loop()
   if (config_.TlmEnable) {
     telemetryTimer_.tick();
   }
-  delay(CfgPollDelayMs);
 }
 
 bool Service::isRigRxBusy() {

src/main.cpp

@@ -1,8 +1,5 @@
 #include <arduino-timer.h>
 #include <DebugLog.h>
-#include "WiFi.h"
-
-#include "loraprs_service.h"
 
 #if __has_include("/tmp/esp32_loraprs_config.h")
 #pragma message("Using external config")
@@ -18,6 +15,10 @@
 #pragma message("Configured for server mode")
 #endif
 
+#include "loraprs_service.h"
+
+const int CfgPollDelayMs = 20;              // main loop delay
+
 /*
  * Initialize config from config.h options.
  * Enables future use of EEPROM or allows user to dynamically modify config at run time.
@@ -128,4 +129,5 @@ void setup() {
 void loop() {
   loraPrsService.loop();
   watchdogLedTimer.tick();
+  delay(CfgPollDelayMs);
 }