From 265c58b9fff4017ef924f4d16f81a0df4f022f65 Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Sun, 12 Oct 2025 10:32:12 -0500 Subject: [PATCH] Fix aprs-is variables --- lib/aprsme/aprs_is_connection.ex | 10 +++++----- lib/aprsme/is/is.ex | 16 ++++++++-------- lib/aprsme_web/live/map_live/rf_path.ex | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/aprsme/aprs_is_connection.ex b/lib/aprsme/aprs_is_connection.ex index b998d94..cf1067b 100644 --- a/lib/aprsme/aprs_is_connection.ex +++ b/lib/aprsme/aprs_is_connection.ex @@ -157,11 +157,11 @@ defmodule Aprsme.AprsIsConnection do end defp connect_aprs_is do - host = Application.get_env(:aprsme, :aprsme_is_host, ~c"rotate.aprs2.net") - port = Application.get_env(:aprsme, :aprsme_is_port, 14_580) - callsign = Application.get_env(:aprsme, :aprsme_is_callsign, "N0CALL") - passcode = Application.get_env(:aprsme, :aprsme_is_passcode, "00000") - filter = Application.get_env(:aprsme, :aprsme_is_filter, "") + host = Application.get_env(:aprsme, :aprs_is_server, ~c"rotate.aprs2.net") + port = Application.get_env(:aprsme, :aprs_is_port, 14_580) + callsign = Application.get_env(:aprsme, :aprs_is_login_id, "N0CALL") + passcode = Application.get_env(:aprsme, :aprs_is_password, "00000") + filter = Application.get_env(:aprsme, :aprs_is_default_filter, "") # Add timeout to prevent indefinite hanging opts = [:binary, active: true, packet: :line, keepalive: true, send_timeout: 5000] diff --git a/lib/aprsme/is/is.ex b/lib/aprsme/is/is.ex index 8785913..319fa9d 100644 --- a/lib/aprsme/is/is.ex +++ b/lib/aprsme/is/is.ex @@ -121,8 +121,8 @@ defmodule Aprsme.Is do case Process.whereis(__MODULE__) do nil -> # GenServer is not running (disconnected) - server = Application.get_env(:aprsme, :aprsme_is_server, nil) - port = Application.get_env(:aprsme, :aprsme_is_port, 14_580) + server = Application.get_env(:aprsme, :aprs_is_server, nil) + port = Application.get_env(:aprsme, :aprs_is_port, 14_580) %{ connected: false, @@ -130,8 +130,8 @@ defmodule Aprsme.Is do port: port, connected_at: nil, uptime_seconds: 0, - login_id: Application.get_env(:aprsme, :aprsme_is_login_id, "W5ISP"), - filter: Application.get_env(:aprsme, :aprsme_is_default_filter, "r/33/-96/100"), + login_id: Application.get_env(:aprsme, :aprs_is_login_id, "W5ISP"), + filter: Application.get_env(:aprsme, :aprs_is_default_filter, "r/33/-96/100"), packet_stats: default_packet_stats(), stored_packet_count: Aprsme.Packets.get_total_packet_count(), oldest_packet_timestamp: Aprsme.Packets.get_oldest_packet_timestamp() @@ -143,8 +143,8 @@ defmodule Aprsme.Is do catch :exit, _ -> # GenServer exists but not responding - server = Application.get_env(:aprsme, :aprsme_is_server, ~c"rotate.aprs2.net") - port = Application.get_env(:aprsme, :aprsme_is_port, 14_580) + server = Application.get_env(:aprsme, :aprs_is_server, ~c"rotate.aprs2.net") + port = Application.get_env(:aprsme, :aprs_is_port, 14_580) %{ connected: false, @@ -152,8 +152,8 @@ defmodule Aprsme.Is do port: port, connected_at: nil, uptime_seconds: 0, - login_id: Application.get_env(:aprsme, :aprsme_is_login_id, "W5ISP"), - filter: Application.get_env(:aprsme, :aprsme_is_default_filter, "r/33/-96/100"), + login_id: Application.get_env(:aprsme, :aprs_is_login_id, "W5ISP"), + filter: Application.get_env(:aprsme, :aprs_is_default_filter, "r/33/-96/100"), packet_stats: default_packet_stats(), stored_packet_count: Aprsme.Packets.get_total_packet_count(), oldest_packet_timestamp: Aprsme.Packets.get_oldest_packet_timestamp() diff --git a/lib/aprsme_web/live/map_live/rf_path.ex b/lib/aprsme_web/live/map_live/rf_path.ex index b5c5337..3f90685 100644 --- a/lib/aprsme_web/live/map_live/rf_path.ex +++ b/lib/aprsme_web/live/map_live/rf_path.ex @@ -9,12 +9,12 @@ defmodule AprsmeWeb.MapLive.RfPath do @doc """ Parse RF path string to extract digipeater/igate stations. Excludes APRS-IS (Internet) paths that contain TCPIP. - + APRS-IS path indicators: - TCPIP: Packet came via Internet connection - NOGATE: Should not be gated to RF - qA*: Various APRS-IS q-constructs (qAC, qAS, qAR, etc.) - + These are not actual RF digipeaters, so we don't show path lines for them. """ @spec parse_rf_path(binary()) :: list(binary())