Merge branch 'thetechprepper:release/r5' into release/r5

overlay/etc/skel/.local/share/emcomm-tools/voacap/et-voacap.sh

@@ -2,7 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 23 May 2023
-# Updated : 24 August 2025
+# Updated : 27 August 2025
 # Purpose : Offline HF prediction using voacapl
 set -e
 set -o pipefail
@@ -17,6 +17,17 @@ lookup_station() {
   local json_file="$3"
 
   case "$type" in
+    gps)
+      curl -f -s "http://localhost:1981/api/geo/position" | jq .position > "$json_file"
+      if [[ $? -ne 0 ]]; then
+        echo -e "${RED}Can't determine your position for use as the transmitting station.${NC}" >&2
+        echo "Try specifying your callsign, grid or lat,lon." >&2
+        echo "  --tx-call CALLSIGN        Transmitting station callsign" >&2
+        echo "  --tx-grid GRID            Transmitting station Maidenhead grid" >&2
+        echo "  --tx-latlon LAT,LON       Transmitting station coordinates in decimal degrees" >&2
+        return 1
+      fi
+      ;;
     call)
       curl -f -s "http://localhost:1981/api/license?callsign=${value}" > "$json_file"
       if [[ $? -ne 0 ]]; then
@@ -128,9 +139,12 @@ usage() {
   echo "  --rx-grid GRID            Receiving station Maidenhead grid"
   echo "  --rx-latlon LAT,LON       Receiving station coordinates in decimal degrees"
   echo
-  echo "Other options:"
+  echo "If no --tx option is specified, your position will be pulled from a supported"
+  echo "ETC GPS unit or fallback to the grid square configured by 'et-user'."
+  echo 
+  echo "Other options (required):"
   echo "  -p POWER                  Output power [5|20|100|500|1500]"
-  echo "  -m MODE                   Mode [AM|CW|JS8|SSB]"
+  echo "  -m MODE                   Mode [am|cw|js8|ssb]"
   echo
 
   exit 1
@@ -158,8 +172,13 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+# Use local ETC user position if TX station not defined
+if [[ -z $tx_type ]]; then
+   tx_type="gps"
+fi
+
 # Validate required args
-[[ -z $tx_type || -z $rx_type || -z $power || -z $mode ]] && usage
+[[ -z $rx_type || -z $power || -z $mode ]] && usage
 
 #echo "TX ($tx_type): $tx_value"
 #echo "RX ($rx_type): $rx_value"
@@ -169,8 +188,18 @@ done
 # Allow for case-insensitve match of the user-defined operating mode
 MODE=$mode
 case "${MODE,,}" in
+  js8-slow)
+    MD="10.0"
+    ;;
   js8)
-    MD="13.0"
+    # normal speed
+    MD="14.0"
+    ;;
+  js8-fast)
+    MD="19.0"
+    ;;
+  js8-turbo)
+    MD="24.0"
     ;;
   cw)
     MD="24.0"

overlay/opt/emcomm-tools/bin/et-mbtileserver

@@ -2,6 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 5 July 2025
+# Updated : 1 September 2025
 # Purpose : Wrapper script for starting the raster tile server
 #
 # Preconditions:
@@ -9,7 +10,7 @@
 #
 # Postconditions:
 # 1. mbtileserver is started
-# 2. Tile server available at http://localhost:8000/services
+# 2. Tile server available at http://localhost:1982/services
 
 TILESERVER_HOME="${HOME}/.local/share/emcomm-tools/mbtileserver"
 TILESERVER_TILE_DIR="${TILESERVER_HOME}/tilesets"
@@ -18,7 +19,7 @@ start() {
   CWD_DIR=$(pwd)
 
   cd ${TILESERVER_HOME}
-  CMD="mbtileserver"
+  CMD="mbtileserver --port 1982"
   et-log "Starting raster tile server in ${TILESERVER_HOME} with: ${CMD}"
 
   ${CMD}

scripts/install-et-aircraft.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Author  : Gaston Gonzalez
 # Date    : 9 July 2025
-# Updated : 20 August 2025
+# Updated : 1 September 2025
 # Purpose : Install et-aircraft-app
 set -e
 trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
@@ -11,7 +11,7 @@ trap 'et-log "\"${last_command}\" command failed with exit code $?."' ERR
 . ../overlay/opt/emcomm-tools/bin/et-common
 
 APP=et-aircraft-app
-VERSION=1.0.0
+VERSION=1.0.1
 DOWNLOAD_FILE="${APP}_${VERSION}_amd64.deb"
 
 et-log "Installing ${APP} ${VERSION}..."