From 0eff69425b0085e63d0a2aed758d951ffb4f880d Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Thu, 8 Jun 2023 00:58:10 -0400
Subject: [PATCH] digirepeater mods update

---
 src/LoRa_APRS_iGate.cpp | 12 ++++++------
 src/aprs_is_utils.cpp   |  8 ++++----
 src/configuration.h     |  4 ++--
 src/digi_utils.cpp      |  1 -
 src/display.cpp         |  5 ++---
 src/display.h           |  1 +
 src/gps_utils.cpp       |  2 +-
 src/query_utils.cpp     |  2 +-
 src/station_utils.cpp   |  2 +-
 src/utils.cpp           |  1 -
 src/wifi_utils.cpp      |  2 +-
 11 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index b0af43c..0510df3 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -2,16 +2,16 @@
 #include <LoRa.h>
 #include <WiFi.h>
 #include <vector>
-#include "pins_config.h"
 #include "configuration.h"
-#include "display.h"
+#include "aprs_is_utils.h"
+#include "station_utils.h"
+#include "pins_config.h"
+#include "query_utils.h"
 #include "lora_utils.h"
 #include "wifi_utils.h"
-#include "aprs_is_utils.h"
-#include "gps_utils.h"
-#include "station_utils.h"
-#include "query_utils.h"
 #include "digi_utils.h"
+#include "gps_utils.h"
+#include "display.h"
 #include "utils.h"
 /*#include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp
index 7c59665..9302005 100644
--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -1,10 +1,10 @@
-#include "aprs_is_utils.h"
 #include <WiFi.h>
 #include "configuration.h"
-#include "display.h"
-#include "lora_utils.h"
-#include "query_utils.h"
+#include "aprs_is_utils.h"
 #include "station_utils.h"
+#include "query_utils.h"
+#include "lora_utils.h"
+#include "display.h"
 
 extern Configuration  Config;
 extern WiFiClient     espClient;
diff --git a/src/configuration.h b/src/configuration.h
index 577311d..a1a6ca6 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -1,11 +1,11 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
 
+#include <ArduinoJson.h>
 #include <Arduino.h>
 #include <SPIFFS.h>
-#include <FS.h>
-#include <ArduinoJson.h>
 #include <vector>
+#include <FS.h>
 
 
 class WiFi_AP {
diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp
index ec6682f..2957ddd 100644
--- a/src/digi_utils.cpp
+++ b/src/digi_utils.cpp
@@ -3,7 +3,6 @@
 #include "digi_utils.h"
 #include "display.h"
 
-
 extern Configuration    Config;
 extern String           thirdLine;
 extern String           fourthLine;
diff --git a/src/display.cpp b/src/display.cpp
index dae5282..5b37ad8 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -1,9 +1,8 @@
-#include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
+#include <Adafruit_GFX.h>
 #include <Wire.h>
-
-#include "display.h"
 #include "pins_config.h"
+#include "display.h"
 
 Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
 
diff --git a/src/display.h b/src/display.h
index 3dc032c..cea9a55 100644
--- a/src/display.h
+++ b/src/display.h
@@ -1,6 +1,7 @@
 #ifndef DISPLAY_H_
 #define DISPLAY_H_
 
+#include <Arduino.h>
 
 #define SCREEN_WIDTH    128     // OLED display width, in pixels
 #define SCREEN_HEIGHT   32      // OLED display height, in pixels
diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp
index f7faf2e..d12cc32 100644
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -1,5 +1,5 @@
-#include "gps_utils.h"
 #include "configuration.h"
+#include "gps_utils.h"
 
 extern Configuration  Config;
 extern WiFi_AP        *currentWiFi;
diff --git a/src/query_utils.cpp b/src/query_utils.cpp
index 96f70c2..4d6081a 100644
--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -1,5 +1,5 @@
-#include "query_utils.h"
 #include "configuration.h"
+#include "query_utils.h"
 
 extern Configuration        Config;
 extern WiFi_AP              *currentWiFi;
diff --git a/src/station_utils.cpp b/src/station_utils.cpp
index 79ecf02..858d4e7 100644
--- a/src/station_utils.cpp
+++ b/src/station_utils.cpp
@@ -1,6 +1,6 @@
 #include "station_utils.h"
-#include <vector>
 #include "configuration.h"
+#include <vector>
 
 extern Configuration        Config;
 extern std::vector<String>  lastHeardStation;
diff --git a/src/utils.cpp b/src/utils.cpp
index 9aee8fd..8ee293b 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,5 +1,4 @@
 #include <WiFi.h>
-#include <Arduino.h>
 #include "configuration.h"
 #include "wifi_utils.h"
 #include "lora_utils.h"
diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp
index fd7d3bf..98602ae 100644
--- a/src/wifi_utils.cpp
+++ b/src/wifi_utils.cpp
@@ -1,6 +1,6 @@
 #include <WiFi.h>
-#include "wifi_utils.h"
 #include "configuration.h"
+#include "wifi_utils.h"
 #include "display.h"
 
 extern Configuration  Config;