Create LICENSE GNU

Correct logic of serial notifications for APRS-IS and RF beacons

.github/workflows/build.yml

@@ -11,17 +11,84 @@ jobs:
             fail-fast: false
             matrix:
                 target:
-                    - "ttgo-lora32-v21"
-                    - "heltec-lora32-v2"
-                    - "heltec_wifi_lora_32_V3"
-                    - "ESP32_DIY_LoRa"
-                    - "ESP32_DIY_1W_LoRa"
-                    - "ttgo-t-beam-v1_2"
-                    - "ttgo-t-beam-v1"
-                    - "ttgo-t-beam-v1_SX1268"
-                    - "ttgo-t-beam-v1_2_SX1262"
-                    - "heltec_wireless_stick"
-                    - "heltec_ht-ct62"
+                    - name: ttgo-lora32-v21
+                      chip: esp32
+                    - name: ttgo-lora32-v21_915
+                      chip: esp32
+                    - name: ttgo_lora32_t3s3_v1_2
+                      chip: esp32s3
+                    - name: heltec-lora32-v2
+                      chip: esp32
+                    - name: heltec_wifi_lora_32_V3
+                      chip: esp32s3
+                    - name: heltec_wifi_lora_32_V3_2
+                      chip: esp32s3
+                    - name: heltec_wireless_stick
+                      chip: esp32s3
+                    - name: heltec_wireless_stick_lite_v3
+                      chip: esp32s3
+                    - name: heltec_wireless_stick_lite_v3_display
+                      chip: esp32s3
+                    - name: ESP32_DIY_LoRa
+                      chip: esp32
+                    - name: ESP32_DIY_LoRa_915
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa_915
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa_LLCC68
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa_Mesh_V1_2
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_2
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_2_915
+                      chip: esp32
+                    - name: ttgo-t-beam-v1
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_915
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_SX1268
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_2_SX1262
+                      chip: esp32
+                    - name: ttgo_t_deck_plus
+                      chip: esp32s3
+                    - name: ttgo_t_deck_GPS
+                      chip: esp32s3
+                    - name: ttgo_t_beam_s3_SUPREME_v3
+                      chip: esp32s3
+                    - name: ESP32_DIY_LoRa_A7670
+                      chip: esp32
+                    - name: ESP32_DIY_LoRa_A7670_915
+                      chip: esp32
+                    - name: heltec_wireless_tracker
+                      chip: esp32s3
+                    - name: heltec_ht-ct62
+                      chip: esp32c3
+                    - name: heltec_wireless_paper
+                      chip: esp32s3
+                    - name: OE5HWN_MeshCom
+                      chip: esp32
+                    - name: WEMOS-LOLIN32-OLED-DIY
+                      chip: esp32
+                    - name: WEMOS-D1-R32-RA02
+                      chip: esp32
+                    - name: WEMOS_S2_MINI_DIY_LoRa
+                      chip: esp32s2
+                    - name: esp32c3_DIY_1W_LoRa
+                      chip: esp32c3
+                    - name: esp32c3_DIY_1W_LoRa_915
+                      chip: esp32c3
+                    - name: ESP32_C3_OctopusLab_LoRa
+                      chip: esp32c3
+                    - name: QRPLabs_LightGateway_1_0
+                      chip: esp32s3
+                    - name: XIAO_ESP32S3_WIO_SX1262
+                      chip: esp32s3
+                    - name: TROY_LoRa_APRS
+                      chip: esp32                    
         steps:
             - uses: actions/checkout@v3
 
@@ -33,25 +100,70 @@ jobs:
               run: pip install --upgrade platformio
 
             - name: Build target
-              run: pio run -e ${{ matrix.target }}
+              run: |
+                  pio run -e ${{ matrix.target.name }} 
 
             - name: Build FS
-              run: pio run --target buildfs -e ${{ matrix.target }}
+              run: |
+                  pio run --target buildfs -e ${{ matrix.target.name }}
 
             - name: Move Files
               run: |
                   mkdir -p installer/firmware
-                  cp .pio/build/${{ matrix.target }}/firmware.bin installer/ota_update.bin
-                  cp .pio/build/${{ matrix.target }}/firmware.bin installer/firmware/
-                  cp .pio/build/${{ matrix.target }}/bootloader.bin installer/firmware/
-                  cp .pio/build/${{ matrix.target }}/partitions.bin installer/firmware/
-                  cp .pio/build/${{ matrix.target }}/spiffs.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/firmware.bin installer/ota_update.bin
+                  cp .pio/build/${{ matrix.target.name }}/firmware.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/bootloader.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/partitions.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/spiffs.bin installer/firmware/
                   cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin installer/firmware/
-            
+              
             - name: Merge for web flashing
               run: |
