From bc7a9d8eb338ed44bc7f3b6dcf4e82f32d23a1f7 Mon Sep 17 00:00:00 2001
From: Thomas Osterried <dl9sau@github>
Date: Mon, 7 Mar 2022 21:06:05 +0100
Subject: [PATCH] Minor changes

- bugfix
  - config rx on secondary freq did not work anymore (lost this functionality
    one or two versions before and did not recognize)
  - cross-digi: Now only on receiption on main freq. Had overseen this demand
    in designing phase
- web-interface: new documentation section. currently used for
  - how hardware buttons work
  - about SNR/RSSI path encoding concept

And I revert the hack for github compiled version download: I tried to rename
firmware.bin to fimware.raw, but filename.bin is not the cause of githubs
web 404 error message.

Signed-off-by: Thomas Osterried <dl9sau@darc.de>
---
 .github/workflows/main.yml    | 14 +++++-----
 data_embed/index.html         | 48 +++++++++++++++++++++++++++++------
 src/TTGO_T-Beam_LoRa_APRS.ino | 12 +++++----
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 02dd343..52394f4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,7 +68,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./.pio/build/ttgo-t-beam-v1.0/firmware.bin
-          asset_name: ttgo-t-beam-v1.0-${{ steps.date.outputs.date }}.raw
+          asset_name: ttgo-t-beam-v1.0-${{ steps.date.outputs.date }}.bin
           asset_content_type: application/octet-stream
 
       - name: Upload ttgo-t-beam-v0.7.bin
@@ -79,7 +79,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./.pio/build/ttgo-t-beam-v0.7/firmware.bin
-          asset_name: ttgo-t-beam-v0.7-${{ steps.date.outputs.date }}.raw
+          asset_name: ttgo-t-beam-v0.7-${{ steps.date.outputs.date }}.bin
           asset_content_type: application/octet-stream
 
       - name: Upload ttgo-lora32-v2.1.bin
@@ -90,7 +90,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./.pio/build/ttgo-lora32-v2.1/firmware.bin
-          asset_name: ttgo-lora32-v2.1-${{ steps.date.outputs.date }}.raw
+          asset_name: ttgo-lora32-v2.1-${{ steps.date.outputs.date }}.bin
           asset_content_type: application/octet-stream
 
       - name: Upload ttgo-lora32-v2.bin
@@ -101,7 +101,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./.pio/build/ttgo-lora32-v2/firmware.bin
-          asset_name: ttgo-lora32-v2-${{ steps.date.outputs.date }}.raw
+          asset_name: ttgo-lora32-v2-${{ steps.date.outputs.date }}.bin
           asset_content_type: application/octet-stream
 
       - name: Upload ttgo-lora32-v1.bin
@@ -112,7 +112,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./.pio/build/ttgo-lora32-v1/firmware.bin
-          asset_name: ttgo-lora32-v1-${{ steps.date.outputs.date }}.raw
+          asset_name: ttgo-lora32-v1-${{ steps.date.outputs.date }}.bin
           asset_content_type: application/octet-stream
 
       - name: Upload Heltec-WiFi-v1.bin
@@ -123,7 +123,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./.pio/build/Heltec-WiFi-v1/firmware.bin
-          asset_name: Heltec-WiFi-v1-${{ steps.date.outputs.date }}.raw
+          asset_name: Heltec-WiFi-v1-${{ steps.date.outputs.date }}.bin
           asset_content_type: application/octet-stream
 
       - name: Upload Heltec-WiFi-v2.bin
@@ -134,6 +134,6 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./.pio/build/Heltec-WiFi-v2/firmware.bin
-          asset_name: Heltec-WiFi-v2-${{ steps.date.outputs.date }}.raw
+          asset_name: Heltec-WiFi-v2-${{ steps.date.outputs.date }}.bin
           asset_content_type: application/octet-stream
 
diff --git a/data_embed/index.html b/data_embed/index.html
index 4479371..7c2f060 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -116,13 +116,7 @@
                     </div>
                 </div>
                 <div class="grid-container halves">
-                    Info for SNR/RSSI:<br/>
-                    Still testing, if it behaves good to our network.<br/>
-                    If enabled, add SNR and RSSI in path on receiption, prefixed with 'Q'. Examples:<br/>
-                    SNR  23 RSSI  -73 -> Q2373<br/>
-                    SNR -03 RSSI -104 -> QA3K4<br/>
-                    SNR -13 RSSI -114 -> QB3L4<br/>.
-		    Use with care; resulting longer path consumes a bit more airtime.
+                    More info for SNR/RSSI path encoding see documentation section below
                     <div>
                         <label for="snraprsis">SNR/RSSI-encoding on kiss: compatible to APRS-IS?</label>
                         <input name="snraprsis" id="snraprsis" type="checkbox" value=1 title="Add snr+rssi at last digipeater, without digipeated flag. Use this for APRSIS connections. If you have connected a digipeater software to kiss, this option has to be switched off">
@@ -323,7 +317,7 @@
                 </div>
                 <div class="grid-container halves">
                     <div>
-                        <label for="lora_dig_x_m">Digipeat heard stations on which frequencies</label>
+                        <label for="lora_dig_x_m">Digipeat heard stations from MAIN frequency to which frequencies</label>
                         (If LoRa Repeater Mode has not been set to off)
                         <select id="lora_dig_x_m" name="lora_dig_x_m">
                             <option value="0">Repeat only to main frequency (default)</option>
