From d686f0eeb601ac87430cccd8f1f8a9f500f6bffc Mon Sep 17 00:00:00 2001 From: richonguzman Date: Thu, 5 Sep 2024 18:29:31 -0400 Subject: [PATCH] trying --- .clang-format | 66 -- data_embed/bootstrap.css.gz | Bin 33963 -> 33963 bytes data_embed/bootstrap.js.gz | Bin 30641 -> 30641 bytes data_embed/favicon.png.gz | Bin 836 -> 836 bytes data_embed/index.html | 1430 ++++------------------------------- data_embed/index.html.gz | Bin 42475 -> 37224 bytes data_embed/script.js | 324 +++----- data_embed/script.js.gz | Bin 13110 -> 12481 bytes data_embed/style.css.gz | Bin 110 -> 110 bytes src/LoRa_APRS_Tracker.cpp | 2 + src/web_utils.cpp | 61 +- 11 files changed, 269 insertions(+), 1614 deletions(-) delete mode 100644 .clang-format diff --git a/.clang-format b/.clang-format deleted file mode 100644 index d95cc19..0000000 --- a/.clang-format +++ /dev/null @@ -1,66 +0,0 @@ -# Generated from CLion C/C++ Code Style settings -BasedOnStyle: LLVM -AccessModifierOffset: -4 -AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: None -AlignOperands: Align -AllowAllArgumentsOnNextLine: false -AllowAllConstructorInitializersOnNextLine: false -AllowAllParametersOfDeclarationOnNextLine: false -AllowShortBlocksOnASingleLine: Always -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: Always -AllowShortLambdasOnASingleLine: All -AllowShortLoopsOnASingleLine: true -AlwaysBreakAfterReturnType: None -AlwaysBreakTemplateDeclarations: Yes -BreakBeforeBraces: Custom -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: Never - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterUnion: false - BeforeCatch: false - BeforeElse: false - IndentBraces: false - SplitEmptyFunction: false - SplitEmptyRecord: true -BreakBeforeBinaryOperators: None -BreakBeforeTernaryOperators: true -BreakConstructorInitializers: BeforeColon -BreakInheritanceList: BeforeColon -ColumnLimit: 0 -CompactNamespaces: false -ContinuationIndentWidth: 8 -IndentCaseLabels: true -IndentPPDirectives: None -IndentWidth: 2 -KeepEmptyLinesAtTheStartOfBlocks: true -MaxEmptyLinesToKeep: 2 -NamespaceIndentation: All -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PointerAlignment: Right -ReflowComments: false -SpaceAfterCStyleCast: true -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeCpp11BracedList: false -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: true -SpaceBeforeParens: ControlStatements -SpaceBeforeRangeBasedForLoopColon: false -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 0 -SpacesInAngles: false -SpacesInCStyleCastParentheses: false -SpacesInContainerLiterals: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -TabWidth: 2 -UseTab: Never diff --git a/data_embed/bootstrap.css.gz b/data_embed/bootstrap.css.gz index 8dedce4274d5b9663dff299e2a0af70576920874..0f18f317fc3b9e8e6aef4f9f0ce62b56d006fe83 100644 GIT binary patch delta 17 YcmZ48$+WtYiA}zngJGfmMz*Cb05ow0)c^nh delta 17 YcmZ48$+WtYiA}zngW){qMz*Cb05r!1-2eap diff --git a/data_embed/bootstrap.js.gz b/data_embed/bootstrap.js.gz index 8770b1bcae1e713d8ddb0cd66c3cee119623aa8b..4bac5f6d61224225a3b32643bc3947f79043baea 100644 GIT binary patch delta 17 Zcmdn^o^j)QMmG6w4u*yL8`)Nu0{}ps2BZK0 delta 17 Zcmdn^o^j)QMmG6w4uJ7xeS5(FIp diff --git a/data_embed/index.html b/data_embed/index.html index a0f850d..dacf856 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -3,7 +3,7 @@ - LoRa Tracker software − Ricardo Guzman CA2RXU + LoRa iGate & Digi software − Ricardo Guzman CA2RXU @@ -28,11 +28,6 @@ Configuration -
  • - - Update OTA - -
  • @@ -105,158 +100,8 @@ d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1" /> - Station + Trackers!!!! - Add your Ham callsign and SSID. -
    -
    - You can leave a comment describing your station. -
    -
    - In the bottom there is a field for personal note that can only be seen in WEB GUI. -     -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - - - -
    -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    @@ -285,17 +130,17 @@ d="M8.5 5.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0" /> - WiFi Access + Beacons Add all Wi-Fi Networks intended to be used.beacons......
    @@ -318,514 +163,6 @@
    -
    -
    -
    - - - - - - - APRS-IS -
    - Enter you APRS-IS server and - credentials. -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    - -
    -
    -
    - - - - Beaconing -
    - Set APRS beacon attributes. -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    - -
    -
    -
    -
    - -
    - - minutes - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - - - - Digipeating -
    - Define the Digipeater mode -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - -
    -
    -
    - - - - LoRa -
    - Config LoRa APRS Xmitting settings. -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    - -
    - - - - Hz - -
    -
    -
    - -
    - - Hz - -
    -
    -
    -
    -
    - - -
    -
    - -
    - -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    - -
    - - dBm -
    -
    -
    -
    -
    -
    -
    @@ -851,14 +188,29 @@
    Show Symbol on Display +
    +
    +
    +
    + +
    @@ -900,28 +252,6 @@ >
    -
    - -
    - - minutes -
    -
    @@ -935,170 +265,32 @@ width="20" height="20" fill="currentColor" - class="bi bi-heart-pulse-fill" + class="bi bi-tv-fill" viewBox="0 0 16 16" > - - Battery + Winlink - - Battery Monitor & Health -
    -
    - Max Voltage on input pin is 3.3V. -
    -
    - Calculate voltage divider accordingly. -     -
    +
    -
    - - -
    -
    - - -
    -
    - -
    - - volts -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - -
    - - volts -
    -
    -
    + +
    - -
    -
    - -
    - - kOhm -
    -
    -
    - -
    - - kOhm -
    @@ -1148,26 +340,7 @@
    - -
    - - meters -
    -
    -
    -
    @@ -1175,179 +348,38 @@ type="number" name="bme.temperatureCorrection" id="bme.temperatureCorrection" - placeholder="0.0" + placeholder="0" class="form-control" - step="0.1" - min="-5" - max="5" + step="1" + min="0" /> C°Celcius
    -
    -
    -
    -
    - -
    -
    -
    - - - - Syslog -
    - Broadcast the system log over the - network. -
    -
    -
    - - -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    - -
    -
    -
    - - - - - - - TNC -
    - TNC and KISS configuration -
    -
    -
    -
    -
    -
    - Server will be available at port 8001 +
    +
    +
    + +
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    -
    - +
    +
    @@ -1356,18 +388,16 @@ width="20" height="20" fill="currentColor" - class="bi bi-heart-pulse-fill" + class="bi bi-broadcast-pin" viewBox="0 0 16 16" > - - Reboot Time + PTT Control
    + To control External Amplifiers
    @@ -1375,171 +405,90 @@
    + >Activate PTT Trigger +
    - +
    +
    +
    +
    + +
    + hoursmilisecs
    +
    + +
    + + milisecs +
    +
    +
    +
    +
    + + +
    +
    +
    -
    - -
    -
    -
    - - - - - - - Auto AP -
    - Add your password and power off timeout to - auto access point. Auto AP will start if - there is no WiFi connection. Timeout will - count from startup or last client - disconnected. -
    -
    -
    - - -
    -
    - - -
    - Set to 0 if you don't - want this option. -
    -
    -
    -
    -
    - -
    -
    -
    - - - - OTA -
    - Set your username and password to allow - firmware updating over-the-air. -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    +
    @@ -1560,141 +509,24 @@ Admin Set your username and password to allow + >Set your WiFi Ap Password to allow access to the web interface.
    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    - -
    -
    -
    - - - - - Experimental -
    - You can test new features. Use at your own risk! -
    -
    -
    -
    -
    -
    - When "only" iGate Mode loses WiFi, it will change into a Digirepeater Mode and after 15 min check if WiFi available and return to "only" iGate Mode. -
    - - -
    -
    -
    -
    -
    - WiFi disabled. Sleep mode. Best for solar Digi with SX126X. -
    - - -
    -
    -
    - - - Volts -
    - MCU will deep sleep when below provided battery voltage to save power. Set to 0 if you don't want this option. Please calibrate your voltage reading first! -
    -
    -
    -
    -