From e3196d47367fcff531bd8cf00ceeb1268c6e13dc Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:38:52 +0200
Subject: [PATCH] Small refactoring

---
 include/config.h          | 5 +++++
 include/loraprs_service.h | 1 -
 src/loraprs_service.cpp   | 1 -
 src/main.cpp              | 8 +++++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/config.h b/include/config.h
index 16fef64..3c5810f 100644
--- a/include/config.h
+++ b/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
\ No newline at end of file
diff --git a/include/loraprs_service.h b/include/loraprs_service.h
index b5325b3..ef903e4 100644
--- a/include/loraprs_service.h
+++ b/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
 
diff --git a/src/loraprs_service.cpp b/src/loraprs_service.cpp
index c421549..beb1a3c 100644
--- a/src/loraprs_service.cpp
+++ b/src/loraprs_service.cpp
@@ -315,7 +315,6 @@ void Service::loop()
   if (config_.TlmEnable) {
     telemetryTimer_.tick();
   }
-  delay(CfgPollDelayMs);
 }
 
 bool Service::isRigRxBusy() {
diff --git a/src/main.cpp b/src/main.cpp
index a01b365..17fafa6 100644
--- a/src/main.cpp
+++ b/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);
 }