@@ -504,6 +498,44 @@
             </div>
         </article>
     </section>
+    <section>
+        <div class="grid-container full">
+            <h2 class="u-full-width">Documentation</h2>
+        </div>
+        <article>
+            <div class="grid-container full">
+              <h5 class="u-full-width">Info for SNR/RSSI path encoding</h5>
+            </div>
+            <div>If enabled, add SNR and RSSI in path on receiption, prefixed with 'Q'. Examples:<br/>
+                 SNR  23 RSSI  -73 -> Q2373<br/>
+                 SNR -03 RSSI -104 -> QA3K4<br/>
+                 SNR -13 RSSI -114 -> QB3L4<br/>
+                 Still testing, if it behaves good to our network.<br/>
+                 Use with care; resulting longer path consumes a bit more airtime.
+            </div>
+            <div class="grid-container full">
+              <h5 class="u-full-width">User key functions (hardware buttons):</h5>
+            </div>
+            <div>
+               <h6 class="u-full-width">short press</h6>
+               If OLED is enabled and OLED is OFF:<br/>
+               <ul>
+                 <li>a short press will wake it up and show current data (as "Display Timeout" seconds</li>
+               </ul>
+               If OLED is disabled or OLED is ON:<br>
+               <ul>
+                    <li>with GPS-FIX immediate sending of a frame with the position from the GPS</li>
+                    <li>without GPS-FIX, immediate sending of the frame with the position saved in the configuration</li>
+               </ul>
+               <h6 class="u-full-width">long press</h6>
+               <ul>
+                   <li>toggle on or off GPS power supply</li>
+                   <li>if the "FIXED_BEACON_EN" option is enabled in the configuration, a beacon will be sent every set time interval</li>
+                   <li>while booting: reset to factory default</li>
+                </ul>
+            </div>
+        </article>
+    </section>
 </div>
 <footer>
     <center><b>Contributors in order of appearance:</b><br> OE1ACM, OE3CJB, SQ9MDD, SQ5RWU, DJ1AN, M0IGA, SQ5WPR, DO2JMG, SP6VWX, SQ2WB, IU2FRL, DO3BOX, DL9SAU</center>
diff --git a/src/TTGO_T-Beam_LoRa_APRS.ino b/src/TTGO_T-Beam_LoRa_APRS.ino
index 4782c11..c474663 100644
--- a/src/TTGO_T-Beam_LoRa_APRS.ino
+++ b/src/TTGO_T-Beam_LoRa_APRS.ino
@@ -1316,15 +1316,17 @@ void setup(){
   batt_read();
   writedisplaytext("LoRa-APRS","","Init:","ADC OK!","BAT: "+String(BattVolts,2),"");
   
-  lora_speed_rx_curr = lora_speed;
+  // if we are fill-in or wide2 digi, we listen only on configured main frequency
+  lora_speed_rx_curr = (rx_on_frequencies  != 2 || lora_digipeating_mode > 1) ? lora_speed : lora_speed_cross_digi;
   lora_set_speed(lora_speed_rx_curr);
   Serial.printf("LoRa Speed:\t%lu\n", lora_speed_rx_curr);
   
-  lora_freq_rx_curr = lora_freq;
+  lora_freq_rx_curr = (rx_on_frequencies  != 2 || lora_digipeating_mode > 1) ? lora_freq : lora_freq_cross_digi;
   rf95.setFrequency(lora_freq_rx_curr);
   Serial.printf("LoRa FREQ:\t%f\n", lora_freq_rx_curr);
 
-  rf95.setTxPower((rx_on_frequencies != 2 || lora_digipeating_mode < 2) ? txPower : txPower_cross_digi);
+  // we tx on main and/or secondary frequency. For tx, loraSend is called (and always has desired txpower as argument)
+  rf95.setTxPower((lora_digipeating_mode < 2 || lora_cross_digipeating_mode < 1) ? txPower : txPower_cross_digi);
   delay(250);
   #ifdef KISS_PROTOCOL
     xTaskCreatePinnedToCore(taskTNC, "taskTNC", 10000, nullptr, 1, nullptr, xPortGetCoreID());
@@ -2313,8 +2315,8 @@ out:
 	sendToTNC(s ? String(s) : loraReceivedFrameString);
         #endif
 
-	// Are we configured as lora digi?
-	if (lora_tx_enabled && lora_digipeating_mode > 0 && !our_packet && !blacklisted) {
+	// Are we configured as lora digi? Are we listening on the main frequency?
+	if (lora_tx_enabled && lora_digipeating_mode > 0 && !our_packet && !blacklisted && lora_freq_rx_curr == lora_freq) {
 	  uint32_t time_lora_TXBUFF_for_digipeating_was_filled_prev = time_lora_TXBUFF_for_digipeating_was_filled;
 	  if (((lora_add_snr_rssi_to_path & FLAG_ADD_SNR_RSSI_FOR_RF) || user_demands_trace > 1) ||
 	         (!digipeatedflag && ((lora_add_snr_rssi_to_path & FLAG_ADD_SNR_RSSI_FOR_RF__ONLY_IF_HEARD_DIRECT) || user_demands_trace == 1)) )