From 414b31d9b81664b6015ca3d42fbc45cd6572be84 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Sun, 25 Feb 2024 10:53:16 -0300 Subject: [PATCH] minor cosmetic in text --- README.md | 5 +++-- src/LoRa_APRS_iGate.cpp | 2 +- src/aprs_is_utils.h | 1 + src/battery_utils.h | 1 + src/bme_utils.h | 1 + src/configuration.h | 2 +- src/digi_utils.h | 1 + src/display.h | 1 + src/gps_utils.h | 1 + src/lora_utils.h | 1 + src/ota_utils.h | 3 ++- src/power_utils.h | 1 + src/query_utils.h | 1 + src/station_utils.h | 1 + src/syslog_utils.h | 1 + src/utils.h | 1 + src/wifi_utils.h | 2 +- 17 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a018063..7a9400b 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ In all configurations the display shows the current stationMode, heard packets a But under the hood is much more: +- Web Configuration UI. - Sending events to remote syslog server. - OTA update capability (for Firmware and Filesystem). - RX first, TX will only be done if there is no traffic on the frequency. @@ -31,8 +32,7 @@ But under the hood is much more: - support for BME/BMP280 and BME680 sensors, sending to WX data to APRS-IS. and more will come: -- Web-UI -- ... +- More Web UI Station Information ____________________________________________________ @@ -51,6 +51,7 @@ ____________________________________________________ ____________________________________________________ ## Timeline (Versions): +- 2024.02.25 New Web Configuration UI with WiFi AP (thanks Damian SQ2CPA). - 2023.01.28 Updated to ElegantOTA v.3 (AsyncElegantOTA was deprecated). - 2024.01.19 TextSerialOutputForApp added to get text from Serial-Output over USB into PC for PinPoint App (https://www.pinpointaprs.com) and APRSIS32 App (http://aprsisce.wikidot.com) - 2024.01.12 Added iGate Mode to also repeat packets (like a iGate+DigiRepeater) in stationMode 2 and 5. diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 6d03f0d..0a2ff0d 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -21,7 +21,7 @@ Configuration Config; WiFiClient espClient; -String versionDate = "2024.02.23"; +String versionDate = "2024.02.25"; int myWiFiAPIndex = 0; int myWiFiAPSize = Config.wifiAPs.size(); WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex]; diff --git a/src/aprs_is_utils.h b/src/aprs_is_utils.h index a647800..814419f 100644 --- a/src/aprs_is_utils.h +++ b/src/aprs_is_utils.h @@ -10,6 +10,7 @@ - APRSIS32 App ( http://aprsisce.wikidot.com ) */ + namespace APRS_IS_Utils { void upload(String line); diff --git a/src/battery_utils.h b/src/battery_utils.h index 175268f..1e5ee1a 100644 --- a/src/battery_utils.h +++ b/src/battery_utils.h @@ -3,6 +3,7 @@ #include + namespace BATTERY_Utils { float checkBattery(); diff --git a/src/bme_utils.h b/src/bme_utils.h index 4627235..3d7a40c 100644 --- a/src/bme_utils.h +++ b/src/bme_utils.h @@ -18,6 +18,7 @@ #include #endif + namespace BME_Utils { void setup(); diff --git a/src/configuration.h b/src/configuration.h index 04ee554..d7011be 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -73,9 +73,9 @@ public: + class Configuration { public: - String callsign; int stationMode; String iGateComment; diff --git a/src/digi_utils.h b/src/digi_utils.h index 378360a..2a5d8b6 100644 --- a/src/digi_utils.h +++ b/src/digi_utils.h @@ -3,6 +3,7 @@ #include + namespace DIGI_Utils { String generateDigiRepeatedPacket(String packet, String callsign); diff --git a/src/display.h b/src/display.h index 8b30c20..b3da3be 100644 --- a/src/display.h +++ b/src/display.h @@ -7,6 +7,7 @@ #define SCREEN_HEIGHT 64 // OLED display height, in pixels #define SCREEN_ADDRESS 0x3C ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32 + void setup_display(); void display_toggle(bool toggle); diff --git a/src/gps_utils.h b/src/gps_utils.h index 32ed920..be2b87a 100644 --- a/src/gps_utils.h +++ b/src/gps_utils.h @@ -3,6 +3,7 @@ #include + namespace GPS_Utils { String double2string(double n, int ndec); diff --git a/src/lora_utils.h b/src/lora_utils.h index 9f61966..bca0e62 100644 --- a/src/lora_utils.h +++ b/src/lora_utils.h @@ -3,6 +3,7 @@ #include + namespace LoRa_Utils { void setup(); diff --git a/src/ota_utils.h b/src/ota_utils.h index 3b1acd3..e17d0a4 100644 --- a/src/ota_utils.h +++ b/src/ota_utils.h @@ -1,8 +1,9 @@ #ifndef OTA_UTILS_H_ #define OTA_UTILS_H_ -#include #include +#include + namespace OTA_Utils { diff --git a/src/power_utils.h b/src/power_utils.h index c7d71df..b84ee6b 100644 --- a/src/power_utils.h +++ b/src/power_utils.h @@ -4,6 +4,7 @@ #include #include "XPowersLib.h" + namespace POWER_Utils { void activateMeasurement(); diff --git a/src/query_utils.h b/src/query_utils.h index f5586e1..a354b97 100644 --- a/src/query_utils.h +++ b/src/query_utils.h @@ -3,6 +3,7 @@ #include + namespace QUERY_Utils { String process(String query, String station, String queryOrigin); diff --git a/src/station_utils.h b/src/station_utils.h index 3b8e825..e1e0819 100644 --- a/src/station_utils.h +++ b/src/station_utils.h @@ -3,6 +3,7 @@ #include + namespace STATION_Utils { void deleteNotHeard(); diff --git a/src/syslog_utils.h b/src/syslog_utils.h index 185982b..6e51096 100644 --- a/src/syslog_utils.h +++ b/src/syslog_utils.h @@ -3,6 +3,7 @@ #include + namespace SYSLOG_Utils { void log(String type ,String packet, int rssi, float snr, int freqError); diff --git a/src/utils.h b/src/utils.h index 4cefb9c..bee195c 100644 --- a/src/utils.h +++ b/src/utils.h @@ -3,6 +3,7 @@ #include + namespace Utils { void processStatus(); diff --git a/src/wifi_utils.h b/src/wifi_utils.h index d74eedf..ad4987c 100644 --- a/src/wifi_utils.h +++ b/src/wifi_utils.h @@ -3,6 +3,7 @@ #include + namespace WIFI_Utils { void checkWiFi(); @@ -10,7 +11,6 @@ namespace WIFI_Utils { void checkIfAutoAPShouldPowerOff(); void setup(); - } #endif \ No newline at end of file