-                  python installer/bin/esptool/esptool.py --chip esp32 merge_bin -o installer/web_upgrade.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 installer/firmware/bootloader.bin 0x8000 installer/firmware/partitions.bin 0xe000 installer/firmware/boot_app0.bin 0x10000 installer/firmware/firmware.bin
-                  python installer/bin/esptool/esptool.py --chip esp32 merge_bin -o installer/web_factory.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 installer/firmware/bootloader.bin 0x8000 installer/firmware/partitions.bin 0xe000 installer/firmware/boot_app0.bin 0x10000 installer/firmware/firmware.bin 2686976 installer/firmware/spiffs.bin
+                  if [ "${{ matrix.target.chip }}" == "esp32" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 4MB \
+                      0x1000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  elif [ "${{ matrix.target.chip }}" == "esp32s2" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32s2 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 4MB \
+                      0x1000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  elif [ "${{ matrix.target.chip }}" == "esp32s3" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32s3 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 8MB \
+                      0x0000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  elif [ "${{ matrix.target.chip }}" == "esp32c3" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32c3 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 4MB \
+                      0x1000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  fi
 
             - name: Install Zip
               run: sudo apt-get install zip
@@ -66,5 +178,5 @@ jobs:
               with:
                   upload_url: ${{ github.event.release.upload_url }}
                   asset_path: ./installer.zip
-                  asset_name: ${{ matrix.target }}.zip
+                  asset_name: ${{ matrix.target.name }}.zip
                   asset_content_type: application/zip

.github/workflows/commit.yml

@@ -11,18 +11,9 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                target:
-                    - "ttgo-lora32-v21"
-                    - "heltec-lora32-v2"
-                    - "heltec_wifi_lora_32_V3"
-                    - "ESP32_DIY_LoRa"
-                    - "ESP32_DIY_1W_LoRa"
-                    - "ttgo-t-beam-v1_2"
-                    - "ttgo-t-beam-v1"
-                    - "ttgo-t-beam-v1_SX1268"
-                    - "ttgo-t-beam-v1_2_SX1262"
-                    - "heltec_wireless_stick"
-                    - "heltec_ht-ct62"
+              target:
+                - name: ttgo-lora32-v21
+                  chip: esp32
         steps:
             - uses: actions/checkout@v3
 
@@ -34,7 +25,7 @@ jobs:
               run: pip install --upgrade platformio
 
             - name: Build target
-              run: pio run -e ${{ matrix.target }}
+              run: pio run -e ${{ matrix.target.name }}
 
             - name: Build FS
-              run: pio run --target buildfs -e ${{ matrix.target }}
+              run: pio run --target buildfs -e ${{ matrix.target.name }}

LICENSE

@@ -1,21 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2023 Ricardo Guzman (Richonguzman)
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,79 +1,131 @@
-# Richonguzman / CA2RXU LoRa APRS iGate/Digirepeater
+# CA2RXU LoRa APRS iGate/Digipeater
 
 This firmware is for using ESP32 based boards with LoRa Modules and GPS to live in the APRS world.
 
 ![Screenshot](https://github.com/richonguzman/LoRa_APRS_iGate/blob/main/images/iGateOledScreen.jpeg)
 
-__(NOTE: This iGate Firmware was develop to work with all LoRa APRS Trackers and specially with this firmware <a href="https://github.com/richonguzman/LoRa_APRS_Tracker" target="_blank">LoRa APRS Tracker</a>)__
+__(This iGate Firmware works with all LoRa Tracker Firmwares (specially this <a href="https://github.com/richonguzman/LoRa_APRS_Tracker" target="_blank">LoRa APRS Tracker Firmware</a>))__
+<br />
 
-___________________________________________________
+____________________________________________________
 
 ## You can support this project to continue to grow:
 
 [<img src="https://github.com/richonguzman/LoRa_APRS_Tracker/blob/main/images/github-sponsors.png">](https://github.com/sponsors/richonguzman)     [<img src="https://github.com/richonguzman/LoRa_APRS_Tracker/blob/main/images/paypalme.png">](http://paypal.me/richonguzman)
 
-____________________________________________________
+<br />
 
-This next generation LoRa iGate can work as:
-- pure RX-iGate, 
-- Rx+Tx-iGate and distribute messages and weather forecasts to heard trackers, and 
-- Digipeater in simplex or split-frequency environment.
-
-In all configurations the display shows the current stationMode, heard packets and events the iGate is currently performing.
-
-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.
-- automatic update of the Lora symbol at APRS-IS, black "L" for pure RX, red "L" for TX capability, green star "L" for digipeater and blue round "L" for WX iGate.
-- support for multiple WLAN with corresponding coordinates.
-- support for BME/BMP280 and BME680 sensors, sending to WX data to APRS-IS.
-
-and more will come:
-- More Web UI Station Information
+# WEB FLASHER/INSTALLER is <a href="https://richonguzman.github.io/lora-igate-web-flasher/installer.html" target="_blank">here</a>
 
 ____________________________________________________
 
 # WIKI
 
-### Supported Boards and buying links --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/Z.-------Supported-Boards-and-Buying-Links" target="_blank">here</a>.
+### FAQ, BME280, TNC and more --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/00.-FAQ-(frequently-asked-questions)" target="_blank">here</a>.
 
 ### Installation Guide --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/01.-Installation-Guide" target="_blank">here</a>.
+<br />
 
-*(Wiki has all configuration explanation, supported boards list, adding BME/BMP Wx modules and more)*
+# SUPPORTED BOARDS
+
+### Buying links --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/108.-Supported-Boards-and-Buying-Links" target="_blank">here</a>.
+
+(NOTE: all boards with 433-868-915 MHz versions)
+
+- TTGO Lilygo LoRa32 T3S3 V1.2 and LoRa32 V2.1 (V1.6 is the same).
+
+- TTGO T-Beam V1.0 , V1.1, V1.2 (also variations with SX1262 and SX1268 LoRa Modules).
+
+- T-Deck Plus (and also regular T-Deck with/without GPS).
+
+- HELTEC V2, V3 , Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker, Wireless Paper.
+
+- QRP Labs LightGateway 1.0.
+
+- ESP32 Wroom + SX1278 LoRa Module or Ebyte 400M30S (or 900M30S) 1W LoRa Module for a DIY Versions.
+
+- ESP32C3 + Ebyte 400M30S(or 900M30S) 1W LoRa Module for another DIY version.
+
+- ESP32 + 4G/LTE A7670 Modem + SX1278 DIY Version.
+
+- Wemos Lolin32 Oled + SX1278 DIY Version.
+
+<br />
 
-____________________________________________________
 ## Timeline (Versions):
 
+- 2025-04-20000000
+- 2025.03.20 Manager List added to enable/disable DigiEcoMode and Tx Control. Thanks LB5JJ.
+- 2025.03.03 T-Beam Supreme board added and more BlackList rules added.
+- 2025.02.28 Heltec Wireless Paper with Epaper working. Thanks SzymonPriv for pointing to the right library.
+- 2025.02.25 Objects Rules update, GPS Boards: Satellites on Screen, Wx Height Correction from GPS Data.
+- 2025.01.22 Added LILYGO T-DECK PLUS (and DIY+GPS version) board support.
+- 2025.01.11 Added HELTEC V3.2 board support.
+- 2025.01.07 TROY_LoRa_APRS board added. GMT in quarter hour fix and Beacon fix for TNC.
+- 2025.01.02 Callsign Black List added.
+- 2024.12.30 Fixed missing validation for correct Digipeater mode when not connected to APRS-IS.
+- 2024.12.06 APRS-IS connnection and passcode validation added.
+- 2024.11.06 (Silent Update) Working now with Board "VARIANTS".
+- 2024.10.29 Added LILYGO Lora32 T3S3 support.
+- 2024.10.25 Added QRP Labs LightGateway 1.0 support.
+- 2024.10.21 Boards with GPS can now send Real-GPS Beacon (also posible: GPS ambiguity of ~ 1 km).
+- 2024.10.14 Received Packets in WebUI show real Local Time (NTP with GMT offset).
+- 2024.10.08 New EcoMode for Remote Digipeaters without WiFi/WiFiAP, Screen, Leds (Example: LILYGO LoRa32 uses only 24mA, with WifiAP 150mA). APRS Message/Queries can start/stop this mode too.
+- 2024.10.06 Cross Frequency Digipeater Rules added.
+- 2024.09.23 Libraries Update for SDK3
+- 2024.09.23 Added Enconded Telemetry for Battery (+ External Voltage) in Station GPS Beacon Packet. 
+- 2024.08.23 Wemos S2 Mini DIY LoRa added.
+- 2024.08.19 HELTEC Wireless Paper working (still missing Epaper code).
+- 2024.08.13 Web Authentication for WebUI. Thanks Mitja S57PNX.
+- 2024.08.05 WIDE2-n added to WIDE1-n in Digipeater Modes.
+- 2024.06.27 External Voltage Divider Resistor configuration on WebUI. Thanks Tilen S54B.
+- 2024.06.26 Personal Note information on WebUI for the Station. Thanks Tilen S54B.
+- 2024.06.24 Callsign Validation fix. Thanks Helge SA7SKY.
+- 2024.06.21 Tx packets coming from APRS-IS are (now) formatted into 3rd Party (as they should have been since the beginning). Thanks Lynn KJ4ERJ and Geoffrey F4FXL.
+- 2024.06.18 All boards with 433 / 868 / 915 MHz versions.
+- 2024.06.10 ESP32C3 + 1W LoRa Module (E22 400M30S) support added.
+- 2024.06.09 Si7021 module added (with autodetected I2C Address)
+- 2024.06.08 Callsign Validation for all Station that iGate/Digi hears.
+- 2024.05.27 Battery Monitor for internal and External Voltages (to make board sleep and avoid low discharge of batterys) T-Beam boards now with Battery readings as well.
+- 2024.05.23 Forced Reboot Mode added.
+- 2024.05.22 Experimental backup-Digipeater-Mode when "only" iGate mode loses WiFi connection added.
+- 2024.05.20 WebConfig update to control whether Messages and Objects should be Tx to RF.
+- 2024.05.17 HELTEC Wireless Stick Lite v3 support added.
+- 2024.05.14 BME modules will be autodetected (I2C Address and if it is BME280/BMP280/BME680).
+- 2024.05.13 PacketBuffer for Rx (25 Seg).
+- 2024.05.11 HELTEC Wireless Tracker support added.
+- 2024.04.23 T-LoRa32 v1.6/v2.1 with 915MHz support added.
+- 2024.04.23 ESP32 + 4G/LTE MODEM A7670SA + LoRa (SX1278) support added.
+- 2024.04.22 Wemos Lolin32 OLED DIY LoRa support added .
+- 2024.04.21 WEB INSTALLER (thanks Damian SQ2CPA).
+- 2024.04.20 New Output Buffer process: no more packets lost.
 - 2024.04.13 Received Packets added on WebUI.
-- 2024.04.09 iGate/Digirepeater own GPS beacon is encoded (Base91) now.
+- 2024.04.09 iGate/Digipeater own GPS beacon is encoded (Base91) now.
 - 2024.03.18 OE5HWN MeshCom board support added.
 - 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.
+- 2024.01.12 Added iGate Mode to also repeat packets (like a iGate+Digipeater) in stationMode 2 and 5.
 - 2024.01.11 Added iGate Mode to enable APRS-IS and LoRa beacon report at the same time.
-- 2024.01.05 Added support for Lilygo TTGO T-Beam V1, V1.2, V1 + SX1268, V1.2 + SX1262.
-- 2024.01.02 Added support for EByte 400M30S 1Watt LoRa module for DIY ESP32 iGate.
+- 2024.01.05 Lilygo TTGO T-Beam V1, V1.2, V1 + SX1268, V1.2 + SX1262 support added.
+- 2024.01.02 EByte 400M30S 1 Watt LoRa module for DIY ESP32 iGate support added.
 - 2023.12.27 HELTEC V3 board support added. Thanks Luc ON2ON.
-- 2023.12.26 Added BME680 module to BME/BMP280 modules supported.
-- 2023.12.07 MIC-E process and syslog added.
+- 2023.12.26 BME680 module support added.
+- 2023.12.07 MIC-E process and Syslog added.
 - 2023.12.06 HELTEC V2 board support added.
 - 2023.11.26 Small correction to enable Syslog in stationMode5.
-- 2023.10.09 Added "WIDE1-1" to Tx packets from iGate to be *repeated* by Digirepeaters.
-- 2023.10.09 Added Support also for BMP280 module.
+- 2023.10.09 Added "WIDE1-1" to Tx packets from iGate to be *repeated* by Digipeaters.
+- 2023.10.09 BMP280 module support added.
 - 2023.08.20 Added External Voltage Measurement (Max 15V!)
 - 2023.08.05 Ground Height Correction for Pressure readings added.
-- 2023.07.31 StationMode5 added: iGate when WiFi and APRS available, DigiRepeater when not.
+- 2023.07.31 StationMode5 added: iGate when WiFi and APRS available, Digipeater when not.
 - 2023.07.16 Small OTA, BME module update.
 - 2023.07.05 Adding monitor info of Battery connected.
 - 2023.06.18 Info on Oled Screen mayor update, added RSSI and Distance to Listened Station.
-- 2023.06.17 Support for BME280 Module (Temperature, Humidity, Pressure) added.
+- 2023.06.17 BME280 Module (Temperature, Humidity, Pressure) support added.
 - 2023.06.12 Syslog added.
 - 2023.06.10 OTA update support for Firmware and Filesystem.
-- 2023.06.08 Adding Digirepeater Functions.
+- 2023.06.08 Adding Digipeater Functions.
 - 2023.06.06 Full repack of Code and adding _enableTx_ only for Ham Ops.
 - 2023.05.23 Processing Query's from RF/LoRa or APRS-IS (Send "Help" Message to test).
 - 2023.05.19 Saving Last-Heard Stations for validating Tx Responses.
@@ -84,4 +136,4 @@ ____________________________________________________
 
 __________________________________________
 
-# Hope You Enjoy this, 73 !!  CA2RXU , Valparaiso, Chile
+# Hope You Enjoy this, 73! CA2RXU, Valparaiso, Chile

common_settings.ini

@@ -0,0 +1,44 @@
+[common]
+build_flags =
+	-Werror -Wall
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+	-DRADIOLIB_EXCLUDE_CC1101=1
+	-DRADIOLIB_EXCLUDE_NRF24=1
+	-DRADIOLIB_EXCLUDE_RF69=1
+	-DRADIOLIB_EXCLUDE_SX1231=1
+	-DRADIOLIB_EXCLUDE_SX1233=1
+	-DRADIOLIB_EXCLUDE_SI443X=1
+	-DRADIOLIB_EXCLUDE_RFM2X=1
+	-DRADIOLIB_EXCLUDE_AFSK=1
+	-DRADIOLIB_EXCLUDE_BELL=1
+	-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
+	-DRADIOLIB_EXCLUDE_MORSE=1
+	-DRADIOLIB_EXCLUDE_RTTY=1
+	-DRADIOLIB_EXCLUDE_SSTV=1
+	-DRADIOLIB_EXCLUDE_AX25=1
+	-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
+	-DRADIOLIB_EXCLUDE_BELL=1
+	-DRADIOLIB_EXCLUDE_PAGER=1
+	-DRADIOLIB_EXCLUDE_FSK4=1
+	-DRADIOLIB_EXCLUDE_APRS=1
+	-DRADIOLIB_EXCLUDE_LORAWAN=1
+	-I variants/${PIOENV}
+lib_deps =
+	adafruit/Adafruit Unified Sensor @ 1.1.14
+	adafruit/Adafruit BME280 Library @ 2.2.4
+	adafruit/Adafruit BMP280 Library @ 2.6.8
+	adafruit/Adafruit BME680 Library @ 2.0.4
+	adafruit/Adafruit Si7021 Library @ 1.5.3
+	arduino-libraries/NTPClient @ 3.2.1
+	ayushsharma82/ElegantOTA @ 3.1.5
+	bblanchon/ArduinoJson @ 6.21.3
+	jgromes/RadioLib @ 7.1.0
+	mathieucarbou/AsyncTCP @ 3.2.5
+	mathieucarbou/ESPAsyncWebServer @ 3.2.3
+	mikalhart/TinyGPSPlus @ 1.0.3	
+display_libs =
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+usb_flags=
+	-DARDUINO_USB_MODE=1
+	-DARDUINO_USB_CDC_ON_BOOT=1 

data/igate_conf.json

@@ -3,7 +3,7 @@
     "wifi": {
         "autoAP": {
             "password": "1234567890",
-            "powerOff": 10
+            "timeout": 10
         },
         "AP": []
     },
@@ -18,21 +18,18 @@
         "sendViaAPRSIS": false,
         "sendViaRF": false
     },
-    "digi": {
-        "mode": 0
-    },
-    "tnc": {
-        "enableServer": false,
-        "enableSerial": false,
-        "acceptOwn": false
-    },
     "aprs_is": {
         "active": false,
         "passcode": "XYZVW",
         "server": "rotate.aprs2.net",
         "port": 14580,
         "filter": "m/10",
-        "toRF": false
+        "messagesToRF": false,
+        "objectsToRF": false
+    },
+    "digi": {
+        "mode": 0,
+        "ecoMode": 0
     },
     "lora": {
         "txFreq": 433775000,
@@ -49,24 +46,54 @@
         "timeout": 4,
         "turn180": false
     },
+    "battery": {
+        "sendInternalVoltage": false,
+        "monitorInternalVoltage": false,
+        "internalSleepVoltage": 2.9,
+        "sendExternalVoltage": false,
+        "externalVoltagePin": 34,
+        "monitorExternalVoltage": false,
+        "externalSleepVoltage": 10.9,
+        "voltageDividerR1": 100.0,
+        "voltageDividerR2": 27.0,
+        "sendVoltageAsTelemetry": false
+	},
+    "wxsensor": {
+        "active": false,
+        "heightCorrection": 0,
+        "temperatureCorrection": 0.0
+	},
     "syslog": {
         "active": false,
-        "server": "192.168.0.100",
-        "port": 514
+        "server": "lora.link9.net",
+        "port": 1514
     },
-    "bme": {
-        "active": false
+    "tnc": {
+        "enableServer": false,
+        "enableSerial": false,
+        "acceptOwn": false
     },
     "ota": {
         "username": "",
         "password": ""
     },
+    "webadmin": {
+        "username": "admin",
+        "password": ""
+    },
+    "ntp": {
+        "gmtCorrection": 0.0
+    },
+    "remoteManagement": {
+        "managers": "",
+        "rfOnly": true
+    },        
     "other": {
         "rememberStationTime": 30,
-        "sendBatteryVoltage": false,
-        "externalVoltageMeasurement": false,
-        "externalVoltagePin": 34,
-        "lowPowerMode": false,
-        "lowVoltageCutOff": 0
-    }
+        "backupDigiMode": false,
+        "rebootMode": false,
+        "rebootModeTime": 6
+    },
+    "personalNote": "",
+    "blacklist": ""
 }

data_embed/script.js

@@ -74,16 +74,15 @@ logCheckbox.addEventListener("change", function () {
 function loadSettings(settings) {
     currentSettings = settings;
     // General
-    document.getElementById("callsign").value = settings.callsign;
-    // document.getElementById("stationMode").value = settings.stationMode;
-    document.getElementById("bme.active").checked = settings.bme.active;
-    document.getElementById("beacon.comment").value = settings.beacon.comment;
-    document.getElementById("beacon.symbol").value = settings.beacon.symbol;
-    document.getElementById("beacon.overlay").value = settings.beacon.overlay;
+    document.getElementById("callsign").value                           = settings.callsign;
+    document.getElementById("beacon.comment").value                     = settings.beacon.comment;
+    document.getElementById("beacon.path").value                        = settings.beacon.path;
+    document.getElementById("beacon.symbol").value                      = settings.beacon.symbol;
+    document.getElementById("beacon.overlay").value                     = settings.beacon.overlay;
+    document.getElementById("personalNote").value                       = settings.personalNote;
+    document.getElementById("action.symbol").value                      = settings.beacon.overlay + settings.beacon.symbol;
 
-    document.getElementById("action.symbol").value = settings.beacon.overlay + settings.beacon.symbol;
-
-    document.querySelector(".list-networks").innerHTML = "";
+    document.querySelector(".list-networks").innerHTML                  = "";
 
     // Networks
     const wifiNetworks = settings.wifi.AP || [];
@@ -119,103 +118,111 @@ function loadSettings(settings) {
     });
 
     // APRS-IS
-    document.getElementById("aprs_is.active").checked = settings.aprs_is.active;
-    document.getElementById("aprs_is.toRF").checked = settings.aprs_is.toRF;
-    document.getElementById("aprs_is.server").value = settings.aprs_is.server;
-    document.getElementById("aprs_is.port").value = settings.aprs_is.port;
-    document.getElementById("aprs_is.filter").value = settings.aprs_is.filter;
-    document.getElementById("aprs_is.passcode").value =
-        settings.aprs_is.passcode;
+    document.getElementById("aprs_is.active").checked                   = settings.aprs_is.active;
+    document.getElementById("aprs_is.messagesToRF").checked             = settings.aprs_is.messagesToRF;
+    document.getElementById("aprs_is.objectsToRF").checked              = settings.aprs_is.objectsToRF;
+    document.getElementById("aprs_is.server").value                     = settings.aprs_is.server;
+    document.getElementById("aprs_is.port").value                       = settings.aprs_is.port;
+    document.getElementById("aprs_is.filter").value                     = settings.aprs_is.filter;
+    document.getElementById("aprs_is.passcode").value                   = settings.aprs_is.passcode;
+
+    // Beacon
+    document.getElementById("beacon.latitude").value                    = settings.beacon.latitude;
+    document.getElementById("beacon.longitude").value                   = settings.beacon.longitude;
+    document.getElementById("beacon.interval").value                    = settings.beacon.interval;
+    document.getElementById("other.rememberStationTime").value          = settings.other.rememberStationTime;   
+    document.getElementById("beacon.sendViaAPRSIS").checked             = settings.beacon.sendViaAPRSIS;
+    document.getElementById("beacon.sendViaRF").checked                 = settings.beacon.sendViaRF;
+
+    document.getElementById("beacon.gpsActive").checked                 = settings.beacon.gpsActive;
+    document.getElementById("beacon.gpsAmbiguity").checked              = settings.beacon.gpsAmbiguity;
+
+    // Black List
+    document.getElementById("blacklist").value                          = settings.blacklist;
+
+    // Digi
+    document.getElementById("digi.mode").value                          = settings.digi.mode;
+    document.getElementById("digi.ecoMode").checked                     = settings.digi.ecoMode;
+
+    // LoRa
+    document.getElementById("lora.txFreq").value                        = settings.lora.txFreq;
+    document.getElementById("lora.rxFreq").value                        = settings.lora.rxFreq;
+    document.getElementById("lora.txActive").checked                    = settings.lora.txActive;
+    document.getElementById("lora.rxActive").checked                    = settings.lora.rxActive;
+    document.getElementById("lora.spreadingFactor").value               = settings.lora.spreadingFactor;
+    document.getElementById("lora.signalBandwidth").value               = settings.lora.signalBandwidth;
+    document.getElementById("lora.codingRate4").value                   = settings.lora.codingRate4;
+    document.getElementById("lora.power").value                         = settings.lora.power;
 
     // Display
-    document.getElementById("display.alwaysOn").checked =
-        settings.display.alwaysOn;
-    document.getElementById("display.turn180").checked =
-        settings.display.turn180;
-    document.getElementById("display.timeout").value = settings.display.timeout;
+    document.getElementById("display.alwaysOn").checked                 = settings.display.alwaysOn;
+    document.getElementById("display.turn180").checked                  = settings.display.turn180;
+    document.getElementById("display.timeout").value                    = settings.display.timeout;
 
     if (settings.display.alwaysOn) {
         timeoutInput.disabled = true;
     }
 
-    // WiFi Auto AP
-    document.getElementById("wifi.autoAP.password").value =
-        settings.wifi.autoAP.password;
-    document.getElementById("wifi.autoAP.powerOff").value =
-        settings.wifi.autoAP.powerOff;
-
-    // Digi
-    // document.getElementById("digi.comment").value = settings.digi.comment;
-    // document.getElementById("digi.latitude").value = settings.digi.latitude;
-    // document.getElementById("digi.longitude").value = settings.digi.longitude;
-    document.getElementById("digi.mode").value = settings.digi.mode;
-
-    // TNC
-    if (settings.tnc) {
-        document.getElementById("tnc.enableServer").checked = settings.tnc.enableServer;
-        document.getElementById("tnc.enableSerial").checked = settings.tnc.enableSerial;
-        document.getElementById("tnc.acceptOwn").checked = settings.tnc.acceptOwn;
-    }
-
-    // OTA
-    document.getElementById("ota.username").value = settings.ota.username;
-    document.getElementById("ota.password").value = settings.ota.password;
-
-    // Beacon
-    document.getElementById("beacon.interval").value = settings.beacon.interval;
-    document.getElementById("other.rememberStationTime").value =
-        settings.other.rememberStationTime;
-    document.getElementById("other.sendBatteryVoltage").checked =
-        settings.other.sendBatteryVoltage;
-    document.getElementById("other.externalVoltageMeasurement").checked =
-        settings.other.externalVoltageMeasurement;
-
-    document.getElementById("other.externalVoltagePin").value =
-        settings.other.externalVoltagePin;
-    // document.getElementById("beacon.igateSendsLoRaBeacon").value =
-    //     settings.beacon.igateSendsLoRaBeacon;
-    // document.getElementById("beacon.igateRepeatLoRaPackets").value =
-    //     settings.beacon.igateRepeatLoRaPackets;
-    document.getElementById("beacon.path").value = settings.beacon.path;
-    document.getElementById("beacon.latitude").value = settings.beacon.latitude;
-    document.getElementById("beacon.longitude").value =
-        settings.beacon.longitude;
-    document.getElementById("beacon.sendViaAPRSIS").checked =
-        settings.beacon.sendViaAPRSIS;
-    document.getElementById("beacon.sendViaRF").checked =
-        settings.beacon.sendViaRF;
-
-    // Syslog
-    document.getElementById("syslog.active").checked = settings.syslog.active;
-    document.getElementById("syslog.server").value = settings.syslog.server;
-    document.getElementById("syslog.port").value = settings.syslog.port;
+    // BATTERY
+    document.getElementById("battery.sendInternalVoltage").checked      = settings.battery.sendInternalVoltage;
+    document.getElementById("battery.monitorInternalVoltage").checked   = settings.battery.monitorInternalVoltage;
+    document.getElementById("battery.internalSleepVoltage").value       = settings.battery.internalSleepVoltage.toFixed(1);
+    document.getElementById("battery.sendExternalVoltage").checked      = settings.battery.sendExternalVoltage;
+    document.getElementById("battery.externalVoltagePin").value         = settings.battery.externalVoltagePin;
+    document.getElementById("battery.voltageDividerR1").value           = settings.battery.voltageDividerR1.toFixed(1);
+    document.getElementById("battery.voltageDividerR2").value           = settings.battery.voltageDividerR2.toFixed(1);
+    document.getElementById("battery.monitorExternalVoltage").checked   = settings.battery.monitorExternalVoltage;
+    document.getElementById("battery.externalSleepVoltage").value       = settings.battery.externalSleepVoltage.toFixed(1);
+    document.getElementById("battery.sendVoltageAsTelemetry").checked   = settings.battery.sendVoltageAsTelemetry;
+    
+    // TELEMETRY WX SENSOR
+    document.getElementById("wxsensor.active").checked                  = settings.wxsensor.active;
+    document.getElementById("wxsensor.heightCorrection").value          = settings.wxsensor.heightCorrection;
+    document.getElementById("wxsensor.temperatureCorrection").value     = settings.wxsensor.temperatureCorrection.toFixed(1);
+    
+    // SYSLOG
+    document.getElementById("syslog.active").checked                    = settings.syslog.active;
+    document.getElementById("syslog.server").value                      = settings.syslog.server;
+    document.getElementById("syslog.port").value                        = settings.syslog.port;
 
     if (settings.syslog.active) {
         serverField.disabled = false;
         portField.disabled = false;
     }
 
-    // LoRa
-    // document.getElementById("lora.digirepeaterTxFreq").value =
-    //     settings.lora.digirepeaterTxFreq;
-    // document.getElementById("lora.iGateFreq").value = settings.lora.iGateFreq;
-    // document.getElementById("lora.digirepeaterRxFreq").value =
-    //     settings.lora.digirepeaterRxFreq;
-    document.getElementById("lora.txFreq").value = settings.lora.txFreq;
-    document.getElementById("lora.rxFreq").value = settings.lora.rxFreq;
-    document.getElementById("lora.txActive").checked = settings.lora.txActive;
-    document.getElementById("lora.rxActive").checked = settings.lora.rxActive;
-    document.getElementById("lora.spreadingFactor").value =
-        settings.lora.spreadingFactor;
-    document.getElementById("lora.signalBandwidth").value =
-        settings.lora.signalBandwidth;
-    document.getElementById("lora.codingRate4").value =
-        settings.lora.codingRate4;
-    document.getElementById("lora.power").value = settings.lora.power;
+    // TNC
+    if (settings.tnc) {
+        document.getElementById("tnc.enableServer").checked             = settings.tnc.enableServer;
+        document.getElementById("tnc.enableSerial").checked             = settings.tnc.enableSerial;
+        document.getElementById("tnc.acceptOwn").checked                = settings.tnc.acceptOwn;
+    }
+
+    // Reboot
+    document.getElementById("other.rebootMode").checked                 = settings.other.rebootMode;
+    document.getElementById("other.rebootModeTime").value               = settings.other.rebootModeTime;
+
+    // WiFi Auto AP
+    document.getElementById("wifi.autoAP.password").value               = settings.wifi.autoAP.password;
+    document.getElementById("wifi.autoAP.timeout").value                = settings.wifi.autoAP.timeout;
+
+    // OTA
+    document.getElementById("ota.username").value                       = settings.ota.username;
+    document.getElementById("ota.password").value                       = settings.ota.password;
+
+    // Webadmin
+    document.getElementById("webadmin.active").checked                  = settings.webadmin.active;
+    document.getElementById("webadmin.username").value                  = settings.webadmin.username;
+    document.getElementById("webadmin.password").value                  = settings.webadmin.password;
+
+    // NTP
+    document.getElementById("ntp.gmtCorrection").value                  = settings.ntp.gmtCorrection;
 
     // Experimental
-    document.getElementById("other.lowPowerMode").checked = settings.other.lowPowerMode;
-    document.getElementById("other.lowVoltageCutOff").value = settings.other.lowVoltageCutOff || 0
+    document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;
+
+    // Management over APRS
+    document.getElementById("remoteManagement.managers").value          = settings.remoteManagement.managers;
+    document.getElementById("remoteManagement.rfOnly").checked          = settings.remoteManagement.rfOnly;
 
     updateImage();
     refreshSpeedStandard();
@@ -246,9 +253,7 @@ document.getElementById('reboot').addEventListener('click', function (e) {
     showToast("Your device will be rebooted in a while");
 });
 
-const bmeCheckbox = document.querySelector("input[name='bme.active']");
-
-const stationModeSelect = document.querySelector("select[name='stationMode']");
+const wxsensorCheckbox = document.querySelector("input[name='wxsensor.active']");
 
 function updateImage() {
     const value = document.getElementById("beacon.overlay").value + document.getElementById("beacon.symbol").value;
@@ -276,26 +281,67 @@ function updateImage() {
 }
 
 function toggleFields() {
-    const externalVoltageMeasurementCheckbox = document.querySelector(
-        'input[name="other.externalVoltageMeasurement"]'
+    const sendExternalVoltageCheckbox = document.querySelector(
+        'input[name="battery.sendExternalVoltage"]'
     );
     const externalVoltagePinInput = document.querySelector(
-        'input[name="other.externalVoltagePin"]'
+        'input[name="battery.externalVoltagePin"]'
     );
 
-    externalVoltagePinInput.disabled =
-        !externalVoltageMeasurementCheckbox.checked;
+    externalVoltagePinInput.disabled = !sendExternalVoltageCheckbox.checked;
+    voltageDividerR1.disabled = !sendExternalVoltageCheckbox.checked;
+    voltageDividerR2.disabled = !sendExternalVoltageCheckbox.checked;
+
+    const WebadminCheckbox = document.querySelector(
+        'input[name="webadmin.active"]'
+    );
+
+    const WebadminUsername = document.querySelector(
+        'input[name="webadmin.username"]'
+    );
+
+    const WebadminPassword = document.querySelector(
+        'input[name="webadmin.password"]'
+    );
+    WebadminUsername.disabled = !WebadminCheckbox.checked;
+    WebadminPassword.disabled = !WebadminCheckbox.checked;
 }
 
-const externalVoltageMeasurementCheckbox = document.querySelector(
-    'input[name="other.externalVoltageMeasurement"]'
+const sendExternalVoltageCheckbox = document.querySelector(
+    'input[name="battery.sendExternalVoltage"]'
 );
 const externalVoltagePinInput = document.querySelector(
-    'input[name="other.externalVoltagePin"]'
+    'input[name="battery.externalVoltagePin"]'
 );
 
-externalVoltageMeasurementCheckbox.addEventListener("change", function () {
+const voltageDividerR1 = document.querySelector(
+    'input[name="battery.voltageDividerR1"]'
+);
+
+const voltageDividerR2 = document.querySelector(
+    'input[name="battery.voltageDividerR2"]'
+);
+
+sendExternalVoltageCheckbox.addEventListener("change", function () {
     externalVoltagePinInput.disabled = !this.checked;
+    voltageDividerR1.disabled = !this.checked;
+    voltageDividerR2.disabled = !this.checked;
+});
+
+const WebadminCheckbox = document.querySelector(
+    'input[name="webadmin.active"]'
+);
+
+const WebadminUsername = document.querySelector(
+    'input[name="webadmin.username"]'
+);
+
+const WebadminPassword = document.querySelector(
+    'input[name="webadmin.password"]'
+);
+WebadminCheckbox.addEventListener("change", function () {
+    WebadminUsername.disabled = !this.checked;
+    WebadminPassword.disabled = !this.checked;
 });
 
 document.querySelector(".new button").addEventListener("click", function () {
@@ -469,13 +515,9 @@ function loadReceivedPackets(packets) {
 
         packets.forEach((packet) => {
             const element = document.createElement("tr");
-
-            date.setTime(packet.millis);
-
-            const p = date.toUTCString().split(' ')
         
             element.innerHTML = `
-                        <td>${p[p.length-2]}</td>
+                        <td>${packet.rxTime}</td>
                         <td>${packet.packet}</td>
                         <td>${packet.RSSI}</td>
                         <td>${packet.SNR}</td>

include/A7670_utils.h

@@ -0,0 +1,18 @@
+#ifndef A7670_UTILS_H_
+#define A7670_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace A7670_Utils {
+
+    bool checkModemOn();
+    void setup();
+    bool checkATResponse(const String& ATMessage);
+    void APRS_IS_connect();
+    void uploadToAPRSIS(const String& packet);
+    void listenAPRSIS();
+
+}
+
+#endif

include/README

@@ -1,39 +0,0 @@
-
-This directory is intended for project header files.
-
-A header file is a file containing C declarations and macro definitions
-to be shared between several project source files. You request the use of a
-header file in your project source file (C, C++, etc) located in `src` folder
-by including it, with the C preprocessing directive `#include'.
-
-```src/main.c
-
-#include "header.h"
-
-int main (void)
-{
- ...
-}
-```
-
-Including a header file produces the same results as copying the header file
-into each source file that needs it. Such copying would be time-consuming
-and error-prone. With a header file, the related declarations appear
-in only one place. If they need to be changed, they can be changed in one
-place, and programs that include the header file will automatically use the
-new version when next recompiled. The header file eliminates the labor of
-finding and changing all the copies as well as the risk that a failure to
-find one copy will result in inconsistencies within a program.
-
-In C, the usual convention is to give header files names that end with `.h'.
-It is most portable to use only letters, digits, dashes, and underscores in
-header file names, and at most one dot.
-
-Read more about using header files in official GCC documentation:
-
-* Include Syntax
-* Include Operation
-* Once-Only Headers
-* Computed Includes
-
-https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

include/aprs_is_utils.h

@@ -0,0 +1,27 @@
+#ifndef APRS_IS_UTILS_H_
+#define APRS_IS_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace APRS_IS_Utils {
+
+    void    upload(const String& line);
+    void    connect();
+
+    void    checkStatus();
+    String  checkForStartingBytes(const String& packet);
+
+    String  buildPacketToUpload(const String& packet);
+    bool    processReceivedLoRaMessage(const String& sender, const String& packet, bool thirdParty);
+    void    processLoRaPacket(const String& packet);
+
+    String  buildPacketToTx(const String& aprsisPacket, uint8_t packetType);
+    void    processAPRSISPacket(const String& packet);
+    void    listenAPRSIS();
+
+    void    firstConnection();
+
+}
+
+#endif

include/battery_utils.h

@@ -0,0 +1,22 @@
+#ifndef BATTERY_UTILS_H_
+#define BATTERY_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace BATTERY_Utils {
+
+    void    adcCalibration();
+    void    adcCalibrationCheck();
+
+    void    setup();
+    float   checkInternalVoltage();
+    float   checkExternalVoltage();
+    void    startupBatteryHealth();
+
+    String  generateEncodedTelemetryBytes(float value, bool firstBytes, byte voltageType);
+    String  generateEncodedTelemetry();
+
+}
+
+#endif

include/configuration.h

@@ -0,0 +1,165 @@
+#ifndef CONFIGURATION_H_
+#define CONFIGURATION_H_
+
+#include <Arduino.h>
+#include <vector>
+#include <FS.h>
+
+
+class WiFi_AP {
+public:
+    String  ssid;
+    String  password;
+};
+
+class WiFi_Auto_AP {
+public:
+    String  password;
+    int     timeout;
+};
+
+class BEACON {
+public:
+    double  latitude;
+    double  longitude;
+    String  comment;
+    int     interval;
+    String  overlay;
+    String  symbol;
+    String  path;    
+    bool    sendViaRF;
+    bool    sendViaAPRSIS;
+    bool    gpsActive;
+    bool    gpsAmbiguity;
+};
+
+class APRS_IS {
+public:
+    bool    active;
+    String  passcode;
+    String  server;
+    int     port;
+    String  filter;
+    bool    messagesToRF;
+    bool    objectsToRF;
+};
+
+class DIGI {
+public:
+    int     mode;
+    int     ecoMode;        // 0 = Not Active | 1 = Ultra EcoMode | 2 = Not Active (WiFi OFF, Serial ON)
+};
+
+class LoraModule {
+public:
+    long    txFreq;
+    long    rxFreq;
+    bool    txActive;
+    bool    rxActive;
+    int     spreadingFactor;
+    long    signalBandwidth;
+    int     codingRate4;
+    int     power;
+};
+
+class Display {
+public:
+    bool    alwaysOn;
+    int     timeout;
+    bool    turn180;
+};
+
+class BATTERY {
+public:
+    bool    sendInternalVoltage;
+    bool    monitorInternalVoltage;
+    float   internalSleepVoltage;
+    bool    sendExternalVoltage;
+    int     externalVoltagePin;
+    bool    monitorExternalVoltage;
+    float   externalSleepVoltage;
+    float   voltageDividerR1;
+    float   voltageDividerR2;
+    bool    sendVoltageAsTelemetry;
+};
+
+class WXSENSOR {
+public:
+    bool    active;
+    int     heightCorrection;
+    float   temperatureCorrection;
+};
+
+class SYSLOG {
+public:
+    bool    active;
+    String  server;
+    int     port;
+};
+
+class TNC {
+public:
+    bool    enableServer;
+    bool    enableSerial;
+    bool    acceptOwn;
+};
+
+class OTA {
+public:
+    String  username;
+    String  password;
+};
+
+class WEBADMIN {
+public:
+    bool    active;
+    String  username;
+    String  password;
+};
+
+class NTP {
+public:
+    float   gmtCorrection;
+};
+
+class REMOTE_MANAGEMENT {
+public:
+    String  managers;
+    bool    rfOnly;
+};
+
+class Configuration {
+public:
+    String                  callsign;
+    int                     rememberStationTime;
+    bool                    backupDigiMode;
+    bool                    rebootMode;
+    int                     rebootModeTime;
+    String                  personalNote;
+    String                  blacklist;
+    std::vector<WiFi_AP>    wifiAPs;
+    WiFi_Auto_AP            wifiAutoAP;
+    BEACON                  beacon;
+    APRS_IS                 aprs_is;
+    DIGI                    digi;
+    LoraModule              loramodule;
+    Display                 display;
+    BATTERY                 battery;
+    WXSENSOR                wxsensor;
+    SYSLOG                  syslog;
+    TNC                     tnc;  
+    OTA                     ota;
+    WEBADMIN                webadmin;
+    NTP                     ntp;    
+    REMOTE_MANAGEMENT       remoteManagement;
+
+    void init();
+    void writeFile();
+    Configuration();
+
+private:
+    bool readFile();
+    String _filePath;
+};
+
+#endif

include/digi_utils.h

@@ -0,0 +1,16 @@
+#ifndef DIGI_UTILS_H_
+#define DIGI_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace DIGI_Utils {
+
+    String  buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq);
+    String  generateDigipeatedPacket(const String& packet, bool thirdParty);
+    void    processLoRaPacket(const String& packet);
+    void    checkEcoMode();
+
+}
+
+#endif

include/display.h

@@ -0,0 +1,14 @@
+#ifndef DISPLAY_H_
+#define DISPLAY_H_
+
+#include <Arduino.h>
+
+#define SCREEN_ADDRESS  0x3C    ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
+
+void displaySetup();
+void displayToggle(bool toggle);
+
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, int wait = 0);
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, const String& line6, int wait = 0);
+
+#endif

include/gps_utils.h

@@ -0,0 +1,23 @@
+#ifndef GPS_UTILS_H_
+#define GPS_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace GPS_Utils {
+    
+    String  getiGateLoRaBeaconPacket();
+    char    *ax25_base91enc(char *s, uint8_t n, uint32_t v);
+    String  encodeGPS(float latitude, float longitude, const String& overlay, const String& symbol);
+    void    generateBeaconFirstPart();
+    void    generateBeacons();
+    String  decodeEncodedGPS(const String& packet);
+    String  getReceivedGPS(const String& packet);
+    String  getDistanceAndComment(const String& packet);
+
+    void    setup();
+    void    getData();
+
+}
+
+#endif

include/kiss_utils.h

@@ -3,6 +3,7 @@
 
 #include <Arduino.h>
 
+
 String encodeAddressAX25(String tnc2Address);
 String decodeAddressAX25(const String& ax25Address, bool& isLast, bool isRelay);
 

include/lora_utils.h

@@ -0,0 +1,20 @@
+#ifndef LORA_UTILS_H_
+#define LORA_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace LoRa_Utils {
+
+    void    setup();
+    void    sendNewPacket(const String& newPacket);
+    String  receivePacketFromSleep();
+    String  receivePacket();
+    void    changeFreqTx();
+    void    changeFreqRx();
+    void    wakeRadio();
+    void    sleepRadio();
+
+}
+
+#endif

include/ntp_utils.h

@@ -0,0 +1,15 @@
+#ifndef NTP_UTILS_H_
+#define NTP_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace NTP_Utils {
+
+    void    setup();
+    void    update();
+    String  getFormatedTime();
+
+}
+
+#endif

include/power_utils.h

@@ -0,0 +1,26 @@
+#ifndef POWER_UTILS_H_
+#define POWER_UTILS_H_
+
+#include <Arduino.h>
+#if defined(HAS_AXP192) || defined(HAS_AXP2101)
+    #include "XPowersLib.h"
+#else
+    #include <Wire.h>
+#endif
+
+
+namespace POWER_Utils {
+
+    double  getBatteryVoltage();
+    bool    isBatteryConnected();
+    void    activateMeasurement();
+    void    activateGPS();
+    void    deactivateGPS();
+    void    activateLoRa();
+    void    deactivateLoRa();
+    bool    begin(TwoWire &port);
+    void    setup();
+
+}
+
+#endif

include/query_utils.h

@@ -0,0 +1,13 @@
+#ifndef QUERY_UTILS_H_
+#define QUERY_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace QUERY_Utils {
+
+    String process(const String& query, const String& station, bool queryFromAPRSIS, bool thirdParty);
+
+}
+
+#endif

include/sleep_utils.h

@@ -0,0 +1,15 @@
+#ifndef SLEEP_UTILS_H_
+#define SLEEP_UTILS_H_
+
+#include <Arduino.h>
+
+namespace SLEEP_Utils {
+    
+    void setup();
+    void checkWakeUpFlag();
+    void startSleeping();
+    void checkSerial();
+
+}
+
+#endif

include/station_utils.h

@@ -0,0 +1,36 @@
+#ifndef STATION_UTILS_H_
+#define STATION_UTILS_H_
+
+
+#include <Arduino.h>
+
+
+struct Packet25SegBuffer {
+    uint32_t    receivedTime;
+    String      station;
+    String      payload;
+};
+
+struct LastHeardStation {
+    uint32_t    lastHeardTime;
+    String      station;
+};
+
+namespace STATION_Utils {
+
+    void loadBlacklistAndManagers();
+    bool isBlacklisted(const String& callsign);
+    bool isManager(const String& callsign);
+    bool checkObjectTime(const String& packet);
+    void deleteNotHeard();
+    void updateLastHeard(const String& station);
+    bool wasHeard(const String& station);
+    void clean25SegBuffer();
+    bool check25SegBuffer(const String& station, const String& textMessage);
+    void processOutputPacketBufferUltraEcoMode();
+    void processOutputPacketBuffer();
+    void addToOutputPacketBuffer(const String& packet);
+
+}
+
+#endif

include/syslog_utils.h

@@ -0,0 +1,14 @@
+#ifndef SYSLOG_H_
+#define SYSLOG_H_
+
+#include <Arduino.h>
+
+
+namespace SYSLOG_Utils {
+
+    void log(const uint8_t type ,const String& packet, const int rssi, const float snr, const int freqError);
+    void setup();
+
+}
+
+#endif

include/tnc_utils.h

@@ -3,13 +3,14 @@
 
 #include <Arduino.h>
 
+
 namespace TNC_Utils {
 
     void setup();
     void loop();
-    
-    void sendToClients(String packet);
-    void sendToSerial(String packet);
+
+    void sendToClients(const String& packet);
+    void sendToSerial(const String& packet);
 
 }
 

include/utils.h

@@ -0,0 +1,34 @@
+#ifndef UTILS_H_
+#define UTILS_H_
+
+#include <Arduino.h>
+
+
+class ReceivedPacket {
+public:
+    String  rxTime;
+    String  packet;
+    int     RSSI;
+    float   SNR;
+};
+
+namespace Utils {
+
+    void    processStatus();
+    String  getLocalIP();
+    void    setupDisplay();
+    void    activeStations();
+    void    checkBeaconInterval();
+    void    checkDisplayInterval();
+    void    validateFreqs();
+    void    typeOfPacket(const String& packet, const uint8_t packetType);
+    void    print(const String& text);
+    void    println(const String& text);
+    void    checkRebootMode();
+    void    checkRebootTime();
+    void    checkSleepByLowBatteryVoltage(uint8_t mode);
+    bool    checkValidCallsign(const String& callsign);
+
+}
+
+#endif

include/web_utils.h

@@ -13,10 +13,6 @@ namespace WEB_Utils {
     void handleNotFound(AsyncWebServerRequest *request);
     void handleStatus(AsyncWebServerRequest *request);
     void handleHome(AsyncWebServerRequest *request);
-
-    //void handleReadConfiguration(AsyncWebServerRequest *request);
-    //void handleWriteConfiguration(AsyncWebServerRequest *request);
-
     void handleStyle(AsyncWebServerRequest *request);
     void handleScript(AsyncWebServerRequest *request);
     void handleBootstrapStyle(AsyncWebServerRequest *request);

include/wifi_utils.h

@@ -9,9 +9,9 @@ namespace WIFI_Utils {
     void checkWiFi();
     void startAutoAP();
     void startWiFi();
-    void checkIfAutoAPShouldPowerOff();
+    void checkAutoAPTimeout();
     void setup();
-    
+
 }
 
 #endif

include/wx_utils.h

@@ -0,0 +1,23 @@
+#ifndef WX_UTILS_H_
+#define WX_UTILS_H_
+
+#include <Adafruit_Sensor.h>
+#include <Adafruit_BME280.h>
+#include <Adafruit_BMP280.h>
+#include <Adafruit_BME680.h>
+#include "Adafruit_Si7021.h"
+#include <Arduino.h>
+
+
+namespace WX_Utils {
+
+    void    getWxModuleAddres();
+    void    setup();
+    String  generateTempString(const float sensorTemp);
+    String  generateHumString(const float sensorHum);
+    String  generatePresString(const float sensorPres);
+    String  readDataSensor();
+
+}
+
+#endif

installer/install_upgrade.bat

@@ -1,39 +0,0 @@
-@echo off
-echo Loading...
-
-where /q python.exe
-if %errorlevel% neq 0 (
-    echo "Python is not installed. Please install it and try again."
-    exit /b
-)
-
-where /q pip
-if %errorlevel% neq 0 (
-    echo "pip is not installed. Please install it and try again."
-    exit /b
-)
-
-pip show pyserial >nul 2>&1
-if %errorlevel% neq 0 (
-    echo "Installing pyserial..."
-    pip install pyserial
-)
-
-echo Your firmware will be upgraded without factory reset.
-
-echo:
-
-echo IF THIS IS YOUR FIRST FLASH ON THIS BOARD PLEASE USE install_with_factory_reset.bat INSTEAD!
-
-echo:
-
-echo Available COM ports:
-python.exe -c "import serial.tools.list_ports; print('\n'.join([str(c) for c in serial.tools.list_ports.comports()]))"
-
-echo:
-
-set /p port="Enter COM port (for example COM5): "
-
-python.exe ./bin/esptool/esptool.py --chip esp32 --port "%port%" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 firmware/bootloader.bin 0x8000 firmware/partitions.bin 0xe000 firmware/boot_app0.bin 0x10000 firmware/firmware.bin
-
-pause

installer/install_upgrade.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-echo "Your firmware will be upgraded without factory reset."
-echo "IF THIS IS YOUR FIRST FLASH ON THIS BOARD PLEASE USE install_with_factory_reset.sh INSTEAD!"
-
-read -p "Enter COM port (for example /dev/ttyS5): " port
-
-PYTHON_CMD=python
-if command -v python3 &> /dev/null
-then
-    PYTHON_CMD=python3
-fi
-
-PYTHON_CMD ./bin/esptool/esptool.py --chip esp32 --port "$port" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 firmware/bootloader.bin 0x8000 firmware/partitions.bin 0xe000 firmware/boot_app0.bin 0x10000 firmware/firmware.bin
-
-echo "Firmware flashed"

installer/install_with_factory_reset.bat

@@ -1,44 +0,0 @@
-@echo off
-echo Loading...
-
-where /q python.exe
-if %errorlevel% neq 0 (
-    echo "Python is not installed. Please install it and try again."
-    exit /b
-)
-
-where /q pip
-if %errorlevel% neq 0 (
-    echo "pip is not installed. Please install it and try again."
-    exit /b
-)
-
-pip show pyserial >nul 2>&1
-if %errorlevel% neq 0 (
-    echo "Installing pyserial..."
-    pip install pyserial
-)
-
-
-echo Your current configuration will be LOST!!!
-echo Your current configuration will be LOST!!!
-echo Your current configuration will be LOST!!!
-
-echo:
-
-echo If you already have this board flashed with our firmware please use install_upgrade.bat instead!
-
-echo:
-
-echo Available COM ports:
-python.exe -c "import serial.tools.list_ports; print('\n'.join([str(c) for c in serial.tools.list_ports.comports()]))"
-
-echo:
-
-set /p port="Enter COM port (for example COM5): "
-
-python.exe bin/esptool/esptool.py --chip esp32 --port "%port%" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 2686976 firmware/spiffs.bin
-
-python.exe bin/esptool/esptool.py --chip esp32 --port "%port%" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 firmware/bootloader.bin 0x8000 firmware/partitions.bin 0xe000 firmware/boot_app0.bin 0x10000 firmware/firmware.bin
-
-pause

installer/install_with_factory_reset.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-echo "Your firmware will be upgraded without factory reset."
-echo "IF THIS IS YOUR FIRST FLASH ON THIS BOARD PLEASE USE install_with_factory_reset.sh INSTEAD!"
-
-read -p "Enter COM port (for example /dev/ttyS5): " port
-
-PYTHON_CMD=python
-if command -v python3 &> /dev/null
-then
-    PYTHON_CMD=python3
-fi
-
-$PYTHON_CMD ./bin/esptool/esptool.py --chip esp32 --port "$port" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 2686976 firmware/spiffs.bin
-
-$PYTHON_CMD ./bin/esptool/esptool.py --chip esp32 --port "$port" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 firmware/bootloader.bin 0x8000 firmware/partitions.bin 0xe000 firmware/boot_app0.bin 0x10000 firmware/firmware.bin
-
-echo "Firmware flashed"

platformio.ini

@@ -11,8 +11,13 @@
 [platformio]
 default_envs = ttgo-lora32-v21
 
+extra_configs =
+	common_settings.ini
+	variants/*/platformio.ini
+
 [env]
-platform = espressif32 @ 6.3.1
+platform = espressif32 @ 6.7.0
+board_build.partitions = min_spiffs.csv
 framework = arduino
 monitor_speed = 115200
 board_build.embed_files = 
@@ -21,137 +26,7 @@ board_build.embed_files =
 	data_embed/script.js.gz
 	data_embed/bootstrap.css.gz
 	data_embed/bootstrap.js.gz
-lib_deps = 
-	bblanchon/ArduinoJson@^6.20.2
-	adafruit/Adafruit GFX Library @ 1.11.5
-	adafruit/Adafruit SSD1306 @ 2.5.7
-	mikalhart/TinyGPSPlus @ 1.0.3
-	adafruit/Adafruit Unified Sensor@^1.1.9
-	adafruit/Adafruit BME280 Library@^2.2.2
-	adafruit/Adafruit BMP280 Library@^2.6.8
-	adafruit/Adafruit BME680 Library@^2.0.4
-	jgromes/RadioLib @ 6.1.0
-	lewisxhe/XPowersLib@^0.1.8
-	ayushsharma82/ElegantOTA@^3.1.0
-	ottowinter/ESPAsyncWebServer-esphome@3.0.0
-	esphome/AsyncTCP-esphome@2.1.1
-	
+	data_embed/favicon.png.gz
 extra_scripts = 
 	pre:tools/compress.py
-
-debug_tool = esp-prog
-
-[env:ttgo-lora32-v21]
-board = ttgo-lora32-v21
-build_flags =
-	-Werror -Wall
-	-DTTGO_T_LORA32_V2_1
-	-DHAS_SX127X
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:heltec-lora32-v2]
-board = ttgo-lora32-v21
-build_flags =
-	-Werror -Wall
-	-DHELTEC_V2
-	-DHAS_SX127X
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:heltec_wifi_lora_32_V3]
-board = heltec_wifi_lora_32_V3
-board_build.mcu = esp32s3
-build_flags =
-	-Werror -Wall
-	-DHELTEC_V3
-	-DHAS_SX126X
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ESP32_DIY_LoRa]
-board = esp32dev
-build_flags =
-	-Werror -Wall
-	-DESP32_DIY_LoRa
-	-DHAS_SX127X
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ESP32_DIY_1W_LoRa]
-board = esp32dev
-build_flags =
-	-Werror -Wall
-	-DESP32_DIY_1W_LoRa
-	-DHAS_SX126X
-	-DHAS_SX1268
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1_2]
-board = ttgo-t-beam
-build_flags =
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_2
-	-DHAS_SX127X
-	-DHAS_SX1278
-	-DHAS_AXP2101
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1]
-board = ttgo-t-beam
-build_flags =
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_0
-	-DHAS_SX127X
-	-DHAS_SX1278
-	-DHAS_AXP192
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1_SX1268]
-board = ttgo-t-beam
-build_flags =
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_0_SX1268
-	-DHAS_SX126X
-	-DHAS_SX1268
-	-DHAS_AXP192
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1_2_SX1262]
-board = ttgo-t-beam
-build_flags =
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_2_SX1262
-	-DHAS_SX126X
-	-DHAS_SX1262
-	-DHAS_AXP2101
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:OE5HWN_MeshCom]
-board = esp32dev
-build_flags =
-	-Werror -Wall
-	-DOE5HWN_MeshCom
-	-DHAS_SX126X
-	-DHAS_SX1268
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:heltec_wireless_stick]
-board = heltec_wifi_lora_32_V3
-board_build.mcu = esp32s3
-build_flags =
-	-Werror -Wall
-	-DHELTEC_WS
-	-DHAS_SX126X
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:heltec_ht-ct62]
-board = heltec_wireless_stick_lite
-board_build.mcu = esp32c3
-build_flags =
-	-Werror -Wall
-	-DHELTEC_HTCT62
-	-DHAS_SX126X
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+debug_tool = esp-prog

src/A7670_utils.cpp

@@ -0,0 +1,207 @@
+#include "configuration.h"
+#include "aprs_is_utils.h"
+#include "board_pinout.h"
+#include "A7670_utils.h"
+#include "lora_utils.h"
+#include "display.h"
+#include "utils.h"
+
+
+#ifdef HAS_A7670
+    #define TINY_GSM_MODEM_SIM7600      //The AT instruction of A7670 is compatible with SIM7600 
+    #define TINY_GSM_RX_BUFFER 1024     // Set RX buffer to 1Kb
+    #define SerialAT Serial1
+    #include <TinyGsmClient.h>
+    #include <StreamDebugger.h>
+    StreamDebugger debugger(SerialAT, Serial);
+    TinyGsm modem(debugger);
+
+    extern Configuration    Config;
+    extern String           firstLine;
+
+    bool modemStartUp       = false;
+    bool serverStartUp      = false;
+    bool userBytesSended    = false;
+    bool beaconBytesSended  = false;
+    bool beaconSended       = false;
+    bool stationBeacon      = false;
+
+    extern bool modemLoggedToAPRSIS;
+
+
+    namespace A7670_Utils {
+
+        bool checkModemOn() {
+            bool modemReady = false;
+            Serial.print("Starting Modem ...              ");
+            displayShow(firstLine, "Starting Modem...", " ", " ", 0);
+
+            pinMode(A7670_ResetPin, OUTPUT);        //A7670 Reset
+            digitalWrite(A7670_ResetPin, LOW);
+            delay(100);
+            digitalWrite(A7670_ResetPin, HIGH);
+            delay(3000);
+            digitalWrite(A7670_ResetPin, LOW);
+
+            pinMode(A7670_PWR_PIN, OUTPUT);
+            digitalWrite(A7670_PWR_PIN, LOW);
+            delay(100);
+            digitalWrite(A7670_PWR_PIN, HIGH);
+            delay(1000);
+            digitalWrite(A7670_PWR_PIN, LOW);
+
+            int i = 20;
+            while (i) {
+                SerialAT.println("AT");
+                delay(500);
+                if (SerialAT.available()) {
+                    String r = SerialAT.readString();
+                    //Serial.println(r);
+                    if ( r.indexOf("OK") >= 0 ) {
+                        modemReady = true;
+                        i = 1;
+                        Serial.println("Modem Ready!\n");
+                        displayShow(firstLine, "Starting Modem...", "---> Modem Ready", " ", 0);
+                        return true;
+                    }
+                }
+                if (!modemReady) {
+                    delay(500);
+                }
+                i--;
+            }
+            return false;
+        }
+
+        void setup() {
+            SerialAT.begin(115200, SERIAL_8N1, A7670_RX_PIN, A7670_TX_PIN);
+            if (checkModemOn()) {;
+                delay(1000);
+                //setup_gps();      // if gps active / won't be need for now
+            } else {
+                displayShow(firstLine, "Starting Modem...", "---> Failed !!!", " ", 0);
+                Serial.println(F("*********** Failed to connect to the modem! ***********"));
+            }
+        }
+
+        bool checkATResponse(const String& ATMessage) {
+            int delayATMessage = 3000;
+            bool validAT = false;
+            //Serial.println(ATMessage);
+            int i = 10;
+            while (i) {
+                if (!validAT) {
+                    SerialAT.println(ATMessage);
+                }
+                delay(500);
+                if (SerialAT.available()) {
+                    String response = SerialAT.readString();
+                    //Serial.println(response); // DEBUG of Modem AT message
+                    if(response.indexOf("verified") >= 0) {
+                        Serial.println("Logged! (User Validated)\n");
+                        displayShow(firstLine, "Connecting APRS-IS...", "---> Logged!", " ", 1000);
+                        Serial.println("####################   APRS-IS FEED   ####################");
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage == "AT+NETOPEN" && response.indexOf("OK") >= 0) {
+                        Serial.println("Port Open!");
+                        displayShow(firstLine, "Opening Port...", "---> Port Open", " ", 0);
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage == "AT+NETOPEN" && response.indexOf("Network is already opened") >= 0) {
+                        Serial.println("Port Open! (was already opened)");
+                        displayShow(firstLine, "Opening Port...", "---> Port Open", " ", 0);
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage.indexOf("AT+CIPOPEN") == 0 && response.indexOf("PB DONE") >= 0) {
+                        Serial.println("Contacted!");
+                        displayShow(firstLine, "Connecting APRS-IS...", "---> Contacted", " ", 0);
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage.indexOf("AT+CIPSEND=0,") == 0 && response.indexOf(">") >= 0) {
+                        Serial.print(".");
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage.indexOf(Config.callsign) >= 3 && !modemLoggedToAPRSIS && response.indexOf("OK") >= 0 && !stationBeacon) { // login info
+                        validAT = true;
+                        delayATMessage = 0;
+                    } else if (ATMessage.indexOf(Config.callsign) == 0 && !beaconSended && response.indexOf("OK") >= 0 && !stationBeacon) {   // self beacon or querys
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (stationBeacon && response.indexOf("OK") >= 0) { //upload others beacons
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    }
+                }
+                delay(delayATMessage);
+                i--;
+            }
+            return validAT;
+        }
+
+        void APRS_IS_connect() {
+            String loginInfo = "user ";
+            loginInfo += Config.callsign;
+            loginInfo += " pass ";
+            loginInfo += String(Config.aprs_is.passcode);
+            loginInfo += " vers CA2RXU_LoRa_iGate 1.3 filter ";
+            loginInfo += Config.aprs_is.filter;
+            Serial.println("-----> Connecting to APRS IS");
+            while (!modemStartUp) {
+                Serial.print("Opening Port...                 ");
+                displayShow(firstLine, "Opening Port...", " ", " ", 0);
+                modemStartUp = checkATResponse("AT+NETOPEN");
+                delay(2000);
+            } while (!serverStartUp) {
+                Serial.print("Connecting APRS-IS Server...    ");
+                displayShow(firstLine, "Connecting APRS-IS...", " ", " ", 0);
+                serverStartUp = checkATResponse("AT+CIPOPEN=0,\"TCP\",\"" + String(Config.aprs_is.server) + "\"," + String(Config.aprs_is.port));
+                delay(2000);
+            } while (!userBytesSended) {
+                Serial.print("Writing User Login Data       ");
+                displayShow(firstLine, "Connecting APRS-IS...", "---> User Login Data", " ", 0);
+                userBytesSended = checkATResponse("AT+CIPSEND=0," + String(loginInfo.length()+1));
+                delay(2000);
+            } while (!modemLoggedToAPRSIS) {
+                Serial.print(".");
+                modemLoggedToAPRSIS = checkATResponse(loginInfo);
+                delay(2000);
+            }
+        }
+
+        void uploadToAPRSIS(const String& packet) {
+            beaconBytesSended = checkATResponse("AT+CIPSEND=0," + String(packet.length()+1));
+            delay(2000);
+            if (beaconBytesSended) {
+                Serial.print(".");
+                beaconSended = checkATResponse(packet);
+            } 
+            if (!beaconSended) {
+                Serial.println("------------------------------------> UPLOAD FAILED!!!");
+            } else {
+                Serial.println("Packet Uploaded to APRS-IS!");
+            }
+            beaconBytesSended = false;
+            beaconSended = false;
+        }
+
+        void listenAPRSIS() {
+            if (SerialAT.available()) {
+                String packetAPRSIS = SerialAT.readStringUntil('\r');
+                packetAPRSIS.trim();
+                if (!packetAPRSIS.startsWith("#") && packetAPRSIS.indexOf("+IPD") == -1 && packetAPRSIS.indexOf("RECV") == -1 && packetAPRSIS.length() > 0) {
+                    APRS_IS_Utils::processAPRSISPacket(packetAPRSIS);
+                }
+            }
+            delay(1);
+        }
+    }
+    
+#endif

src/LoRa_APRS_iGate.cpp

@@ -1,219 +1,213 @@
+/*___________________________________________________________________
+
+██╗      ██████╗ ██████╗  █████╗      █████╗ ██████╗ ██████╗ ███████╗
+██║     ██╔═══██╗██╔══██╗██╔══██╗    ██╔══██╗██╔══██╗██╔══██╗██╔════╝
+██║     ██║   ██║██████╔╝███████║    ███████║██████╔╝██████╔╝███████╗
+██║     ██║   ██║██╔══██╗██╔══██║    ██╔══██║██╔═══╝ ██╔══██╗╚════██║
+███████╗╚██████╔╝██║  ██║██║  ██║    ██║  ██║██║     ██║  ██║███████║
+╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝    ╚═╝  ╚═╝╚═╝     ╚═╝  ╚═╝╚══════╝
+                                                                     
+                ██╗ ██████╗  █████╗ ████████╗███████╗
+                ██║██╔════╝ ██╔══██╗╚══██╔══╝██╔════╝
+                ██║██║  ███╗███████║   ██║   █████╗
+                ██║██║   ██║██╔══██║   ██║   ██╔══╝
+                ██║╚██████╔╝██║  ██║   ██║   ███████╗
+                ╚═╝ ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚══════╝
+
+
+                       Ricardo Guzman - CA2RXU 
+          https://github.com/richonguzman/LoRa_APRS_Tracker
+             (donations : http://paypal.me/richonguzman)
+___________________________________________________________________*/
+
+#include <ElegantOTA.h>
+#include <TinyGPS++.h>
 #include <Arduino.h>
 #include <WiFi.h>
 #include <vector>
 #include "configuration.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
+#include "battery_utils.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
-#include "pins_config.h"
-#include "query_utils.h"
 #include "power_utils.h"
+#include "sleep_utils.h"
 #include "lora_utils.h"
 #include "wifi_utils.h"
 #include "digi_utils.h"
 #include "gps_utils.h"
-#include "bme_utils.h"
 #include "web_utils.h"
 #include "tnc_utils.h"
+#include "ntp_utils.h"
+#include "wx_utils.h"
 #include "display.h"
 #include "utils.h"
-#include <ElegantOTA.h>
-#include "battery_utils.h"
+#ifdef HAS_A7670
+    #include "A7670_utils.h"
+#endif
 
-Configuration   Config;
-WiFiClient      espClient;
 
-String          versionDate           = "2024.04.13";
-uint8_t         myWiFiAPIndex         = 0;
-int             myWiFiAPSize          = Config.wifiAPs.size();
-WiFi_AP         *currentWiFi          = &Config.wifiAPs[myWiFiAPIndex];
+String              versionDate             = "2025-06-20";
+Configuration       Config;
+WiFiClient          espClient;
+#ifdef HAS_GPS
+    HardwareSerial  gpsSerial(1);
+    TinyGPSPlus     gps;
+    uint32_t        gpsSatelliteTime        = 0;
+    bool            gpsInfoToggle           = false;
+#endif
 
-bool            isUpdatingOTA         = false;
-bool            statusAfterBoot       = true;
-bool            beaconUpdate          = true;
-uint32_t        lastBeaconTx          = 0;
-uint32_t        previousWiFiMillis    = 0;
-uint32_t        lastScreenOn          = millis();
+uint8_t             myWiFiAPIndex           = 0;
+int                 myWiFiAPSize            = Config.wifiAPs.size();
+WiFi_AP             *currentWiFi            = &Config.wifiAPs[myWiFiAPIndex];
 
-uint32_t        lastWiFiCheck         = 0;
-bool            WiFiConnect           = true;
-bool            WiFiConnected         = false;
+bool                isUpdatingOTA           = false;
+uint32_t            lastBatteryCheck        = 0;
 
-bool            WiFiAutoAPStarted     = false;
-long            WiFiAutoAPTime        = false;
+bool                backUpDigiMode          = false;
+bool                modemLoggedToAPRSIS     = false;
 
-uint32_t        lastBatteryCheck      = 0;
-
-uint32_t        bmeLastReading        = -60000;
-
-String          batteryVoltage;
-
-std::vector<String> lastHeardStation;
-std::vector<String> lastHeardStation_temp;
-std::vector<String> packetBuffer;
-std::vector<String> packetBuffer_temp;
+#ifdef HAS_EPAPER
+    uint32_t        lastEpaperTime          = 0;
+    extern String   lastEpaperText;
+#endif
 
 std::vector<ReceivedPacket> receivedPackets;
 
-String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, iGateBeaconPacket, iGateLoRaBeaconPacket;
+String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine;
+//#define STARTUP_DELAY 5 //min
+
 
 void setup() {
     Serial.begin(115200);
-
-    #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_HTCT62)
-    pinMode(batteryPin, INPUT);
-    #endif
-    #ifdef HAS_INTERNAL_LED
-    pinMode(internalLedPin, OUTPUT);
-    #endif
-    if (Config.externalVoltageMeasurement) {
-        pinMode(Config.externalVoltagePin, INPUT);
-    }
-    #if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_SX1262)
     POWER_Utils::setup();
-    #endif
-    delay(1000);
     Utils::setupDisplay();
-
-    Config.check();
-
     LoRa_Utils::setup();
     Utils::validateFreqs();
+    GPS_Utils::setup();
+    STATION_Utils::loadBlacklistAndManagers();
 
-    iGateBeaconPacket = GPS_Utils::generateBeacon();
-    iGateLoRaBeaconPacket = GPS_Utils::generateiGateLoRaBeacon();
-
-#ifdef HELTEC_HTCT62
-    if (Config.lowPowerMode) {
-        gpio_wakeup_enable(GPIO_NUM_3, GPIO_INTR_HIGH_LEVEL);
-        esp_deep_sleep_enable_gpio_wakeup(GPIO_NUM_3, ESP_GPIO_WAKEUP_GPIO_HIGH);
-
-        long lastBeacon = 0;
-
-        LoRa_Utils::startReceive();
-
-        while (true) {
-            auto wakeup_reason = esp_sleep_get_wakeup_cause();
-
-            if (wakeup_reason == 7) { // packet received
-                Serial.println("Received packet");
-
-                String packet = LoRa_Utils::receivePacket();
-
-                Serial.println(packet);
-
-                if (Config.digi.mode == 2) { // If Digi enabled
-                    DIGI_Utils::loop(packet); // Send received packet to Digi
-                }
-
-                if (packet.indexOf(Config.callsign + ":?APRSELP{") != -1) { // Send `?APRSELP` to exit low power
-                    Serial.println("Got ?APRSELP message, exiting from low power mode");
-                    break;
-                };
-            }
-
-            long time = esp_timer_get_time() / 1000000;
-
-            if (lastBeacon == 0 || time - lastBeacon >= Config.beacon.interval * 60) {
-                Serial.println("Sending beacon");
-
-                String comment = Config.beacon.comment;
-
-                if (Config.sendBatteryVoltage) {
-                    comment += " Batt=" + String(BATTERY_Utils::checkBattery(),2) + "V";
-                }
-
-                if (Config.externalVoltageMeasurement) {
-                    comment += " Ext=" + String(BATTERY_Utils::checkExternalVoltage(),2) + "V";
-                }
-
-                LoRa_Utils::sendNewPacket("APRS", iGateLoRaBeaconPacket + comment);
-            
-                lastBeacon = time;
-            }
-
-            LoRa_Utils::startReceive();
-
-            Serial.println("Sleeping");
-
-            long sleep = (Config.beacon.interval * 60) - (time - lastBeacon);
-
-            Serial.flush();
-
-            esp_sleep_enable_timer_wakeup(sleep * 1000000);
-            esp_light_sleep_start();
-
-            Serial.println("Waked up");
-        }
-
-        Config.loramodule.rxActive = false;
-    }
-#endif
+    #ifdef STARTUP_DELAY    // (TEST) just to wait for WiFi init of Routers
+        displayShow("", "  STARTUP DELAY ...", "", "", 0);
+        delay(STARTUP_DELAY * 60 * 1000);
+    #endif
 
+    SLEEP_Utils::setup();
     WIFI_Utils::setup();
-
+    NTP_Utils::setup();
     SYSLOG_Utils::setup();
-    BME_Utils::setup();
+    WX_Utils::setup();
     WEB_Utils::setup();
     TNC_Utils::setup();
+    #ifdef HAS_A7670
+        A7670_Utils::setup();
+    #endif
+    Utils::checkRebootMode();
+    APRS_IS_Utils::firstConnection();
+    SLEEP_Utils::checkSerial();
 }
 
 void loop() {
-    WIFI_Utils::checkIfAutoAPShouldPowerOff();
+    if (Config.digi.ecoMode == 1) {
+        SLEEP_Utils::checkWakeUpFlag();
+        Utils::checkBeaconInterval();
+        STATION_Utils::processOutputPacketBufferUltraEcoMode();
+        Utils::checkSleepByLowBatteryVoltage(1);
+        SLEEP_Utils::startSleeping();
+    } else {
+        WIFI_Utils::checkAutoAPTimeout();
 
-    if (isUpdatingOTA) {
-        ElegantOTA.loop();
-        return; // Don't process IGate and Digi during OTA update
-    }
+        if (isUpdatingOTA) {
+            ElegantOTA.loop();
+            return; // Don't process IGate and Digi during OTA update
+        }
+        
+        #ifdef HAS_GPS
+            if (Config.beacon.gpsActive) {
+                if (millis() - gpsSatelliteTime > 5000) {
+                    gpsInfoToggle = !gpsInfoToggle;
+                    gpsSatelliteTime = millis();
+                }
+                if (gpsInfoToggle) {
+                    thirdLine = "Satellite(s): ";
+                    String gpsData = String(gps.satellites.value());
+                    if (gpsData.length() < 2) gpsData = "0" + gpsData;  // Ensure two-digit formatting
+                    thirdLine += gpsData;
+                } else {
+                    thirdLine = Utils::getLocalIP();
+                }
+            } else {
+                thirdLine = Utils::getLocalIP();
+            }
+        #else
+            thirdLine = Utils::getLocalIP();
+        #endif
 
-    if (Config.lowVoltageCutOff > 0) {
-        BATTERY_Utils::checkIfShouldSleep();
-    }
+        #ifdef HAS_A7670
+            if (Config.aprs_is.active && !modemLoggedToAPRSIS) A7670_Utils::APRS_IS_connect();
+        #else
+            WIFI_Utils::checkWiFi();
+            if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
+        #endif
 
-    thirdLine = Utils::getLocalIP();
+        NTP_Utils::update();
+        TNC_Utils::loop();
 
-    WIFI_Utils::checkWiFi(); // Always use WiFi, not related to IGate/Digi mode
-    // Utils::checkWiFiInterval();
+        Utils::checkDisplayInterval();
+        Utils::checkBeaconInterval();
+        
+        APRS_IS_Utils::checkStatus(); // Need that to update display, maybe split this and send APRSIS status to display func?
 
-    if (Config.aprs_is.active && !espClient.connected()) {
-        APRS_IS_Utils::connect();
-    }
-
-    TNC_Utils::loop();
-
-    Utils::checkDisplayInterval();
-    Utils::checkBeaconInterval();
-
-    
-    
-    APRS_IS_Utils::checkStatus(); // Need that to update display, maybe split this and send APRSIS status to display func?
-
-    String packet = "";
-    if (Config.loramodule.rxActive) {
-        packet = LoRa_Utils::receivePacket(); // We need to fetch LoRa packet above APRSIS and Digi
-    } 
-
-    if (packet != "") {
-        if (Config.aprs_is.active) { // If APRSIS enabled
-            APRS_IS_Utils::processLoRaPacket(packet); // Send received packet to APRSIS
+        String packet = "";
+        if (Config.loramodule.rxActive) {
+            packet = LoRa_Utils::receivePacket(); // We need to fetch LoRa packet above APRSIS and Digi
         }
 
-        if (Config.digi.mode == 2) { // If Digi enabled
-            DIGI_Utils::loop(packet); // Send received packet to Digi
+        if (packet != "") {
+            if (Config.aprs_is.active) { // If APRSIS enabled
+                APRS_IS_Utils::processLoRaPacket(packet); // Send received packet to APRSIS
+            }
+
+            if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backUpDigiMode)) { // If Digi enabled
+                STATION_Utils::clean25SegBuffer();
+                DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
+            }
+
+            if (Config.tnc.enableServer) { // If TNC server enabled
+                TNC_Utils::sendToClients(packet); // Send received packet to TNC KISS
+            }
+            if (Config.tnc.enableSerial) { // If Serial KISS enabled
+                TNC_Utils::sendToSerial(packet); // Send received packet to Serial KISS
+            }
         }
 
-        if (Config.tnc.enableServer) { // If TNC server enabled
-            TNC_Utils::sendToClients(packet); // Send received packet to TNC KISS
+        if (Config.aprs_is.active) {
+            APRS_IS_Utils::listenAPRSIS(); // listen received packet from APRSIS
         }
 
-        if (Config.tnc.enableSerial) { // If Serial KISS enabled
-            TNC_Utils::sendToSerial(packet); // Send received packet to Serial KISS
-        }
+        STATION_Utils::processOutputPacketBuffer();
+
+        #ifdef HAS_EPAPER   // Only consider updating every 10 seconds (when data to show is different from before)
+            if(lastEpaperTime == 0 || millis() - lastEpaperTime > 10000) {
+                String posibleEpaperText = firstLine + secondLine + thirdLine + fourthLine + fifthLine + sixthLine + seventhLine;
+                if (lastEpaperText != posibleEpaperText) {
+                    displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                    lastEpaperText = posibleEpaperText;
+                    lastEpaperTime = millis();
+                }
+            }
+        #else
+            displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+        #endif
+
+        Utils::checkRebootTime();
+        Utils::checkSleepByLowBatteryVoltage(1);
     }
+}
 
-    if (Config.aprs_is.active) { // If APRSIS enabled
-        APRS_IS_Utils::listenAPRSIS(); // listen received packet from APRSIS
-    }
+// ESP32 (and ESPS3) work?
 
-    show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
-}
+// ESP32C3 : 
+//    -     HT-CT62 sleeps??
+//    -     and others?

src/aprs_is_utils.cpp

@@ -2,35 +2,45 @@
 #include "configuration.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
 #include "query_utils.h"
-#include "lora_utils.h"
+#include "A7670_utils.h"
 #include "digi_utils.h"
 #include "display.h"
 #include "utils.h"
 
-extern Configuration  Config;
-extern WiFiClient     espClient;
-extern uint32_t       lastScreenOn;
-extern String         firstLine;
-extern String         secondLine;
-extern String         thirdLine;
-extern String         fourthLine;
-extern String         fifthLine;
-extern String         sixthLine;
-extern String         seventhLine;
+
+extern Configuration        Config;
+extern WiFiClient           espClient;
+extern uint32_t             lastScreenOn;
+extern String               firstLine;
+extern String               secondLine;
+extern String               thirdLine;
+extern String               fourthLine;
+extern String               fifthLine;
+extern String               sixthLine;
+extern String               seventhLine;
+extern bool                 modemLoggedToAPRSIS;
+extern bool                 backUpDigiMode;
+
+uint32_t    lastRxTime      = millis();
+bool        passcodeValid   = false;
+
+#ifdef HAS_A7670
+    extern bool             stationBeacon;
+#endif
 
 
 namespace APRS_IS_Utils {
 
-    void upload(String line) {
+    void upload(const String& line) {
         espClient.print(line + "\r\n");
     }
 
     void connect() {
-        uint8_t count = 0;
-        String aprsauth;
         Serial.print("Connecting to APRS-IS ...     ");
+        uint8_t count = 0;
         while (!espClient.connect(Config.aprs_is.server.c_str(), Config.aprs_is.port) && count < 20) {
             Serial.println("Didn't connect with server...");
             delay(1000);
@@ -43,15 +53,16 @@ namespace APRS_IS_Utils {
         }
         if (count == 20) {
             Serial.println("Tried: " + String(count) + " FAILED!");
-        }
-        else {
+        } else {
             Serial.println("Connected!\n(Server: " + String(Config.aprs_is.server) + " / Port: " + String(Config.aprs_is.port) + ")");
-
             // String filter = "t/m/" + Config.callsign + "/" + (String)Config.aprs_is.reportingDistance;
-
-            aprsauth = "user " + Config.callsign + " pass " + Config.aprs_is.passcode + " vers CA2RXU_LoRa_iGate 1.3 filter " + Config.aprs_is.filter;
-            upload(aprsauth);
-            delay(200);
+            String aprsAuth = "user ";
+            aprsAuth += Config.callsign;
+            aprsAuth += " pass ";
+            aprsAuth += Config.aprs_is.passcode;
+            aprsAuth += " vers CA2RXU_iGate 3.0 filter ";
+            aprsAuth += Config.aprs_is.filter;
+            upload(aprsAuth);
         }
     }
 
@@ -59,73 +70,102 @@ namespace APRS_IS_Utils {
         String wifiState, aprsisState;
         if (WiFi.status() == WL_CONNECTED) {
             wifiState = "OK";
-        }
-        else {
-            wifiState = "AP";
-
-            if (!Config.display.alwaysOn) {
-                display_toggle(true);
+        } else {
+            if (backUpDigiMode || Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) {
+                wifiState = "--";
+            } else {
+                wifiState = "AP";
+            }
+            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                displayToggle(true);
             }
-
             lastScreenOn = millis();
         }
 
         if (!Config.aprs_is.active) {
             aprsisState = "OFF";
-        }
-        else if (espClient.connected()) {
-            aprsisState = "OK";
-        }
-        else {
-            aprsisState = "--";
-
-            if (!Config.display.alwaysOn) {
-                display_toggle(true);
+        } else {
+            #ifdef HAS_A7670
+                if (modemLoggedToAPRSIS) {
+                    aprsisState = "OK";
+                } else {
+                    aprsisState = "--";
+                }
+            #else
+                if (espClient.connected()) {
+                    aprsisState = "OK";
+                } else {
+                    aprsisState = "--";
+                }
+            #endif
+            if(aprsisState == "--" && !Config.display.alwaysOn && Config.display.timeout != 0) {
+                displayToggle(true);
+                lastScreenOn = millis();
             }
-
-            lastScreenOn = millis();
         }
-
-        secondLine = "WiFi: " + wifiState + " APRS-IS: " + aprsisState;
+        secondLine = "WiFi: ";
+        secondLine += wifiState;
+        secondLine += " APRS-IS: ";
+        secondLine += aprsisState;
     }
 
-    String createPacket(String packet) {
+    String checkForStartingBytes(const String& packet) {
+        if (packet.indexOf("\x3c\xff\x01") != -1) {
+            return packet.substring(0, packet.indexOf("\x3c\xff\x01"));
+        } else {
+            return packet;
+        }
+    }
+
+    String buildPacketToUpload(const String& packet) {
+        String buildedPacket = packet.substring(3, packet.indexOf(":"));
         if (!(Config.aprs_is.active && Config.digi.mode == 0)) { // Check if NOT only IGate
-            return packet.substring(3, packet.indexOf(":")) + ",qAR," + Config.callsign + packet.substring(packet.indexOf(":"));
-        }
-        else {
-            return packet.substring(3, packet.indexOf(":")) + ",qAO," + Config.callsign + packet.substring(packet.indexOf(":"));
+            buildedPacket += ",qAR,";
+        } else {
+            buildedPacket += ",qAO,";
         }
+        buildedPacket += Config.callsign;
+        buildedPacket += checkForStartingBytes(packet.substring(packet.indexOf(":")));
+        return buildedPacket;
     }
 
-    bool processReceivedLoRaMessage(String sender, String packet) {
-        String ackMessage, receivedMessage;
+    bool processReceivedLoRaMessage(const String& sender, const String& packet, bool thirdParty) {
+        String receivedMessage;
         if (packet.indexOf("{") > 0) {     // ack?
-            ackMessage = "ack" + packet.substring(packet.indexOf("{") + 1);
+            String ackMessage = "ack";
+            ackMessage.concat(packet.substring(packet.indexOf("{") + 1));
             ackMessage.trim();
-            delay(4000);
             //Serial.println(ackMessage);
+
+            String addToBuffer = Config.callsign;
+            addToBuffer += ">APLRG1";
+            if (!thirdParty) addToBuffer += ",RFONLY";
+            if (Config.beacon.path != "") {
+                addToBuffer += ",";
+                addToBuffer += Config.beacon.path;
+            }
+            addToBuffer += "::";
+
+            String processedSender = sender;
             for (int i = sender.length(); i < 9; i++) {
-                sender += ' ';
-            }
-            if (Config.beacon.path == "") {
-                LoRa_Utils::sendNewPacket("APRS", Config.callsign + ">APLRG1,RFONLY::" + sender + ":" + ackMessage);
-            } else {
-                LoRa_Utils::sendNewPacket("APRS", Config.callsign + ">APLRG1,RFONLY," + Config.beacon.path + "::" + sender + ":" + ackMessage);
+                processedSender += ' ';
             }
+            addToBuffer += processedSender;
+
+            addToBuffer += ":";
+            addToBuffer += ackMessage;
+            STATION_Utils::addToOutputPacketBuffer(addToBuffer);
             receivedMessage = packet.substring(packet.indexOf(":") + 1, packet.indexOf("{"));
-        }
-        else {
+        } else {
             receivedMessage = packet.substring(packet.indexOf(":") + 1);
         }
         if (receivedMessage.indexOf("?") == 0) {
-            delay(2000);
-            if (!Config.display.alwaysOn) {
-                display_toggle(true);
+            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                displayToggle(true);
             }
-            LoRa_Utils::sendNewPacket("APRS", QUERY_Utils::process(receivedMessage, sender, "LoRa"));
+            STATION_Utils::addToOutputPacketBuffer(QUERY_Utils::process(receivedMessage, sender, false, thirdParty));
             lastScreenOn = millis();
-            show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, "Callsign = " + sender, "TYPE --> QUERY", 0);
+            displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, "Callsign = " + sender, "TYPE --> QUERY", 0);
             return true;
         }
         else {
@@ -133,35 +173,37 @@ namespace APRS_IS_Utils {
         }
     }
 
-    void processLoRaPacket(String packet) {
-        if (espClient.connected()) {
-            bool queryMessage = false;
-            String aprsPacket, Sender, AddresseeAndMessage, Addressee;
-            if (packet != "") {
-                if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("TCPIP") == -1) && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {
-                    Sender = packet.substring(3, packet.indexOf(">"));
-                    STATION_Utils::updateLastHeard(Sender);
-                    //STATION_Utils::updatePacketBuffer(packet);
-                    Utils::typeOfPacket(aprsPacket, "LoRa-APRS");
-                    if (Sender != Config.callsign) {   // avoid listening yourself by digirepeating
-                        AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                        Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+    void processLoRaPacket(const String& packet) {
+        if (passcodeValid && (espClient.connected() || modemLoggedToAPRSIS)) {
+            if (packet.indexOf("NOGATE") == -1 && packet.indexOf("RFONLY") == -1) {
+                int firstColonIndex = packet.indexOf(":");
+                if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] != '}' && packet.indexOf("TCPIP") == -1) {
+                    const String& Sender = packet.substring(3, packet.indexOf(">"));
+                    if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
+                        STATION_Utils::updateLastHeard(Sender);
+                        Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
+                        const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
+                        String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
                         Addressee.trim();
-
+                        bool queryMessage = false;
                         if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
-                            queryMessage = processReceivedLoRaMessage(Sender, AddresseeAndMessage);
+                            queryMessage = processReceivedLoRaMessage(Sender, checkForStartingBytes(AddresseeAndMessage), false);
                         }
                         if (!queryMessage) {
-                            aprsPacket = createPacket(packet);
-                            if (!Config.display.alwaysOn) {
-                                display_toggle(true);
+                            const String& aprsPacket = buildPacketToUpload(packet);
+                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                                displayToggle(true);
                             }
                             lastScreenOn = millis();
-                            upload(aprsPacket);
+                            #ifdef HAS_A7670
+                                stationBeacon = true;
+                                A7670_Utils::uploadToAPRSIS(aprsPacket);
+                                stationBeacon = false;
+                            #else
+                                upload(aprsPacket);
+                            #endif
                             Utils::println("---> Uploaded to APRS-IS");
-                            STATION_Utils::updateLastHeard(Sender);
-                            Utils::typeOfPacket(aprsPacket, "LoRa-APRS");
-                            show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                            displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                         }
                     }
                 }
@@ -169,68 +211,164 @@ namespace APRS_IS_Utils {
         }
     }
 
-    void processAPRSISPacket(String packet) {
-        String Sender, AddresseeAndMessage, Addressee, receivedMessage;
-        if (!packet.startsWith("#")) {
-            if (packet.indexOf("::") > 0) {
-                Sender = packet.substring(0, packet.indexOf(">"));
-                AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+    String buildPacketToTx(const String& aprsisPacket, uint8_t packetType) {
+        String packet = aprsisPacket;
+        packet.trim();
+        String outputPacket = Config.callsign;
+        outputPacket += ">APLRG1";
+        if (Config.beacon.path != "") {
+            outputPacket += ",";
+            outputPacket += Config.beacon.path;
+        }
+        outputPacket += ":}";
+        outputPacket += packet.substring(0, packet.indexOf(",")); // Callsign>Tocall
+        outputPacket.concat(",TCPIP,");
+        outputPacket.concat(Config.callsign);
+        outputPacket.concat("*");
+        switch (packetType) {
+            case 0: // gps
+                if (packet.indexOf(":=") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":="));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":!"));
+                }
+                break;
+            case 1: // messages
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 2: // status
+                outputPacket += packet.substring(packet.indexOf(":>"));
+                break;
+            case 3: // telemetry
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 4: // mic-e
+                if (packet.indexOf(":`") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":`"));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":'"));
+                }
+                break;
+            case 5: // object
+                outputPacket += packet.substring(packet.indexOf(":;"));
+                break;
+        }
+        return outputPacket;
+    }
+
+    void processAPRSISPacket(const String& packet) {
+        if (!passcodeValid && packet.indexOf(Config.callsign) != -1) {
+            if (packet.indexOf("unverified") != -1 ) {
+                Serial.println("\n****APRS PASSCODE NOT VALID****\n");
+                displayShow(firstLine, "", "    APRS PASSCODE", "    NOT VALID !!!", "", "", "", 0);
+                while (1) {};
+            } else if (packet.indexOf("verified") != -1 ) {
+                passcodeValid = true;
+            }
+        }
+        if (passcodeValid && !packet.startsWith("#")) {
+            if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
+                String Sender = packet.substring(0, packet.indexOf(">"));
+                const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
+                String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
                 Addressee.trim();
-                if (Addressee == Config.callsign) {             // its for me!
+                if (Addressee == Config.callsign) {                 // its for me!
+                    String receivedMessage;
                     if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
-                        String ackMessage = "ack" + AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{") + 1);
+                        String ackMessage = "ack";
+                        ackMessage += AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{") + 1);
                         ackMessage.trim();
                         delay(4000);
                         for (int i = Sender.length(); i < 9; i++) {
                             Sender += ' ';
                         }
-                        String ackPacket = Config.callsign + ">APLRG1,TCPIP,qAC::" + Sender + ":" + ackMessage;// + "\n";
-                        upload(ackPacket);
+
+                        String ackPacket = Config.callsign;
+                        ackPacket += ">APLRG1,TCPIP,qAC::";
+                        ackPacket += Sender;
+                        ackPacket += ":";
+                        ackPacket += ackMessage;
+                        #ifdef HAS_A7670
+                            A7670_Utils::uploadToAPRSIS(ackPacket);
+                        #else
+                            upload(ackPacket);
+                        #endif
                         receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
                     } else {
                         receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);
                     }
                     if (receivedMessage.indexOf("?") == 0) {
-                        Utils::println("Received Query APRS-IS : " + packet);
-                        String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, "APRSIS");
+                        Utils::println("Rx Query (APRS-IS)  : " + packet);
+                        Sender.trim();
+                        String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, true, false);
                         //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
-                        if (!Config.display.alwaysOn) {
-                            display_toggle(true);
+                        if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                            displayToggle(true);
                         }
                         lastScreenOn = millis();
                         delay(500);
-                        upload(queryAnswer);
-                        SYSLOG_Utils::log("APRSIS Tx", queryAnswer, 0, 0, 0);
+                        #ifdef HAS_A7670
+                            A7670_Utils::uploadToAPRSIS(queryAnswer);
+                        #else
+                            upload(queryAnswer);
+                        #endif
+                        SYSLOG_Utils::log(2, queryAnswer, 0, 0.0, 0); // APRSIS TX
                         fifthLine = "APRS-IS ----> APRS-IS";
                         sixthLine = Config.callsign;
                         for (int j = sixthLine.length();j < 9;j++) {
                             sixthLine += " ";
                         }
-                        sixthLine += "> " + Sender;
-                        seventhLine = "QUERY = " + receivedMessage;
+                        sixthLine += "> ";
+                        sixthLine += Sender;
+                        seventhLine = "QUERY = ";
+                        seventhLine += receivedMessage;
                     }
+                    displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                 } else {
-                    Utils::print("Received from APRS-IS  : " + packet);
-
-                    if (Config.aprs_is.toRF && STATION_Utils::wasHeard(Addressee)) {
-                        LoRa_Utils::sendNewPacket("APRS", LoRa_Utils::generatePacket(packet));
-                        display_toggle(true);
+                    Utils::print("Rx Message (APRS-IS): " + packet);
+                    if (STATION_Utils::wasHeard(Addressee) && packet.indexOf("EQNS.") == -1 && packet.indexOf("UNIT.") == -1 && packet.indexOf("PARM.") == -1) {
+                        STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 1));
+                        displayToggle(true);
                         lastScreenOn = millis();
-                        Utils::typeOfPacket(packet, "APRS-LoRa");
+                        Utils::typeOfPacket(packet, 1); // APRS-LoRa
+                        displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                     }
                 }
-                show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+            } else if (Config.aprs_is.objectsToRF && packet.indexOf(":;") > 0) {
+                Utils::print("Rx Object (APRS-IS) : " + packet);
+                if (STATION_Utils::checkObjectTime(packet)) {
+                    STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 5));
+                    displayToggle(true);
+                    lastScreenOn = millis();
+                    Utils::typeOfPacket(packet, 1); // APRS-LoRa
+                    Serial.println();
+                } else {
+                    Serial.println(" ---> Rejected (Time): No Tx");
+                }
             }
         }
     }
 
     void listenAPRSIS() {
-        if (espClient.connected()) {
-            if (espClient.available()) {
-                String aprsisPacket = espClient.readStringUntil('\r');
-                // Serial.println(aprsisPacket);
-                processAPRSISPacket(aprsisPacket);
+        #ifdef HAS_A7670
+            A7670_Utils::listenAPRSIS();
+        #else
+            if (espClient.connected()) {
+                if (espClient.available()) {
+                    String aprsisPacket = espClient.readStringUntil('\r');
+                    aprsisPacket.trim();    // Serial.println(aprsisPacket);
+                    processAPRSISPacket(aprsisPacket);
+                    lastRxTime = millis();
+                }
+            }
+        #endif
+    }
+
+    void firstConnection() {
+        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) {
+            connect();
+            while (!passcodeValid) {
+                listenAPRSIS();
             }
         }
     }

src/aprs_is_utils.h

@@ -1,20 +0,0 @@
-#ifndef APRS_IS_UTILS_H_
-#define APRS_IS_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace APRS_IS_Utils {
-
-    void upload(String line);
-    void connect();
-    void checkStatus();
-    String createPacket(String unprocessedPacket);
-    bool processReceivedLoRaMessage(String sender, String packet);
-    void processLoRaPacket(String packet);
-    void processAPRSISPacket(String packet);
-    void listenAPRSIS();
-
-}
-
-#endif

src/battery_utils.cpp

@@ -1,18 +1,48 @@
+#include <Arduino.h>
 #include "battery_utils.h"
 #include "configuration.h"
-#include "pins_config.h"
+#include "board_pinout.h"
+#include "power_utils.h"
+#include "utils.h"
 
-extern Configuration    Config;
-extern uint32_t         lastBatteryCheck;
 
-float adcReadingTransformation = (3.3/4095);
-float voltageDividerCorrection = 0.288;
+extern  Configuration                   Config;
+extern  uint32_t                        lastBatteryCheck;
 
-// for External Voltage Measurment (MAX = 15Volts !!!)
-float R1 = 100.000; //in Kilo-Ohms
-float R2 = 27.000; //in Kilo-Ohms
-float readingCorrection = 0.125;
-float multiplyCorrection = 0.035;
+bool    shouldSleepLowVoltage           = false;
+
+float   adcReadingTransformation        = (3.3/4095);
+float   voltageDividerCorrection        = 0.288;
+float   readingCorrection               = 0.125;
+float   multiplyCorrection              = 0.035;
+
+float   voltageDividerTransformation    = 0.0;
+
+int     telemetryCounter                = random(1,999);
+
+
+#ifdef HAS_ADC_CALIBRATION
+    #include <esp_adc_cal.h>
+
+    #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915)
+        #define InternalBattery_ADC_Channel ADC1_CHANNEL_7  // t_lora32 pin35
+        #define ExternalVoltage_ADC_Channel ADC1_CHANNEL_6  // t_lora32 pin34
+    #endif
+
+    #if CONFIG_IDF_TARGET_ESP32
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_VREF
+    #elif CONFIG_IDF_TARGET_ESP32S2
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP
+    #elif CONFIG_IDF_TARGET_ESP32C3
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP
+    #elif CONFIG_IDF_TARGET_ESP32S3
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP_FIT
+    #endif
+
+    esp_adc_cal_characteristics_t adc_chars;
+#endif
+
+bool calibrationEnable = false;
 
 
 namespace BATTERY_Utils {
@@ -21,53 +51,211 @@ namespace BATTERY_Utils {
         return (voltage - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
     }
 
-    float checkBattery() { 
-        int sample;
-        int sampleSum = 0;
-        for (int i = 0; i < 100; i++) {
-            #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_HTCT62)
-            sample = analogRead(batteryPin);
+    void adcCalibration() {
+        #ifdef HAS_ADC_CALIBRATION
+            if (calibrationEnable) {
+                adc1_config_width(ADC_WIDTH_BIT_12);
+                adc1_config_channel_atten(InternalBattery_ADC_Channel, ADC_ATTEN_DB_12);
+                adc1_config_channel_atten(ExternalVoltage_ADC_Channel, ADC_ATTEN_DB_12);
+            }
+        #endif
+    }
+
+    void adcCalibrationCheck() {
+        #ifdef HAS_ADC_CALIBRATION
+            esp_err_t ret;
+            ret = esp_adc_cal_check_efuse(ADC_EXAMPLE_CALI_SCHEME);
+            /*if (ret == ESP_ERR_NOT_SUPPORTED) {
+                Serial.println("Calibration scheme not supported, skip software calibration");
+            } else if (ret == ESP_ERR_INVALID_VERSION) {
+                Serial.println("eFuse not burnt, skip software calibration");
+            } else */
+            if (ret == ESP_OK) {
+                esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_DB_12, ADC_WIDTH_BIT_12, 1100, &adc_chars);
+                //Serial.printf("eFuse Vref:%u mV\n", adc_chars.vref);
+                calibrationEnable = true;
+            } /*else {
+                Serial.println("Invalid Calibration Arg");
+            }*/
+        #endif
+    }
+
+    void setup() {
+        if ((Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) && Config.battery.voltageDividerR2 != 0) voltageDividerTransformation = (Config.battery.voltageDividerR1 + Config.battery.voltageDividerR2) / Config.battery.voltageDividerR2;
+
+        #if defined(HAS_ADC_CALIBRATION)
+            if (Config.battery.sendInternalVoltage || Config.battery.monitorInternalVoltage || Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
+                adcCalibrationCheck();
+                adcCalibration();
+            }
+        #endif
+    }
+
+    float checkInternalVoltage() { 
+        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
+            if(POWER_Utils::isBatteryConnected()) {
+                return POWER_Utils::getBatteryVoltage();
+            } else {
+                return 0.0;
+            }
+        #else
+            int sample;
+            int sampleSum = 0;
+            #ifdef ADC_CTRL
+                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
+                    digitalWrite(ADC_CTRL, HIGH);
+                #endif
+                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
+                    digitalWrite(ADC_CTRL, LOW);
+                #endif
             #endif
-            #if defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa)
-            sample = 0;
+
+            for (int i = 0; i < 100; i++) {
+                #if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915)
+                    sample = 0;
+                #else
+                    #ifdef HAS_ADC_CALIBRATION
+                        if (calibrationEnable){
+                            sample = adc1_get_raw(InternalBattery_ADC_Channel);
+                        } else {
+                            sample = analogRead(BATTERY_PIN);
+                        }
+                    #else
+                        #ifdef BATTERY_PIN
+                            sample = analogRead(BATTERY_PIN);
+                        #else
+                            sample = 0;
+                        #endif
+                    #endif
+                #endif
+                sampleSum += sample;
+                delayMicroseconds(50); 
+            }
+
+            #ifdef ADC_CTRL
+                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
+                    digitalWrite(ADC_CTRL, LOW);
+                #endif
+                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
+                    digitalWrite(ADC_CTRL, HIGH);
+                #endif
+
+                #ifdef HELTEC_WP
+                double inputDivider = (1.0 / (10.0 + 10.0)) * 10.0;  // The voltage divider is a 10k + 10k resistor in series
+                #else
+                double inputDivider = (1.0 / (390.0 + 100.0)) * 100.0;  // The voltage divider is a 390k + 100k resistor in series, 100k on the low side.
+                #endif
+                return (((sampleSum/100) * adcReadingTransformation) / inputDivider) + 0.285; // Yes, this offset is excessive, but the ADC on the ESP32s3 is quite inaccurate and noisy. Adjust to own measurements.
+            #else
+                #ifdef HAS_ADC_CALIBRATION
+                    if (calibrationEnable){
+                        float voltage = esp_adc_cal_raw_to_voltage(sampleSum / 100, &adc_chars);
+                        voltage *= 2;       // for 100K/100K voltage divider
+                        voltage /= 1000;
+                        return voltage;
+                    } else {
+                        return (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
+                    }
+                #else
+                    #ifdef LIGHTGATEWAY_PLUS_1_0
+                        double inputDivider = (1.0 / (560.0 + 100.0)) * 100.0;  // The voltage divider is a 560k + 100k resistor in series, 100k on the low side.
+                        return (((sampleSum/100) * adcReadingTransformation) / inputDivider) + 0.41;
+                    #else
+                        return (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
+                    #endif
+                #endif
             #endif
-            sampleSum += sample;
-            delayMicroseconds(50); 
-        }
-
-        float voltage = (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;
-
-        return voltage; // raw voltage without mapping
-
-        // return mapVoltage(voltage, 3.34, 4.71, 3.0, 4.2); // mapped voltage
+            // return mapVoltage(voltage, 3.34, 4.71, 3.0, 4.2); // mapped voltage
+        #endif
     }
 
     float checkExternalVoltage() {
         int sample;
         int sampleSum = 0;
         for (int i = 0; i < 100; i++) {
-            sample = analogRead(Config.externalVoltagePin);
+            #ifdef HAS_ADC_CALIBRATION
+                if (calibrationEnable){
+                    sample = adc1_get_raw(ExternalVoltage_ADC_Channel);
+                } else {
+                    sample = analogRead(Config.battery.externalVoltagePin);
+                }
+            #else
+                sample = analogRead(Config.battery.externalVoltagePin);
+            #endif
             sampleSum += sample;
-            delayMicroseconds(50); 
+            delayMicroseconds(50);
         }
 
-        float voltage = ((((sampleSum/100)* adcReadingTransformation) + readingCorrection) * ((R1+R2)/R2)) - multiplyCorrection;
-
-        return voltage; // raw voltage without mapping
+        float extVoltage;
+        #ifdef HAS_ADC_CALIBRATION
+            if (calibrationEnable){
+                extVoltage = esp_adc_cal_raw_to_voltage(sampleSum / 100, &adc_chars) * voltageDividerTransformation; // in mV
+                extVoltage /= 1000;
+            } else {
+                extVoltage = ((((sampleSum/100)* adcReadingTransformation) + readingCorrection) * voltageDividerTransformation) - multiplyCorrection;
+            }
+        #else
+            extVoltage = ((((sampleSum/100)* adcReadingTransformation) + readingCorrection) * voltageDividerTransformation) - multiplyCorrection;
+        #endif
+        
+        return extVoltage; // raw voltage without mapping
 
         // return mapVoltage(voltage, 5.05, 6.32, 4.5, 5.5); // mapped voltage
     }
 
-    void checkIfShouldSleep() {
-        if (lastBatteryCheck == 0 || millis() - lastBatteryCheck >= 15 * 60 * 1000) {
-            lastBatteryCheck = millis();
-
-            float voltage = checkBattery();
-            
-            if (voltage < Config.lowVoltageCutOff) {
-                ESP.deepSleep(1800000000); // 30 min sleep (60s = 60e6)
+    void startupBatteryHealth() {
+        #ifdef BATTERY_PIN
+            if (Config.battery.monitorInternalVoltage && checkInternalVoltage() < Config.battery.internalSleepVoltage + 0.1) {
+                shouldSleepLowVoltage = true;
             }
+        #endif
+        #ifndef HELTEC_WP
+            if (Config.battery.monitorExternalVoltage && checkExternalVoltage() < Config.battery.externalSleepVoltage + 0.1) {
+                shouldSleepLowVoltage = true;
+            }
+        #endif
+        if (shouldSleepLowVoltage) {
+            Utils::checkSleepByLowBatteryVoltage(0);
         }
     }
 
+    String generateEncodedTelemetryBytes(float value, bool firstBytes, byte voltageType) {  // 0 = internal battery(0-4,2V) , 1 = external battery(0-15V)
+        String encodedBytes;
+        int tempValue;
+
+        if (firstBytes) {
+            tempValue = value;
+        } else {
+            switch (voltageType) {
+                case 0:
+                    tempValue = value * 100;           // Internal voltage calculation
+                    break;
+                case 1:
+                    tempValue = (value * 100) / 2;     // External voltage calculation
+                    break;
+                default:
+                    tempValue = value;
+                    break;
+            }
+        }
+
+        int firstByte   = tempValue / 91;
+        tempValue       -= firstByte * 91;
+
+        encodedBytes    = char(firstByte + 33);
+        encodedBytes    += char(tempValue + 33);
+        return encodedBytes;
+    }
+
+    String generateEncodedTelemetry() {
+        String telemetry = "|";
+        telemetry += generateEncodedTelemetryBytes(telemetryCounter, true, 0);
+        telemetryCounter++;
+        if (telemetryCounter == 1000) telemetryCounter = 0;
+        if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(checkInternalVoltage(), false, 0);
+        if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(checkExternalVoltage(), false, 1);
+        telemetry += "|";
+        return telemetry;
+    }
+
 }

src/battery_utils.h

@@ -1,15 +0,0 @@
-#ifndef BATTERY_UTILS_H_
-#define BATTERY_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace BATTERY_Utils {
-
-    float checkBattery();
-    float checkExternalVoltage();
-    void checkIfShouldSleep();
-
-}
-
-#endif

src/bme_utils.cpp

@@ -1,185 +0,0 @@
-#include "bme_utils.h"
-#include "configuration.h"
-#include "gps_utils.h"
-#include "display.h"
-
-#define SEALEVELPRESSURE_HPA (1013.25)
-#define HEIGHT_CORRECTION 0             // in meters
-#define CORRECTION_FACTOR (8.2296)      // for meters
-
-extern Configuration    Config;
-extern String           fifthLine;
-extern uint32_t         bmeLastReading;
-
-float newHum, newTemp, newPress, newGas;
-
-
-namespace BME_Utils {
-
-    #ifdef BME280Sensor
-    Adafruit_BME280   bme;
-    #endif
-    #ifdef BMP280Sensor
-    Adafruit_BMP280   bme;
-    #endif
-    #ifdef BME680Sensor
-    Adafruit_BME680 bme; 
-    #endif
-
-    void setup() {
-        if (Config.bme.active) {
-            bool status;
-            status = bme.begin(0x76);  // Don't forget to join pins for righ direction on BME280!
-            if (!status) {
-                Serial.println("Could not find a valid BME280 or BMP280 sensor, check wiring!");
-                show_display("ERROR", "", "BME/BMP sensor active", "but no sensor found...");
-                while (1); // sacar esto para que quede pegado si no encuentra BME280
-            } else {
-                #ifdef BME280Sensor
-                bme.setSampling(Adafruit_BME280::MODE_FORCED,
-                                Adafruit_BME280::SAMPLING_X1,
-                                Adafruit_BME280::SAMPLING_X1,
-                                Adafruit_BME280::SAMPLING_X1,
-                                Adafruit_BME280::FILTER_OFF
-                                );
-                Serial.println("init : BME280 Module  ...     done!");
-                #endif
-                #ifdef BMP280Sensor
-                bme.setSampling(Adafruit_BMP280::MODE_FORCED,
-                                Adafruit_BMP280::SAMPLING_X1,
-                                Adafruit_BMP280::SAMPLING_X1,
-                                Adafruit_BMP280::FILTER_OFF
-                                ); 
-                Serial.println("init : BMP280 Module  ...     done!");
-                #endif
-                #ifdef BME680Sensor
-                bme.setTemperatureOversampling(BME680_OS_1X);
-                bme.setHumidityOversampling(BME680_OS_1X);
-                bme.setPressureOversampling(BME680_OS_1X);
-                bme.setIIRFilterSize(BME680_FILTER_SIZE_0);
-                Serial.println("init : BME680 Module  ...     done!");
-                #endif
-            }
-        } else {
-            Serial.println("(BME/BMP sensor not 'active' in 'igate_conf.json')");
-        }
-    }
-
-    String generateTempString(float bmeTemp) {
-        String strTemp;
-        strTemp = String((int)bmeTemp);
-        switch (strTemp.length()) {
-            case 1:
-                return "00" + strTemp;
-                break;
-            case 2:
-                return "0" + strTemp;
-                break;
-            case 3:
-                return strTemp;
-                break;
-            default:
-                return "-999";
-        }
-    }
-
-    String generateHumString(float bmeHum) {
-        String strHum;
-        strHum = String((int)bmeHum);
-        switch (strHum.length()) {
-            case 1:
-                return "0" + strHum;
-                break;
-            case 2:
-                return strHum;
-                break;
-            case 3:
-                if ((int)bmeHum == 100) {
-                return "00";
-                } else {
-                return "-99";
-                }
-                break;
-            default:
-                return "-99";
-        }
-    }
-
-    String generatePresString(float bmePress) {
-        String strPress;
-        strPress = String((int)bmePress);
-        switch (strPress.length()) {
-            case 1:
-                return "000" + strPress + "0";
-                break;
-            case 2:
-                return "00" + strPress + "0";
-                break;
-            case 3:
-                return "0" + strPress + "0";
-                break;
-            case 4:
-                return strPress + "0";
-                break;
-            case 5:
-                return strPress;
-                break;
-            default:
-                return "-99999";
-        }
-    }
-
-    String readDataSensor() {
-        String wx, tempStr, humStr, presStr;
-
-        uint32_t lastReading = millis() - bmeLastReading;
-        if (lastReading > 60*1000) {
-            #if defined(BME280Sensor) || defined(BMP280Sensor)
-            bme.takeForcedMeasurement();
-            newTemp   = bme.readTemperature();
-            newPress  = (bme.readPressure() / 100.0F);
-            #ifdef BME280Sensor
-            newHum = bme.readHumidity();
-            #endif
-            #ifdef BMP280Sensor
-            newHum = 0;
-            #endif
-            #endif
-
-            #ifdef BME680Sensor
-            bme.performReading();
-            delay(50);
-            if (bme.endReading()) {
-                newTemp     = bme.temperature;
-                newPress    = (bme.pressure / 100.0F);
-                newHum      = bme.humidity;
-                newGas      = bme.gas_resistance / 1000.0; // in Kilo ohms
-            }
-            #endif
-            bmeLastReading = millis();
-        }
-    
-        if (isnan(newTemp) || isnan(newHum) || isnan(newPress)) {
-            Serial.println("BME/BMP Module data failed");
-            wx = ".../...g...t...r...p...P...h..b.....";
-            fifthLine = "";
-            return wx;
-        } else {
-            tempStr = generateTempString((newTemp * 1.8) + 32);
-            #if defined(BME280Sensor) || defined(BME680Sensor)
-            humStr  = generateHumString(newHum);
-            #endif
-            #ifdef BMP280Sensor
-            humStr  = "..";
-            #endif
-            presStr = generatePresString(newPress + (HEIGHT_CORRECTION/CORRECTION_FACTOR));
-            fifthLine = "BME-> " + String(int(newTemp))+"C " + humStr + "% " + presStr.substring(0,4) + "hPa";
-            wx = ".../...g...t" + tempStr + "r...p...P...h" + humStr + "b" + presStr;
-            #ifdef BME680Sensor
-            wx += "Gas: " + String(newGas) + "Kohms ";
-            #endif
-            return wx;
-        }
-    }
-
-}

src/bme_utils.h

@@ -1,33 +0,0 @@
-#ifndef BME_UTILS_H_
-#define BME_UTILS_H_
-
-#include <Arduino.h>
-#include <Adafruit_Sensor.h>
-
-#define BME280Sensor        // its set by default but you should comment it with "//"
-//#define BMP280Sensor      // and delete "//" from the one you want to use.
-//#define BME680Sensor
-
-#ifdef BME280Sensor
-#include <Adafruit_BME280.h>
-#endif
-#ifdef BMP280Sensor
-#include <Adafruit_BMP280.h>
-#endif
-#ifdef BME680Sensor
-#include <Adafruit_BME680.h>
-#endif
-
-
-namespace BME_Utils {
-
-void setup();
-
-    String generateTempString(float bmeTemp);
-    String generateHumString(float bmeHum);
-    String generatePresString(float bmePress);
-    String readDataSensor();
-
-}
-
-#endif

src/configuration.cpp

@@ -3,107 +3,119 @@
 #include "configuration.h"
 #include "display.h"
 
-void Configuration::check() {
-    if (reload) {
-        show_display("------- UPDATE ------", "config is old", "device will update", "and then reboot", 1000);
-        
-        writeFile();
 
-        ESP.restart();
-    }
-}
+bool shouldSleepStop = true;
+
 
 void Configuration::writeFile() {
-    Serial.println("Saving config..");
+    Serial.println("Saving config...");
 
-    StaticJsonDocument<2048> data;
+    StaticJsonDocument<2560> data;
     File configFile = SPIFFS.open("/igate_conf.json", "w");
 
     if (wifiAPs[0].ssid != "") { // We don't want to save Auto AP empty SSID
         for (int i = 0; i < wifiAPs.size(); i++) {
             data["wifi"]["AP"][i]["ssid"] = wifiAPs[i].ssid;
             data["wifi"]["AP"][i]["password"] = wifiAPs[i].password;
-            // data["wifi"]["AP"][i]["latitude"] = wifiAPs[i].latitude;
-            // data["wifi"]["AP"][i]["longitude"] = wifiAPs[i].longitude;
         }
     }
 
-    data["wifi"]["autoAP"]["password"] = wifiAutoAP.password;
-    data["wifi"]["autoAP"]["powerOff"] = wifiAutoAP.powerOff;
+    data["wifi"]["autoAP"]["password"]          = wifiAutoAP.password;
+    data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;
 
-    data["callsign"] = callsign;
-    // data["stationMode"] = stationMode; // only check for config version
-    // data["iGateComment"] = iGateComment;
+    data["callsign"]                            = callsign;
 
-    // data["other"]["beaconInterval"] = beaconInterval;
-    // data["other"]["igateSendsLoRaBeacons"] = igateSendsLoRaBeacons;
-    // data["other"]["igateRepeatsLoRaPackets"] = igateRepeatsLoRaPackets;
-    data["other"]["rememberStationTime"] = rememberStationTime;
-    data["other"]["sendBatteryVoltage"] = sendBatteryVoltage;
-    data["other"]["externalVoltageMeasurement"] = externalVoltageMeasurement;
-    data["other"]["externalVoltagePin"] = externalVoltagePin;
+    data["aprs_is"]["active"]                   = aprs_is.active;
+    data["aprs_is"]["passcode"]                 = aprs_is.passcode;
+    data["aprs_is"]["server"]                   = aprs_is.server;
+    data["aprs_is"]["port"]                     = aprs_is.port;
+    data["aprs_is"]["filter"]                   = aprs_is.filter;
+    data["aprs_is"]["messagesToRF"]             = aprs_is.messagesToRF;
+    data["aprs_is"]["objectsToRF"]              = aprs_is.objectsToRF;
 
-    data["digi"]["mode"] = digi.mode;
-    // data["digi"]["comment"] = digi.comment;
-    // data["digi"]["latitude"] = digi.latitude;
-    // data["digi"]["longitude"] = digi.longitude;
+    data["beacon"]["comment"]                   = beacon.comment;
+    data["beacon"]["interval"]                  = beacon.interval;
+    data["beacon"]["latitude"]                  = beacon.latitude;
+    data["beacon"]["longitude"]                 = beacon.longitude;
+    data["beacon"]["overlay"]                   = beacon.overlay;
+    data["beacon"]["symbol"]                    = beacon.symbol;
+    data["beacon"]["sendViaAPRSIS"]             = beacon.sendViaAPRSIS;
+    data["beacon"]["sendViaRF"]                 = beacon.sendViaRF;
+    data["beacon"]["path"]                      = beacon.path;
 
-    data["tnc"]["enableServer"] = tnc.enableServer;
-    data["tnc"]["enableSerial"] = tnc.enableSerial;
-    data["tnc"]["acceptOwn"] = tnc.acceptOwn;
+    data["beacon"]["gpsActive"]                 = beacon.gpsActive;
+    data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;
 
-    data["aprs_is"]["active"] = aprs_is.active;
-    data["aprs_is"]["passcode"] = aprs_is.passcode;
-    data["aprs_is"]["server"] = aprs_is.server;
-    data["aprs_is"]["port"] = aprs_is.port;
-    data["aprs_is"]["filter"] = aprs_is.filter;
-    data["aprs_is"]["toRF"] = aprs_is.toRF;
+    data["digi"]["mode"]                        = digi.mode;
+    data["digi"]["ecoMode"]                     = digi.ecoMode;
 
-    data["beacon"]["comment"] = beacon.comment;
-    // data["beacon"]["igateRepeatsLoRaPackets"] = beacon.igateRepeatsLoRaPackets;
-    // data["beacon"]["igateSendsLoRaBeacons"] = beacon.igateSendsLoRaBeacons;
-    data["beacon"]["interval"] = beacon.interval;
-    data["beacon"]["latitude"] = beacon.latitude;
-    data["beacon"]["longitude"] = beacon.longitude;
-    data["beacon"]["overlay"] = beacon.overlay;
-    data["beacon"]["symbol"] = beacon.symbol;
-    data["beacon"]["sendViaAPRSIS"] = beacon.sendViaAPRSIS;
-    data["beacon"]["sendViaRF"] = beacon.sendViaRF;
-    data["beacon"]["path"] = beacon.path;
+    data["lora"]["rxFreq"]                      = loramodule.rxFreq;
+    data["lora"]["txFreq"]                      = loramodule.txFreq;
+    data["lora"]["spreadingFactor"]             = loramodule.spreadingFactor;
+    data["lora"]["signalBandwidth"]             = loramodule.signalBandwidth;
+    data["lora"]["codingRate4"]                 = loramodule.codingRate4;
+    data["lora"]["power"]                       = loramodule.power;
+    data["lora"]["txActive"]                    = loramodule.txActive;
+    data["lora"]["rxActive"]                    = loramodule.rxActive;
 
-    // data["lora"]["iGateFreq"] = loramodule.iGateFreq;
-    // data["lora"]["digirepeaterTxFreq"] = loramodule.digirepeaterTxFreq;
-    // data["lora"]["digirepeaterRxFreq"] = loramodule.digirepeaterRxFreq;
-    data["lora"]["rxFreq"] = loramodule.rxFreq;
-    data["lora"]["txFreq"] = loramodule.txFreq;
-    data["lora"]["spreadingFactor"] = loramodule.spreadingFactor;
-    data["lora"]["signalBandwidth"] = loramodule.signalBandwidth;
-    data["lora"]["codingRate4"] = loramodule.codingRate4;
-    data["lora"]["power"] = loramodule.power;
-    data["lora"]["txActive"] = loramodule.txActive;
-    data["lora"]["rxActive"] = loramodule.rxActive;
+    data["display"]["alwaysOn"]                 = display.alwaysOn;
+    data["display"]["timeout"]                  = display.timeout;
+    data["display"]["turn180"]                  = display.turn180;
 
-    data["display"]["alwaysOn"] = display.alwaysOn;
-    data["display"]["timeout"] = display.timeout;
-    data["display"]["turn180"] = display.turn180;
+    data["battery"]["sendInternalVoltage"]      = battery.sendInternalVoltage;
+    data["battery"]["monitorInternalVoltage"]   = battery.monitorInternalVoltage;
+    data["battery"]["internalSleepVoltage"]     = battery.internalSleepVoltage;
 
-    data["syslog"]["active"] = syslog.active;
-    data["syslog"]["server"] = syslog.server;
-    data["syslog"]["port"] = syslog.port;
+    data["battery"]["sendExternalVoltage"]      = battery.sendExternalVoltage;
+    data["battery"]["externalVoltagePin"]       = battery.externalVoltagePin;
+    data["battery"]["monitorExternalVoltage"]   = battery.monitorExternalVoltage;
+    data["battery"]["externalSleepVoltage"]     = battery.externalSleepVoltage;
+    data["battery"]["voltageDividerR1"]         = battery.voltageDividerR1;
+    data["battery"]["voltageDividerR2"]         = battery.voltageDividerR2;
 
-    data["bme"]["active"] = bme.active;
+    data["battery"]["sendVoltageAsTelemetry"]   = battery.sendVoltageAsTelemetry;
 
-    data["ota"]["username"] = ota.username;
-    data["ota"]["password"] = ota.password;
+    data["wxsensor"]["active"]                  = wxsensor.active;
+    data["wxsensor"]["heightCorrection"]        = wxsensor.heightCorrection;
+    data["wxsensor"]["temperatureCorrection"]   = wxsensor.temperatureCorrection;
 
-    data["other"]["lowPowerMode"] = lowPowerMode;
-    data["other"]["lowVoltageCutOff"] = lowVoltageCutOff;
+    data["syslog"]["active"]                    = syslog.active;
+    data["syslog"]["server"]                    = syslog.server;
+    data["syslog"]["port"]                      = syslog.port;
+
+    data["tnc"]["enableServer"]                 = tnc.enableServer;
+    data["tnc"]["enableSerial"]                 = tnc.enableSerial;
+    data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
+
+    data["other"]["rebootMode"]                 = rebootMode;
+    data["other"]["rebootModeTime"]             = rebootModeTime;
+
+    data["ota"]["username"]                     = ota.username;
+    data["ota"]["password"]                     = ota.password;
+
+    data["other"]["rememberStationTime"]        = rememberStationTime;
+
+    data["other"]["backupDigiMode"]             = backupDigiMode;
+
+    data["personalNote"]                        = personalNote;
+
+    data["blacklist"]                           = blacklist;
+
+    data["webadmin"]["active"]                  = webadmin.active;
+    data["webadmin"]["username"]                = webadmin.username;
+    data["webadmin"]["password"]                = webadmin.password;
+
+    data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
+
+    data["remoteManagement"]["managers"]        = remoteManagement.managers;
+    data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
 
     serializeJson(data, configFile);
 
     configFile.close();
 
     Serial.println("Config saved");
+    delay(200);
 }
 
 bool Configuration::readFile() {
@@ -112,7 +124,7 @@ bool Configuration::readFile() {
     File configFile = SPIFFS.open("/igate_conf.json", "r");
 
     if (configFile) {
-        StaticJsonDocument<2048> data;
+        StaticJsonDocument<2560> data;
 
         DeserializationError error = deserializeJson(data, configFile);
         if (error) {
@@ -128,120 +140,95 @@ bool Configuration::readFile() {
             wifiAPs.push_back(wifiap);
         }
 
-        wifiAutoAP.password             = data["wifi"]["autoAP"]["password"].as<String>();
-        wifiAutoAP.powerOff             = data["wifi"]["autoAP"]["powerOff"].as<int>();
+        wifiAutoAP.password             = data["wifi"]["autoAP"]["password"] | "1234567890";
+        wifiAutoAP.timeout              = data["wifi"]["autoAP"]["timeout"] | 10;
 
-        callsign                        = data["callsign"].as<String>();
-        rememberStationTime             = data["other"]["rememberStationTime"].as<int>();
-        sendBatteryVoltage              = data["other"]["sendBatteryVoltage"].as<bool>();
-        externalVoltageMeasurement      = data["other"]["externalVoltageMeasurement"].as<bool>();
-        externalVoltagePin              = data["other"]["externalVoltagePin"].as<int>();
+        callsign                        = data["callsign"] | "NOCALL-10";
+        rememberStationTime             = data["other"]["rememberStationTime"] | 30;
 
-        aprs_is.passcode                = data["aprs_is"]["passcode"].as<String>();
-        aprs_is.server                  = data["aprs_is"]["server"].as<String>();
-        aprs_is.port                    = data["aprs_is"]["port"].as<int>();
+        beacon.latitude                 = data["beacon"]["latitude"] | 0.0;
+        beacon.longitude                = data["beacon"]["longitude"] | 0.0;
+        beacon.comment                  = data["beacon"]["comment"] | "LoRa APRS";
+        beacon.interval                 = data["beacon"]["interval"] | 15;
+        beacon.overlay                  = data["beacon"]["overlay"] | "L";
+        beacon.symbol                   = data["beacon"]["symbol"] | "a";
+        beacon.path                     = data["beacon"]["path"] | "WIDE1-1";
+        beacon.sendViaAPRSIS            = data["beacon"]["sendViaAPRSIS"] | false;
+        beacon.sendViaRF                = data["beacon"]["sendViaRF"] | false;
 
-        loramodule.spreadingFactor      = data["lora"]["spreadingFactor"].as<int>();
-        loramodule.signalBandwidth      = data["lora"]["signalBandwidth"].as<long>();
-        loramodule.codingRate4          = data["lora"]["codingRate4"].as<int>();
-        loramodule.power                = data["lora"]["power"].as<int>();
+        beacon.gpsActive                = data["beacon"]["gpsActive"] | false;
+        beacon.gpsAmbiguity             = data["beacon"]["gpsAmbiguity"] | false;
 
-        display.alwaysOn                = data["display"]["alwaysOn"].as<bool>();
-        display.timeout                 = data["display"]["timeout"].as<int>();
-        display.turn180                 = data["display"]["turn180"].as<bool>();
+        aprs_is.active                  = data["aprs_is"]["active"] | false;
+        aprs_is.passcode                = data["aprs_is"]["passcode"] | "XYZWV";
+        aprs_is.server                  = data["aprs_is"]["server"] | "rotate.aprs2.net";
+        aprs_is.port                    = data["aprs_is"]["port"] | 14580;
+        aprs_is.filter                  = data["aprs_is"]["filter"] | "m/10";
+        aprs_is.messagesToRF            = data["aprs_is"]["messagesToRF"] | false;
+        aprs_is.objectsToRF             = data["aprs_is"]["objectsToRF"] | false;
 
-        syslog.active                   = data["syslog"]["active"].as<bool>();
-        syslog.server                   = data["syslog"]["server"].as<String>();
-        syslog.port                     = data["syslog"]["port"].as<int>();
+        digi.mode                       = data["digi"]["mode"] | 0;
+        digi.ecoMode                    = data["digi"]["ecoMode"] | 0;
+        if (digi.ecoMode == 1) shouldSleepStop = false;
 
-        bme.active                      = data["bme"]["active"].as<bool>();
+        loramodule.txFreq               = data["lora"]["txFreq"] | 433775000;
+        loramodule.rxFreq               = data["lora"]["rxFreq"] | 433775000;
+        loramodule.spreadingFactor      = data["lora"]["spreadingFactor"] | 12;
+        loramodule.signalBandwidth      = data["lora"]["signalBandwidth"] | 125000;
+        loramodule.codingRate4          = data["lora"]["codingRate4"] | 5;
+        loramodule.power                = data["lora"]["power"] | 20;
+        loramodule.txActive             = data["lora"]["txActive"] | false;
+        loramodule.rxActive             = data["lora"]["rxActive"] | false;
 
-        ota.username                    = data["ota"]["username"].as<String>();
-        ota.password                    = data["ota"]["password"].as<String>();
+        display.alwaysOn                = data["display"]["alwaysOn"] | true;
+        display.timeout                 = data["display"]["timeout"] | 4;
+        display.turn180                 = data["display"]["turn180"] | false;
 
-        tnc.enableServer                = data["tnc"]["enableServer"].as<bool>();
-        tnc.enableSerial                = data["tnc"]["enableSerial"].as<bool>();
-        tnc.acceptOwn                   = data["tnc"]["acceptOwn"].as<bool>();
+        battery.sendInternalVoltage     = data["battery"]["sendInternalVoltage"] | false;
+        battery.monitorInternalVoltage  = data["battery"]["monitorInternalVoltage"] | false;
+        battery.internalSleepVoltage    = data["battery"]["internalSleepVoltage"] | 2.9;
 
-        lowPowerMode                    = data["other"]["lowPowerMode"].as<bool>();
-        lowVoltageCutOff                = data["other"]["lowVoltageCutOff"].as<double>();
+        battery.sendExternalVoltage     = data["battery"]["sendExternalVoltage"] | false;
+        battery.externalVoltagePin      = data["battery"]["externalVoltagePin"] | 34;
+        battery.monitorExternalVoltage  = data["battery"]["monitorExternalVoltage"] | false;
+        battery.externalSleepVoltage    = data["battery"]["externalSleepVoltage"] | 10.9;
+        battery.voltageDividerR1        = data["battery"]["voltageDividerR1"] | 100.0;
+        battery.voltageDividerR2        = data["battery"]["voltageDividerR2"] | 27.0;
 
-        int stationMode                     = data["stationMode"].as<int>(); // deprecated but need to specify config version
+        battery.sendVoltageAsTelemetry  = data["battery"]["sendVoltageAsTelemetry"] | false;
 
-        if (stationMode == 0) {
-            // Load new settings 
+        wxsensor.active                 = data["wxsensor"]["active"] | false;
+        wxsensor.heightCorrection       = data["wxsensor"]["heightCorrection"] | 0;
+        wxsensor.temperatureCorrection  = data["wxsensor"]["temperatureCorrection"] | 0.0;
 
-            beacon.latitude                   = data["beacon"]["latitude"].as<double>();
-            beacon.longitude                  = data["beacon"]["longitude"].as<double>();
-            beacon.comment                    = data["beacon"]["comment"].as<String>();
-            beacon.overlay                    = data["beacon"]["overlay"].as<String>();
-            beacon.symbol                     = data["beacon"]["symbol"].as<String>();
-            beacon.interval                   = data["beacon"]["interval"].as<int>();
-            // beacon.igateSendsLoRaBeacons      = data["beacon"]["igateSendsLoRaBeacons"].as<bool>();
-            // beacon.igateRepeatsLoRaPackets    = data["beacon"]["igateRepeatsLoRaPackets"].as<bool>();
-            beacon.sendViaAPRSIS              = data["beacon"]["sendViaAPRSIS"].as<bool>();
-            beacon.sendViaRF                  = data["beacon"]["sendViaRF"].as<bool>();
-            beacon.path                       = data["beacon"]["path"].as<String>();
+        syslog.active                   = data["syslog"]["active"] | false;
+        syslog.server                   = data["syslog"]["server"] | "lora.link9.net";
+        syslog.port                     = data["syslog"]["port"] | 1514;
 
-            digi.mode                         = data["digi"]["mode"].as<int>();
+        tnc.enableServer                = data["tnc"]["enableServer"] | false;
+        tnc.enableSerial                = data["tnc"]["enableSerial"] | false;
+        tnc.acceptOwn                   = data["tnc"]["acceptOwn"] | false;
 
-            aprs_is.active                    = data["aprs_is"]["active"].as<bool>();
-            aprs_is.filter                    = data["aprs_is"]["filter"].as<String>();
-            aprs_is.toRF                      = data["aprs_is"]["toRF"].as<bool>();
+        ota.username                    = data["ota"]["username"] | "";
+        ota.password                    = data["ota"]["password"] | "";
 
-            loramodule.txFreq                 = data["lora"]["txFreq"].as<long>();
-            loramodule.rxFreq                 = data["lora"]["rxFreq"].as<long>();
-            loramodule.txActive               = data["lora"]["txActive"].as<bool>();
-            loramodule.rxActive               = data["lora"]["rxActive"].as<bool>();
-        } else {
-            // Load old settings and put into new variables not actual config
+        webadmin.active                 = data["webadmin"]["active"] | false;
+        webadmin.username               = data["webadmin"]["username"] | "admin";
+        webadmin.password               = data["webadmin"]["password"] | "";
 
-            String iGateComment             = data["iGateComment"].as<String>();
-            int beaconInterval              = data["other"]["beaconInterval"].as<int>();
-            // bool igateSendsLoRaBeacons      = data["other"]["igateSendsLoRaBeacons"].as<bool>();
-            // bool igateRepeatsLoRaPackets    = data["other"]["igateRepeatsLoRaPackets"].as<bool>();
+        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
 
-            long iGateFreq                  = data["lora"]["iGateFreq"].as<long>();
-            long digirepeaterTxFreq         = data["lora"]["digirepeaterTxFreq"].as<long>();
-            long digirepeaterRxFreq         = data["lora"]["digirepeaterRxFreq"].as<long>();
-        
-            String digiComment              = data["digi"]["comment"].as<String>();
-            double digiLatitude             = data["digi"]["latitude"].as<double>();
-            double digiLongitude            = data["digi"]["longitude"].as<double>();
+        backupDigiMode                  = data["other"]["backupDigiMode"] | false;
 
-            beacon.latitude = digiLatitude;
-            beacon.longitude = digiLongitude;
-            beacon.interval = beaconInterval;
-            // beacon.igateSendsLoRaBeacons = igateSendsLoRaBeacons;
-            // beacon.igateRepeatsLoRaPackets = igateRepeatsLoRaPackets;
-            loramodule.txFreq = digirepeaterTxFreq;
-            loramodule.rxFreq = digirepeaterRxFreq;
-            loramodule.rxActive = true;
-            beacon.sendViaAPRSIS = true;
-            beacon.sendViaRF = false;
+        rebootMode                      = data["other"]["rebootMode"] | false;
+        rebootModeTime                  = data["other"]["rebootModeTime"] | 6;
 
-            switch (stationMode) {
-                case 1: // IGate only
-                // aprs_is.active = true; // better don't do that automatically
-                beacon.comment = iGateComment;
-                loramodule.rxFreq = iGateFreq;
-                break;
-                case 5: // Digi + IGate
-                case 2: // Digi + IGate
-                // aprs_is.active = true; // better don't do that automatically
-                // digi.mode = 2; // better don't do that automatically
-                beacon.comment = digiComment;
-                loramodule.rxFreq = iGateFreq;
-                break;
-                case 3: // Digi
-                case 4: // Digi
-                // digi.mode = 2; // better don't do that automatically
-                beacon.comment = digiComment;
-                break;
-            }
+        personalNote    	            = data["personalNote"] | "personal note here";
 
-            reload = true;
-        }
+        blacklist                       = data["blacklist"] | "station callsign";
+
+        remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
+        remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
 
         if (wifiAPs.size() == 0) { // If we don't have any WiFi's from config we need to add "empty" SSID for AUTO AP
             WiFi_AP wifiap;
@@ -260,87 +247,104 @@ bool Configuration::readFile() {
 }
     
 void Configuration::init() {
-    reload = false;
 
     WiFi_AP wifiap;
-    wifiap.ssid                   = "";
-    wifiap.password               = "";
-    // wifiap.latitude               = 0.0; // deprecated
-    // wifiap.longitude              = 0.0; // deprecated
+    wifiap.ssid                     = "";
+    wifiap.password                 = "";
+
     wifiAPs.push_back(wifiap);
 
-    wifiAutoAP.password = "1234567890";
-    wifiAutoAP.powerOff = 15;
+    wifiAutoAP.password             = "1234567890";
+    wifiAutoAP.timeout              = 10;
 
-    callsign = "N0CALL";
-    // stationMode = 1; // deprecated
-    // iGateComment = "LoRa_APRS_iGate Development"; // deprecated
+    callsign                        = "N0CALL-10";
 
-    beacon.comment = "LoRa APRS"; // new
-    beacon.latitude = 0.0; // new
-    beacon.longitude = 0.0; // new
-    beacon.interval = 15; // new
-    // beacon.igateRepeatsLoRaPackets = false; // new
-    // beacon.igateSendsLoRaBeacons = false; // new
-    beacon.overlay = "L"; // new
-    beacon.symbol = "#"; // new
-    beacon.sendViaAPRSIS = true; // new
-    beacon.sendViaRF = false; // new
-    beacon.path = "WIDE1-1"; // new
-    
-    digi.mode = 0; // new
-    // digi.comment = "LoRa_APRS_iGate Development"; // deprecated
-    // digi.latitude = 0.0; // deprecated
-    // digi.longitude = 0.0; // deprecated
+    beacon.comment                  = "LoRa APRS";
+    beacon.latitude                 = 0.0;
+    beacon.longitude                = 0.0;
+    beacon.interval                 = 15;
+    beacon.overlay                  = "L";
+    beacon.symbol                   = "a";
+    beacon.sendViaAPRSIS            = true;
+    beacon.sendViaRF                = false;
+    beacon.path                     = "WIDE1-1";
 
-    tnc.enableServer = false;
-    tnc.enableSerial = false;
-    tnc.acceptOwn = false;
+    beacon.gpsActive                = false;
+    beacon.gpsAmbiguity             = false;
 
-    aprs_is.active = false; // new
-    aprs_is.passcode = "XYZVW";
-    aprs_is.server = "rotate.aprs2.net";
-    aprs_is.port = 14580;
-    aprs_is.filter = "m/10"; // new
-    aprs_is.toRF = false; // new
+    digi.mode                       = 0;
+    digi.ecoMode                    = 0;
 
-    // loramodule.iGateFreq = 433775000; // deprecated
-    // loramodule.digirepeaterTxFreq = 433775000; // deprecated
-    // loramodule.digirepeaterRxFreq = 433900000; // deprecated
-    loramodule.txFreq = 433775000; // new
-    loramodule.rxFreq = 433775000; // new
-    loramodule.spreadingFactor = 12;
-    loramodule.signalBandwidth = 125000;
-    loramodule.codingRate4 = 5;
-    loramodule.power = 20;
-    loramodule.txActive = false; // new
-    loramodule.rxActive = true; // new
+    tnc.enableServer                = false;
+    tnc.enableSerial                = false;
+    tnc.acceptOwn                   = false;
 
-    display.alwaysOn = true;
-    display.timeout = 4;
-    display.turn180 = false;
+    aprs_is.active                  = false;
+    aprs_is.passcode                = "XYZVW";
+    aprs_is.server                  = "rotate.aprs2.net";
+    aprs_is.port                    = 14580;
+    aprs_is.filter                  = "m/10";
+    aprs_is.messagesToRF            = false;
+    aprs_is.objectsToRF             = false;
 
-    syslog.active = false;
-    syslog.server = "192.168.0.100";
-    syslog.port = 514;
+    loramodule.txFreq               = 433775000;
+    loramodule.rxFreq               = 433775000;
+    loramodule.spreadingFactor      = 12;
+    loramodule.signalBandwidth      = 125000;
+    loramodule.codingRate4          = 5;
+    loramodule.power                = 20;
+    loramodule.txActive             = false;
+    loramodule.rxActive             = true;
 
-    bme.active = false;
+    display.alwaysOn                = true;
+    display.timeout                 = 4;
+    display.turn180                 = false;
 
-    ota.username = "";
-    ota.password = "";
+    syslog.active                   = false;
+    syslog.server                   = "lora.link9.net";
+    syslog.port                     = 1514;
 
-    // beaconInterval = 15; // deprecated
-    // igateSendsLoRaBeacons = false; // deprecated
-    // igateRepeatsLoRaPackets = false; // deprecated
-    rememberStationTime = 30;
-    sendBatteryVoltage = false;
-    externalVoltageMeasurement = false;
-    externalVoltagePin = 34;
+    wxsensor.active                 = false;
+    wxsensor.heightCorrection       = 0;
+    wxsensor.temperatureCorrection  = 0.0;
 
-    lowPowerMode = false;
-    lowVoltageCutOff = 0;
+    ota.username                    = "";
+    ota.password                    = "";
 
-    Serial.println("todo escrito");
+    rememberStationTime             = 30;
+
+    battery.sendInternalVoltage     = false;
+    battery.monitorInternalVoltage  = false;
+    battery.internalSleepVoltage    = 2.9;
+
+    battery.sendExternalVoltage     = false;
+    battery.externalVoltagePin      = 34;
+    battery.monitorExternalVoltage  = false;
+    battery.externalSleepVoltage    = 10.9;
+    battery.voltageDividerR1        = 100.0;
+    battery.voltageDividerR2        = 27.0;
+
+    battery.sendVoltageAsTelemetry  = false;
+
+    backupDigiMode                  = false;
+
+    rebootMode                      = false;
+    rebootModeTime                  = 0;
+
+    personalNote                    = "";
+
+    blacklist                       = "";
+
+    webadmin.active                 = false;
+    webadmin.username               = "admin";
+    webadmin.password               = "";
+
+    ntp.gmtCorrection               = 0.0;
+
+    remoteManagement.managers       = "";
+    remoteManagement.rfOnly         = true;
+
+    Serial.println("All is Written!");
 }
 
 Configuration::Configuration() {

src/configuration.h

@@ -1,141 +0,0 @@
-#ifndef CONFIGURATION_H_
-#define CONFIGURATION_H_
-
-#include <Arduino.h>
-#include <vector>
-#include <FS.h>
-
-class WiFi_AP {
-public:
-    String  ssid;
-    String  password;
-    // double  latitude; // deprecated
-    // double  longitude; // deprecated
-};
-
-class WiFi_Auto_AP {
-public:
-    String  password;
-    int     powerOff;
-};
-
-class Beacon {
-public:
-    double  latitude; // new
-    double  longitude; // new
-    String  comment; // new
-    String  overlay; // new
-    String  symbol; // new
-    int     interval; // new
-    bool    sendViaRF; // new
-    bool    sendViaAPRSIS; // new
-    String  path; // new
-};
-
-class DIGI {
-public:
-    int     mode; // new
-    // String  comment; // deprecated
-    // double  latitude; // deprecated
-    // double  longitude; // deprecated
-};
-
-class APRS_IS {
-public:
-    bool    active; // new
-    String  passcode;
-    String  server;
-    int     port;
-    // int     reportingDistance; // deprecated
-    String  filter; // new
-    bool    toRF; // new
-};
-
-class LoraModule {
-public:
-    // long    iGateFreq; // deprecated
-    // long    digirepeaterTxFreq; // deprecated
-    // long    digirepeaterRxFreq; // deprecated
-    long    txFreq; // new
-    long    rxFreq; // new
-    bool    txActive; // new
-    bool    rxActive; // new
-    int     spreadingFactor;
-    long    signalBandwidth;
-    int     codingRate4;
-    int     power;
-};
-
-class Display {
-public:
-    bool    alwaysOn;
-    int     timeout;
-    bool    turn180;
-};
-
-class TNC {
-public:
-    bool    enableServer;
-    bool    enableSerial;
-    bool    acceptOwn;
-};
-
-class SYSLOG {
-public:
-    bool    active;
-    String  server;
-    int     port;
-};
-
-class BME {
-public:
-    bool    active;
-};
-
-class OTA {
-public:
-    String  username;
-    String  password;
-};
-
-
-
-
-class Configuration {
-public:
-    bool                  reload;
-    String                callsign;  
-    // int                   stationMode; // deprecated
-    // String                iGateComment; // deprecated
-    // int                   beaconInterval; // deprecated
-    // bool                  igateSendsLoRaBeacons; // deprecated
-    // bool                  igateRepeatsLoRaPackets; // deprecated
-    int                   rememberStationTime;
-    bool                  sendBatteryVoltage;
-    bool                  externalVoltageMeasurement;
-    int                   externalVoltagePin;
-    bool                  lowPowerMode;
-    double                lowVoltageCutOff;
-    std::vector<WiFi_AP>  wifiAPs;
-    WiFi_Auto_AP          wifiAutoAP;
-    Beacon                beacon; // new
-    DIGI                  digi;
-    TNC                   tnc; // new
-    APRS_IS               aprs_is;
-    LoraModule            loramodule;
-    Display               display;
-    SYSLOG                syslog;
-    BME                   bme;
-    OTA                   ota;
-  
-    void init();
-    void writeFile();
-    void check();
-    Configuration();
-
-private:
-    bool readFile();
-    String _filePath;
-};
-
-#endif

src/digi_utils.cpp

@@ -2,14 +2,14 @@
 #include "configuration.h"
 #include "station_utils.h"
 #include "aprs_is_utils.h"
-#include "query_utils.h"
-#include "lora_utils.h"
 #include "digi_utils.h"
 #include "wifi_utils.h"
+#include "lora_utils.h"
 #include "gps_utils.h"
 #include "display.h"
 #include "utils.h"
 
+
 extern Configuration    Config;
 extern uint32_t         lastScreenOn;
 extern String           iGateBeaconPacket;
@@ -20,64 +20,136 @@ extern String           fourthLine;
 extern String           fifthLine;
 extern String           sixthLine;
 extern String           seventhLine;
+extern bool             backUpDigiMode;
 
 
 namespace DIGI_Utils {
 
-    String generateDigiRepeatedPacket(String packet, String callsign) {
-        String sender, temp0, tocall, path;
-        sender = packet.substring(0, packet.indexOf(">"));
-        temp0 = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
-        if (temp0.indexOf(",") > 2) {
-            tocall = temp0.substring(0, temp0.indexOf(","));
-            path = temp0.substring(temp0.indexOf(",") + 1, temp0.indexOf(":"));
-            if (path.indexOf("WIDE1-") >= 0) {
-                String hop = path.substring(path.indexOf("WIDE1-") + 6, path.indexOf("WIDE1-") + 7);
-                if (hop.toInt() >= 1 && hop.toInt() <= 7) {
-                    if (hop.toInt() == 1) {
-                        path.replace("WIDE1-1", callsign + "*");
-                    }
-                    else {
-                        path.replace("WIDE1-" + hop, callsign + "*,WIDE1-" + String(hop.toInt() - 1));
-                    }
-                    String repeatedPacket = sender + ">" + tocall + "," + path + packet.substring(packet.indexOf(":"));
-                    return repeatedPacket;
+    String buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq) {
+        if (!crossFreq) {
+            String packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
+            String tempPath = path;
+
+            if (path.indexOf("WIDE1-1") != -1 && (Config.digi.mode == 2 || Config.digi.mode == 3)) {
+                tempPath.replace("WIDE1-1", Config.callsign + "*");
+            } else if (path.indexOf("WIDE2-") != -1 && Config.digi.mode == 3) {
+                if (path.indexOf(",WIDE1*") != -1) {
+                    tempPath.remove(path.indexOf(",WIDE1*"), 7);
                 }
-                else {
+                if (path.indexOf("*") != -1) {
+                    tempPath.remove(path.indexOf("*"), 1);
+                }
+                if (path.indexOf("WIDE2-1") != -1) {
+                    tempPath.replace("WIDE2-1", Config.callsign + "*");
+                } else if (path.indexOf("WIDE2-2") != -1) {
+                    tempPath.replace("WIDE2-2", Config.callsign + "*,WIDE2-1");
+                } else {
                     return "";
                 }
             }
-            else {
+            packetToRepeat += tempPath;
+            if (thirdParty) {
+                packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":}")));
+            } else {
+                packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":")));
+            }
+            return packetToRepeat;
+        } else {   // CrossFreq Digipeater
+            String suffix = thirdParty ? ":}" : ":";
+            String packetToRepeat = packet.substring(0, packet.indexOf(suffix));
+            
+            String terms[] = {",WIDE1*", ",WIDE2*", "*"};
+            for (String term : terms) {
+                int index = packetToRepeat.indexOf(term);
+                if (index != -1) {
+                    packetToRepeat.remove(index, term.length());
+                }
+            }
+            packetToRepeat += ",";
+            packetToRepeat += Config.callsign;
+            packetToRepeat += "*";
+            packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(suffix)));
+            return packetToRepeat;
+        }
+    }
+
+    String generateDigipeatedPacket(const String& packet, bool thirdParty){
+        String temp;
+        if (thirdParty) { // only header is used
+            const String& header = packet.substring(0, packet.indexOf(":}"));
+            temp = header.substring(header.indexOf(">") + 1);
+        } else {
+            temp = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
+        }
+        if (temp.indexOf(",") > 2) { // checks for path
+            const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
+            if (Config.digi.mode == 2 || backUpDigiMode) {
+                if (path.indexOf("WIDE1-1") != - 1) {
+                    return buildPacket(path, packet, thirdParty, false);
+                } else if (path.indexOf("WIDE1-1") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) { //  CrossFreq Digi
+                    return buildPacket(path, packet, thirdParty, true);
+                } else {
+                    return "";
+                }
+            } else if (Config.digi.mode == 3) {
+                if (path.indexOf("WIDE1-1") != -1 || path.indexOf("WIDE2-") != -1) {
+                    int wide1Index = path.indexOf("WIDE1-1");
+                    int wide2Index = path.indexOf("WIDE2-");
+
+                    // WIDE1-1 && WIDE2-n   /   only WIDE1-1    /   only WIDE2-n
+                    if ((wide1Index != -1 && wide2Index != -1 && wide1Index < wide2Index) || (wide1Index != -1 && wide2Index == -1) || (wide1Index == -1 && wide2Index != -1)) {
+                        return buildPacket(path, packet, thirdParty, false);
+                    }
+                    return "";
+                } else if (path.indexOf("WIDE1-1") == -1 && path.indexOf("WIDE2-") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {    //  CrossFreq Digi
+                    return buildPacket(path, packet, thirdParty, true);
+                } else {
+                    return "";
+                }
+            } else {
                 return "";
             }
-        }
-        else {
+        } else if (temp.indexOf(",") == -1 && (Config.digi.mode == 2 || backUpDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
+            return buildPacket("", packet, thirdParty, true);
+        } else {
             return "";
         }
     }
 
-    void processPacket(String packet) {
-        bool queryMessage = false;
-        String loraPacket, Sender, AddresseeAndMessage, Addressee;
-        if (packet != "") {
-            if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("NOGATE") == -1)) {
-                Sender = packet.substring(3, packet.indexOf(">"));
-                if (Sender != Config.callsign) {
+    void processLoRaPacket(const String& packet) {
+        if (packet.indexOf("NOGATE") == -1) {
+            bool thirdPartyPacket = false;
+            String temp, Sender;
+            int firstColonIndex = packet.indexOf(":");
+            if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] == '}' && packet.indexOf("TCPIP") > 0) {   // 3rd Party 
+                thirdPartyPacket = true;
+                temp    = packet.substring(packet.indexOf(":}") + 2);
+                Sender  = temp.substring(0, temp.indexOf(">"));
+            } else {
+                temp    = packet.substring(3);
+                Sender  = packet.substring(3, packet.indexOf(">"));
+            }
+            if (Sender != Config.callsign) {        // Avoid listening to own packets
+                if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) {
+                    return;
+                }
+                if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
                     STATION_Utils::updateLastHeard(Sender);
-                    // STATION_Utils::updatePacketBuffer(packet);
-                    Utils::typeOfPacket(packet.substring(3), "Digi");
-                    AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                    Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
-                    Addressee.trim();
-                    if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
-                        queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage);
+                    Utils::typeOfPacket(temp, 2);    // Digi
+                    bool queryMessage = false;
+                    if (temp.indexOf("::") > 10) {   // it's a message
+                        String AddresseeAndMessage  = temp.substring(temp.indexOf("::") + 2);
+                        String Addressee            = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                        Addressee.trim();
+                        if (Addressee == Config.callsign) {     // it's a message for me!
+                            queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage, thirdPartyPacket);
+                        }
                     }
-                    if (!queryMessage && packet.indexOf("WIDE1-") > 10 && Config.digi.mode == 2) { // If should repeat packet (WIDE1 Digi)
-                        loraPacket = generateDigiRepeatedPacket(packet.substring(3), Config.callsign);
+                    if (!queryMessage) {
+                        String loraPacket = generateDigipeatedPacket(packet.substring(3), thirdPartyPacket);
                         if (loraPacket != "") {
-                            delay(500);
-                            LoRa_Utils::sendNewPacket("APRS", loraPacket);
-                            display_toggle(true);
+                            STATION_Utils::addToOutputPacketBuffer(loraPacket);
+                            if (Config.digi.ecoMode != 1) displayToggle(true);
                             lastScreenOn = millis();
                         }
                     }
@@ -86,8 +158,4 @@ namespace DIGI_Utils {
         }
     }
 
-    void loop(String packet) {
-        processPacket(packet);
-    }
-
 }

src/digi_utils.h

@@ -1,15 +0,0 @@
-#ifndef DIGI_UTILS_H_
-#define DIGI_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace DIGI_Utils {
-
-    String generateDigiRepeatedPacket(String packet, String callsign);
-    void processPacket(String packet);
-    void loop(String packet);
-
-}
-
-#endif

src/display.cpp

@@ -1,185 +1,282 @@
-#include <Adafruit_SSD1306.h>
-#include <Adafruit_GFX.h>
 #include <Wire.h>
 #include "configuration.h"
-#include "pins_config.h"
+#include "board_pinout.h"
 #include "display.h"
 
+
 #ifdef HAS_DISPLAY
-Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RST);
+    #ifdef HAS_TFT
+        #include <TFT_eSPI.h>
+
+        TFT_eSPI tft = TFT_eSPI(); 
+        TFT_eSprite sprite  = TFT_eSprite(&tft);
+
+        #ifdef HELTEC_WIRELESS_TRACKER
+            #define bigSizeFont     2
+            #define smallSizeFont   1
+            #define lineSpacing     10
+        #endif
+        #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+            #define bigSizeFont     5
+            #define smallSizeFont   2
+            #define lineSpacing     25
+        #endif
+        uint16_t redColor           = 0xc8a2;
+    #else
+        #ifdef HAS_EPAPER
+            #include <heltec-eink-modules.h>
+            #include "Fonts/FreeSansBold9pt7b.h"
+            EInkDisplay_WirelessPaperV1_1 display;
+            String lastEpaperText;
+        #else
+            #include <Adafruit_GFX.h>
+            #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                #include <Adafruit_SH110X.h>
+                Adafruit_SH1106G display(128, 64, &Wire, OLED_RST);
+            #else
+                #include <Adafruit_SSD1306.h>
+                #ifdef HELTEC_WSL_V3_DISPLAY
+                    Adafruit_SSD1306 display(128, 64, &Wire1, OLED_RST);
+                #else
+                    Adafruit_SSD1306 display(128, 64, &Wire, OLED_RST);
+                #endif
+            #endif
+        #endif
+    #endif
 #endif
 
-extern Configuration Config;
+extern  Configuration   Config;
 
-void setup_display() {
+bool    displayFound    = false;
+
+void displaySetup() {
     #ifdef HAS_DISPLAY
-    Wire.begin(OLED_SDA, OLED_SCL);
+        delay(500);
+        #ifdef HAS_TFT
+            tft.init();
+            tft.begin();
+            if (Config.display.turn180) {
+                    tft.setRotation(3);
+            } else {
+                tft.setRotation(1);
+            }
+            pinMode(TFT_BL, OUTPUT);
+            digitalWrite(TFT_BL, HIGH);
+            tft.setTextFont(0);
+            tft.fillScreen(TFT_BLACK);
+            #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+                sprite.createSprite(320,240);
+            #else
+                sprite.createSprite(160,80);
+            #endif
+        #else
+            #ifdef HAS_EPAPER
+                display.landscape();
+                display.printCenter("LoRa APRS iGate Initialising...");
+                display.update();
+            #else
+                #ifdef OLED_DISPLAY_HAS_RST_PIN
+                    pinMode(OLED_RST, OUTPUT);
+                    digitalWrite(OLED_RST, LOW);
+                    delay(20);
+                    digitalWrite(OLED_RST, HIGH);
+                #endif
 
-    if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { 
-        Serial.println(F("SSD1306 allocation failed"));
-        for(;;); // Don't proceed, loop forever
-    }
-    if (Config.display.turn180) {
-        display.setRotation(2);
-    }
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(1000);
+                #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    if (!display.begin(0x3c, false)) {
+                        displayFound = true;
+                        if (Config.display.turn180) display.setRotation(2);
+                        display.clearDisplay();
+                        display.setTextColor(SH110X_WHITE);
+                        display.setTextSize(1);
+                        display.setCursor(0, 0);
+                        display.setContrast(1);
+                        display.display();
+                    }
+                #else
+                    if(display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
+                        displayFound = true;
+                        if (Config.display.turn180) display.setRotation(2);
+                        display.clearDisplay();
+                        display.setTextColor(WHITE);
+                        display.setTextSize(1);
+                        display.setCursor(0, 0);
+                        display.ssd1306_command(SSD1306_SETCONTRAST);
+                        display.ssd1306_command(1);
+                        display.display();
+                    }
+                #endif
+            #endif
+        #endif
+        delay(1000);
     #endif
 }
 
-void display_toggle(bool toggle) {
+void displayToggle(bool toggle) {
     #ifdef HAS_DISPLAY
-    if (toggle) {
-        display.ssd1306_command(SSD1306_DISPLAYON);
-    } else {
-        display.ssd1306_command(SSD1306_DISPLAYOFF);
-    }
+        if (toggle) {
+            #ifdef HAS_TFT
+                digitalWrite(TFT_BL, HIGH);
+            #else
+                #ifdef HAS_EPAPER
+                    display.printCenter("EPAPER Display Disabled by toggle...");
+                    display.update();
+                #else
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        if (displayFound) display.oled_command(SH110X_DISPLAYON);
+                    #else
+                        if (displayFound) display.ssd1306_command(SSD1306_DISPLAYON);
+                    #endif
+                #endif
+            #endif
+        } else {
+            #ifdef HAS_TFT
+                digitalWrite(TFT_BL, LOW);
+            #else
+                #ifdef HAS_EPAPER
+                    display.printCenter("Enabled EPAPER Display...");
+                    display.update();
+                #else
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        if (displayFound) display.oled_command(SH110X_DISPLAYOFF);
+                    #else
+                        if (displayFound) display.ssd1306_command(SSD1306_DISPLAYOFF);
+                    #endif
+                    
+                #endif
+            #endif
+        }
     #endif
 }
 
-void show_display(String line1, int wait) {
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, int wait) {
     #ifdef HAS_DISPLAY
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
+        const String* const lines[] = {&line1, &line2, &line3};
+        #ifdef HAS_TFT
+            sprite.fillSprite(TFT_BLACK);
+            #if defined(HELTEC_WIRELESS_TRACKER)
+                sprite.fillRect(0, 0, 160, 19, redColor);
+            #endif
+            #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+                sprite.fillRect(0, 0, 320, 43, redColor);
+            #endif
+            sprite.setTextFont(0);
+            sprite.setTextSize(bigSizeFont);
+            sprite.setTextColor(TFT_WHITE, redColor);
+            sprite.drawString(header, 3, 3);
+
+            sprite.setTextSize(smallSizeFont);
+            sprite.setTextColor(TFT_WHITE, TFT_BLACK);
+
+            for (int i = 0; i < 3; i++) {
+                sprite.drawString(*lines[i], 3, (lineSpacing * (2 + i)) - 2);
+            }
+
+            sprite.pushSprite(0,0);
+        #else
+            #ifdef HAS_EPAPER
+                display.clearMemory();
+                display.setCursor(5,10);
+                display.setFont(&FreeSansBold9pt7b);
+                display.println(header);
+                display.setFont(NULL);
+                for (int i = 0; i < 3; i++) {
+                    display.setCursor(0, 25 + (14 * i));
+                    display.println(*lines[i]);
+                }
+                display.update();
+            #else
+                if (displayFound) {
+                    display.clearDisplay();
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setTextColor(SH110X_WHITE);
+                    #else
+                        display.setTextColor(WHITE);
+                    #endif
+                    display.setTextSize(1);
+                    display.setCursor(0, 0);
+                    display.println(header);
+                    for (int i = 0; i < 3; i++) {
+                        display.setCursor(0, 8 + (8 * i));
+                        display.println(*lines[i]);
+                    }
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setContrast(1);
+                    #else
+                        display.ssd1306_command(SSD1306_SETCONTRAST);
+                        display.ssd1306_command(1);
+                    #endif
+                    display.display();
+                }
+            #endif
+        #endif
+        delay(wait);
     #endif
 }
 
-void show_display(String line1, String line2, int wait) {
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, const String& line6, int wait) {
     #ifdef HAS_DISPLAY
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-    #endif
-}
+        const String* const lines[] = {&line1, &line2, &line3, &line4, &line5, &line6};
+        #ifdef HAS_TFT
+            sprite.fillSprite(TFT_BLACK);
+            #if defined(HELTEC_WIRELESS_TRACKER)
+                sprite.fillRect(0, 0, 160, 19, redColor);
+            #endif
+            #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+                sprite.fillRect(0, 0, 320, 43, redColor);
+            #endif
+            sprite.setTextFont(0);
+            sprite.setTextSize(bigSizeFont);
+            sprite.setTextColor(TFT_WHITE, redColor);
+            sprite.drawString(header, 3, 3);
 
-void show_display(String line1, String line2, String line3, int wait) {
-    #ifdef HAS_DISPLAY
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-    #endif
-}
+            sprite.setTextSize(smallSizeFont);
+            sprite.setTextColor(TFT_WHITE, TFT_BLACK);
 
-void show_display(String line1, String line2, String line3, String line4, int wait) {
-    #ifdef HAS_DISPLAY
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.setCursor(0, 24);
-    display.println(line4);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-    #endif
-}
+            for (int i = 0; i < 6; i++) {
+                sprite.drawString(*lines[i], 3, (lineSpacing * (2 + i)) - 2);
+            }
 
-void show_display(String line1, String line2, String line3, String line4, String line5, int wait) {
-    #ifdef HAS_DISPLAY
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.setCursor(0, 24);
-    display.println(line4);
-    display.setCursor(0, 32);
-    display.println(line5);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-    #endif
-}
-
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, int wait) {
-    #ifdef HAS_DISPLAY
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.setCursor(0, 24);
-    display.println(line4);
-    display.setCursor(0, 32);
-    display.println(line5);
-    display.setCursor(0, 40);
-    display.println(line6);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-    #endif
-}
-
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, String line7, int wait) {
-    #ifdef HAS_DISPLAY
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(2);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setTextSize(1);
-    display.setCursor(0, 16);
-    display.println(line2);
-    display.setCursor(0, 24);
-    display.println(line3);
-    display.setCursor(0, 32);
-    display.println(line4);
-    display.setCursor(0, 40);
-    display.println(line5);
-    display.setCursor(0, 48);
-    display.println(line6);
-    display.setCursor(0, 56);
-    display.println(line7);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
+            sprite.pushSprite(0,0);
+        #else
+            #ifdef HAS_EPAPER
+                lastEpaperText = header + line1 + line2 + line3 + line4 + line5 + line6;
+                display.clearMemory();
+                display.setCursor(5,10);
+                display.setFont(&FreeSansBold9pt7b);
+                display.println(header);
+                display.setFont(NULL);
+                for (int i = 0; i < 6; i++) {
+                    display.setCursor(0, 25 + (14 * i));
+                    display.println(*lines[i]);
+                }
+                display.update();
+            #else
+                if (displayFound) {
+                    display.clearDisplay();
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setTextColor(SH110X_WHITE);
+                    #else
+                        display.setTextColor(WHITE);
+                    #endif
+                    display.setTextSize(2);
+                    display.setCursor(0, 0);
+                    display.println(header);
+                    display.setTextSize(1);
+                    for (int i = 0; i < 6; i++) {
+                        display.setCursor(0, 16 + (8 * i));
+                        display.println(*lines[i]);
+                    }
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setContrast(1);
+                    #else
+                        display.ssd1306_command(SSD1306_SETCONTRAST);
+                        display.ssd1306_command(1);
+                    #endif
+                    display.display();
+                }
+            #endif
+        #endif
+        delay(wait);
     #endif
 }

src/display.h

@@ -1,22 +0,0 @@
-#ifndef DISPLAY_H_
-#define DISPLAY_H_
-
-#include <Arduino.h>
-
-#define SCREEN_WIDTH    128     // OLED display width, in pixels
-#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);
-
-void show_display(String line1, int wait = 0);
-void show_display(String line1, String line2, int wait = 0);
-void show_display(String line1, String line2, String line3, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, String line5, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, String line7, int wait = 0);
-
-#endif

src/gps_utils.cpp

@@ -1,15 +1,30 @@
 #include <TinyGPS++.h>
 #include <WiFi.h>
 #include "configuration.h"
+#include "board_pinout.h"
 #include "gps_utils.h"
+#include "display.h"
+#include "utils.h"
 
-extern Configuration  Config;
-extern WiFiClient     espClient;
-String                distance;
+#ifdef GPS_BAUDRATE
+    #define GPS_BAUD    GPS_BAUDRATE
+#else
+    #define GPS_BAUD    9600
+#endif
+
+extern Configuration    Config;
+extern WiFiClient       espClient;
+extern HardwareSerial   gpsSerial;
+extern TinyGPSPlus      gps;
+String                  distance, iGateBeaconPacket, iGateLoRaBeaconPacket;
 
 
 namespace GPS_Utils {
 
+    String getiGateLoRaBeaconPacket() {
+        return iGateLoRaBeaconPacket;
+    }
+
     char *ax25_base91enc(char *s, uint8_t n, uint32_t v) {
         for(s += n, *s = '\0'; n; n--) {
             *(--s) = v % 91 + 33;
@@ -18,20 +33,32 @@ namespace GPS_Utils {
         return(s);
     }
 
-    String encodeGPS(float latitude, float longitude, String overlay, String symbol) {
+    float roundToTwoDecimals(float degrees) {
+        return round(degrees * 100) / 100;
+    }
+
+    String encodeGPS(float latitude, float longitude, const String& overlay, const String& symbol) {
         String encodedData = overlay;
         uint32_t aprs_lat, aprs_lon;
-        aprs_lat = 900000000 - latitude * 10000000;
+
+        float processedLatitude     = latitude;
+        float processedLongitude    = longitude;
+        if (Config.beacon.gpsActive && Config.beacon.gpsAmbiguity) {
+            processedLatitude       = roundToTwoDecimals(latitude);
+            processedLongitude      = roundToTwoDecimals(longitude);
+        }
+
+        aprs_lat = 900000000 - processedLatitude * 10000000;
         aprs_lat = aprs_lat / 26 - aprs_lat / 2710 + aprs_lat / 15384615;
-        aprs_lon = 900000000 + longitude * 10000000 / 2;
+        aprs_lon = 900000000 + processedLongitude * 10000000 / 2;
         aprs_lon = aprs_lon / 26 - aprs_lon / 2710 + aprs_lon / 15384615;
 
         String Ns, Ew, helper;
-        if(latitude < 0) { Ns = "S"; } else { Ns = "N"; }
-        if(latitude < 0) { latitude= -latitude; }
+        if(processedLatitude < 0) { Ns = "S"; } else { Ns = "N"; }
+        if(processedLatitude < 0) { processedLatitude = -processedLatitude; }
 
-        if(longitude < 0) { Ew = "W"; } else { Ew = "E"; }
-        if(longitude < 0) { longitude= -longitude; }
+        if(processedLongitude < 0) { Ew = "W"; } else { Ew = "E"; }
+        if(processedLongitude < 0) { processedLongitude = -processedLongitude; }
 
         char helper_base91[] = {"0000\0"};
         int i;
@@ -43,95 +70,171 @@ namespace GPS_Utils {
         for (i = 0; i < 4; i++) {
             encodedData += helper_base91[i];
         }
-        encodedData += symbol + " x" + "\x47";
+        encodedData += symbol;
+        encodedData += "  ";
+        encodedData += "\x47";
         return encodedData;
     }
 
-    String generateBeacon() {
-        String beaconPacket = Config.callsign + ">APLRG1," + Config.beacon.path;
-
-        if (Config.aprs_is.active && Config.digi.mode == 0) { // If APRSIS enabled and Digi disabled
-            beaconPacket += ",qAC";
-        } 
-        return beaconPacket + ":!" + encodeGPS(Config.beacon.latitude, Config.beacon.longitude, Config.beacon.overlay, Config.beacon.symbol);;
+    void generateBeaconFirstPart() {
+        String beaconPacket = Config.callsign;
+        beaconPacket += ">APLRG1";
+        if (Config.beacon.path.indexOf("WIDE") == 0) {
+            beaconPacket += ",";
+            beaconPacket += Config.beacon.path;
+        }
+        iGateBeaconPacket       = beaconPacket;
+        iGateBeaconPacket       += ",qAC:!";
+        iGateLoRaBeaconPacket   = beaconPacket;
+        iGateLoRaBeaconPacket   += ":!";
     }
 
-    String generateiGateLoRaBeacon() {
-        return Config.callsign + ">APLRG1," + Config.beacon.path + ":!" + encodeGPS(Config.beacon.latitude, Config.beacon.longitude, Config.beacon.overlay, Config.beacon.symbol);
+    void generateBeacons() {
+        if (Config.callsign.indexOf("NOCALL-10") != 0 && !Utils::checkValidCallsign(Config.callsign)) {
+            displayShow("***** ERROR ******", "CALLSIGN = NOT VALID!", "", "Only Rx Mode Active", 3000);
+            Config.loramodule.txActive  = false;
+            Config.aprs_is.messagesToRF = false;
+            Config.aprs_is.objectsToRF  = false;
+            Config.beacon.sendViaRF     = false;
+            Config.digi.mode            = 0;
+            Config.backupDigiMode       = false;
+        }
+        generateBeaconFirstPart();
+        String encodedGPS       = encodeGPS(Config.beacon.latitude, Config.beacon.longitude, Config.beacon.overlay, Config.beacon.symbol);
+        iGateBeaconPacket       += encodedGPS;
+        iGateLoRaBeaconPacket   += encodedGPS;
     }
 
     double calculateDistanceTo(double latitude, double longitude) {
         return TinyGPSPlus::distanceBetween(Config.beacon.latitude,Config.beacon.longitude, latitude, longitude) / 1000.0;
     }
 
-    String decodeEncodedGPS(String packet) {
-        String GPSPacket = packet.substring(packet.indexOf(":!")+3);
-        String encodedLatitude    = GPSPacket.substring(0,4);
-        String encodedLongtitude  = GPSPacket.substring(4,8);
+    String decodeEncodedGPS(const String& packet) {
+        int indexOfExclamation  = packet.indexOf(":!");
+        int indexOfEqual        = packet.indexOf(":=");
+
+        const uint8_t OFFSET = 3;     // Offset for encoded data in the packet
+        String GPSPacket;
+        if (indexOfExclamation > 10) {
+            GPSPacket = packet.substring(indexOfExclamation + OFFSET);
+        } else if (indexOfEqual > 10) {
+            GPSPacket = packet.substring(indexOfEqual + OFFSET);
+        }
+
+        String encodedLatitude = GPSPacket.substring(0,4);
+        int Y1 = encodedLatitude[0] - 33;
+        int Y2 = encodedLatitude[1] - 33;
+        int Y3 = encodedLatitude[2] - 33;
+        int Y4 = encodedLatitude[3] - 33;
+        float decodedLatitude = 90.0 - (((Y1 * pow(91,3)) + (Y2 * pow(91,2)) + (Y3 * 91) + Y4) / 380926.0);
+
+        String encodedLongitude = GPSPacket.substring(4,8);
+        int X1 = encodedLongitude[0] - 33;
+        int X2 = encodedLongitude[1] - 33;
+        int X3 = encodedLongitude[2] - 33;
+        int X4 = encodedLongitude[3] - 33;
+        float decodedLongitude = -180.0 + (((X1 * pow(91,3)) + (X2 * pow(91,2)) + (X3 * 91) + X4) / 190463.0);
 
-        int Y1 = int(encodedLatitude[0]);
-        int Y2 = int(encodedLatitude[1]);
-        int Y3 = int(encodedLatitude[2]);
-        int Y4 = int(encodedLatitude[3]);
-        float decodedLatitude = 90.0 - ((((Y1-33) * pow(91,3)) + ((Y2-33) * pow(91,2)) + ((Y3-33) * 91) + Y4-33) / 380926.0);
-        
-        int X1 = int(encodedLongtitude[0]);
-        int X2 = int(encodedLongtitude[1]);
-        int X3 = int(encodedLongtitude[2]);
-        int X4 = int(encodedLongtitude[3]);
-        float decodedLongitude = -180.0 + ((((X1-33) * pow(91,3)) + ((X2-33) * pow(91,2)) + ((X3-33) * 91) + X4-33) / 190463.0);
         distance = String(calculateDistanceTo(decodedLatitude, decodedLongitude),1);
-        return String(decodedLatitude,5) + "N / " + String(decodedLongitude,5) + "E / " + distance + "km";
+
+        String decodedGPS = String(decodedLatitude,5);
+        decodedGPS += "N / ";
+        decodedGPS += String(decodedLongitude,5);
+        decodedGPS += "E / ";
+        decodedGPS += distance;
+        decodedGPS += "km";
+
+        String comment = GPSPacket.substring(12);
+        if (comment != "") {
+            decodedGPS += " / ";
+            decodedGPS += comment;
+        }
+        return decodedGPS;
     }
 
-    String getReceivedGPS(String packet) {
+    String getReceivedGPS(const String& packet) {
+        int indexOfExclamation  = packet.indexOf(":!");
+        int indexOfEqual        = packet.indexOf(":=");
+        int indexOfAt           = packet.indexOf(":@");
+
         String infoGPS;
-        if (packet.indexOf(":!") > 10) {
-            infoGPS = packet.substring(packet.indexOf(":!")+2);
-        } else if (packet.indexOf(":=") > 10) {
-            infoGPS = packet.substring(packet.indexOf(":=")+2);
+        if (indexOfExclamation > 10) {
+            infoGPS = packet.substring(indexOfExclamation + 2);
+        } else if (indexOfEqual > 10) {
+            infoGPS = packet.substring(indexOfEqual + 2);
+        } else if (indexOfAt > 10) {
+            infoGPS = packet.substring(indexOfAt + 9);  // 9 = 2+7 (when 7 is timestamp characters)
         }
-        String Latitude       = infoGPS.substring(0,8);
-        String Longitude      = infoGPS.substring(9,18);
 
-        float convertedLatitude, convertedLongitude;
-        String firstLatPart   = Latitude.substring(0,2);
-        String secondLatPart  = Latitude.substring(2,4);
-        String thirdLatPart   = Latitude.substring(Latitude.indexOf(".")+1,Latitude.indexOf(".")+3);
-        String firstLngPart   = Longitude.substring(0,3);
-        String secondLngPart  = Longitude.substring(3,5);
-        String thirdLngPart   = Longitude.substring(Longitude.indexOf(".")+1,Longitude.indexOf(".")+3);
-        convertedLatitude     = firstLatPart.toFloat() + (secondLatPart.toFloat()/60) + (thirdLatPart.toFloat()/(60*100));
-        convertedLongitude    = firstLngPart.toFloat() + (secondLngPart.toFloat()/60) + (thirdLngPart.toFloat()/(60*100));
+        String Latitude             = infoGPS.substring(0,8);                   // First 8 characters are Latitude
+        float convertedLatitude     = Latitude.substring(0,2).toFloat();        // First 2 digits (Degrees)
+        convertedLatitude += Latitude.substring(2,4).toFloat() / 60;            // Next 2 digits (Minutes)
+        convertedLatitude += Latitude.substring(Latitude.indexOf(".") + 1, Latitude.indexOf(".") + 3).toFloat() / (60*100);
+        if (Latitude.endsWith("S")) convertedLatitude = -convertedLatitude;     // Handle Southern Hemisphere
+
+        String Longitude            = infoGPS.substring(9,18);                  // Next 9 characters are Longitude
+        float convertedLongitude    = Longitude.substring(0,3).toFloat();       // First 3 digits (Degrees)
+        convertedLongitude += Longitude.substring(3,5).toFloat() / 60;          // Next 2 digits (Minutes)
+        convertedLongitude += Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3).toFloat() / (60*100);
+        if (Longitude.endsWith("W")) convertedLongitude = -convertedLongitude;  // Handle Western Hemisphere
         
-        String LatSign = String(Latitude[7]);
-        String LngSign = String(Longitude[8]);
-        if (LatSign == "S") {
-            convertedLatitude = -convertedLatitude;
-        } 
-        if (LngSign == "W") {
-            convertedLongitude = -convertedLongitude;
-        }
         distance = String(calculateDistanceTo(convertedLatitude, convertedLongitude),1);
-        return String(convertedLatitude,5) + "N / " + String(convertedLongitude,5) + "E / " + distance + "km";
+
+        String decodedGPS = String(convertedLatitude,5);
+        decodedGPS += "N / ";
+        decodedGPS += String(convertedLongitude,5);
+        decodedGPS += "E / ";
+        decodedGPS += distance;
+        decodedGPS += "km";
+
+        String comment = infoGPS.substring(19);  
+        if (comment != "") {
+            decodedGPS += " / ";
+            decodedGPS += comment;
+        }
+        return decodedGPS;
     }
 
-    String getDistance(String packet) {
-        uint8_t encodedBytePosition = 0;
-        if (packet.indexOf(":!") > 10) {
-            encodedBytePosition = packet.indexOf(":!") + 14;
-        }
-        if (packet.indexOf(":=") > 10) {
-            encodedBytePosition = packet.indexOf(":=") + 14;
-        }
-        if (encodedBytePosition != 0) {
-            if (String(packet[encodedBytePosition]) == "G" || String(packet[encodedBytePosition]) == "Q" || String(packet[encodedBytePosition]) == "[" || String(packet[encodedBytePosition]) == "H") {
-                return decodeEncodedGPS(packet);
-            } else {
-                return getReceivedGPS(packet);
-            }
+    String getDistanceAndComment(const String& packet) {
+        int indexOfAt = packet.indexOf(":@");
+        if (indexOfAt > 10) {
+            return getReceivedGPS(packet);
         } else {
-            return " _ / _ / _ ";
+            const uint8_t ENCODED_BYTE_OFFSET = 14;     // Offset for encoded data in the packet
+            int indexOfExclamation  = packet.indexOf(":!");
+            int indexOfEqual        = packet.indexOf(":=");
+            uint8_t encodedBytePosition = 0;
+            if (indexOfExclamation > 10) {              // Determine the position where encoded data starts
+                encodedBytePosition = indexOfExclamation + ENCODED_BYTE_OFFSET;
+            } else if (indexOfEqual > 10) {
+                encodedBytePosition = indexOfEqual + ENCODED_BYTE_OFFSET;
+            }
+
+            if (encodedBytePosition != 0) {
+                char currentChar = packet[encodedBytePosition];
+                if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X') {
+                    return decodeEncodedGPS(packet);    // If valid encoded data position is found, decode it
+                } else {
+                    return getReceivedGPS(packet);
+                }
+            } else {
+                return " _ / _ / _ ";
+            }
+        }
+    }
+
+    void setup() {
+        #ifdef HAS_GPS
+            if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) {
+                gpsSerial.begin(GPS_BAUD, SERIAL_8N1, GPS_TX, GPS_RX);
+            }
+        #endif
+        generateBeacons();
+    }
+
+    void getData() {
+        while (gpsSerial.available() > 0) {
+            gps.encode(gpsSerial.read());
         }
     }
 

src/gps_utils.h

@@ -1,20 +0,0 @@
-#ifndef GPS_UTILS_H_
-#define GPS_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace GPS_Utils {
-
-    char *ax25_base91enc(char *s, uint8_t n, uint32_t v);
-    String encodeGPS(float latitude, float longitude, String overlay, String symbol);
-    String generateBeacon();
-    String generateiGateLoRaBeacon();
-    double calculateDistanceCourse(double latitude, double longitude);
-    String decodeEncodedGPS(String packet);
-    String getReceivedGPS(String packet);
-    String getDistance(String packet);
-
-}
-
-#endif

src/kiss_utils.cpp

@@ -1,6 +1,7 @@
 #include <Arduino.h>
 #include "kiss_protocol.h"
 
+
 bool validateTNC2Frame(const String& tnc2FormattedFrame) {
     return (tnc2FormattedFrame.indexOf(':') != -1) && (tnc2FormattedFrame.indexOf('>') != -1);
 }