graham/aprs.me
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix aprs-is variables

Browse source
This commit is contained in:
Graham McIntire 2025-10-12 10:32:12 -05:00
parent 5dfd682142
commit 265c58b9ff
No known key found for this signature in database
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/aprsme/aprs_is_connection.ex
View file

@ -157,11 +157,11 @@ defmodule Aprsme.AprsIsConnection do
end end
defp connect_aprs_is do defp connect_aprs_is do
host = Application.get_env(:aprsme, :aprsme_is_host, ~c"rotate.aprs2.net") host = Application.get_env(:aprsme, :aprs_is_server, ~c"rotate.aprs2.net")
port = Application.get_env(:aprsme, :aprsme_is_port, 14_580) port = Application.get_env(:aprsme, :aprs_is_port, 14_580)
callsign = Application.get_env(:aprsme, :aprsme_is_callsign, "N0CALL") callsign = Application.get_env(:aprsme, :aprs_is_login_id, "N0CALL")
passcode = Application.get_env(:aprsme, :aprsme_is_passcode, "00000") passcode = Application.get_env(:aprsme, :aprs_is_password, "00000")
filter = Application.get_env(:aprsme, :aprsme_is_filter, "") filter = Application.get_env(:aprsme, :aprs_is_default_filter, "")
# Add timeout to prevent indefinite hanging # Add timeout to prevent indefinite hanging
opts = [:binary, active: true, packet: :line, keepalive: true, send_timeout: 5000] opts = [:binary, active: true, packet: :line, keepalive: true, send_timeout: 5000]

16
lib/aprsme/is/is.ex
View file

@ -121,8 +121,8 @@ defmodule Aprsme.Is do
case Process.whereis(__MODULE__) do case Process.whereis(__MODULE__) do
nil -> nil ->
# GenServer is not running (disconnected) # GenServer is not running (disconnected)
server = Application.get_env(:aprsme, :aprsme_is_server, nil) server = Application.get_env(:aprsme, :aprs_is_server, nil)
port = Application.get_env(:aprsme, :aprsme_is_port, 14_580) port = Application.get_env(:aprsme, :aprs_is_port, 14_580)
%{ %{
connected: false, connected: false,
@ -130,8 +130,8 @@ defmodule Aprsme.Is do
port: port, port: port,
connected_at: nil, connected_at: nil,
uptime_seconds: 0, uptime_seconds: 0,
login_id: Application.get_env(:aprsme, :aprsme_is_login_id, "W5ISP"), login_id: Application.get_env(:aprsme, :aprs_is_login_id, "W5ISP"),
filter: Application.get_env(:aprsme, :aprsme_is_default_filter, "r/33/-96/100"), filter: Application.get_env(:aprsme, :aprs_is_default_filter, "r/33/-96/100"),
packet_stats: default_packet_stats(), packet_stats: default_packet_stats(),
stored_packet_count: Aprsme.Packets.get_total_packet_count(), stored_packet_count: Aprsme.Packets.get_total_packet_count(),
oldest_packet_timestamp: Aprsme.Packets.get_oldest_packet_timestamp() oldest_packet_timestamp: Aprsme.Packets.get_oldest_packet_timestamp()
@ -143,8 +143,8 @@ defmodule Aprsme.Is do
catch catch
:exit, _ -> :exit, _ ->
# GenServer exists but not responding # GenServer exists but not responding
server = Application.get_env(:aprsme, :aprsme_is_server, ~c"rotate.aprs2.net") server = Application.get_env(:aprsme, :aprs_is_server, ~c"rotate.aprs2.net")
port = Application.get_env(:aprsme, :aprsme_is_port, 14_580) port = Application.get_env(:aprsme, :aprs_is_port, 14_580)
%{ %{
connected: false, connected: false,
@ -152,8 +152,8 @@ defmodule Aprsme.Is do
port: port, port: port,
connected_at: nil, connected_at: nil,
uptime_seconds: 0, uptime_seconds: 0,
login_id: Application.get_env(:aprsme, :aprsme_is_login_id, "W5ISP"), login_id: Application.get_env(:aprsme, :aprs_is_login_id, "W5ISP"),
filter: Application.get_env(:aprsme, :aprsme_is_default_filter, "r/33/-96/100"), filter: Application.get_env(:aprsme, :aprs_is_default_filter, "r/33/-96/100"),
packet_stats: default_packet_stats(), packet_stats: default_packet_stats(),
stored_packet_count: Aprsme.Packets.get_total_packet_count(), stored_packet_count: Aprsme.Packets.get_total_packet_count(),
oldest_packet_timestamp: Aprsme.Packets.get_oldest_packet_timestamp() oldest_packet_timestamp: Aprsme.Packets.get_oldest_packet_timestamp()

4
lib/aprsme_web/live/map_live/rf_path.ex
View file

@ -9,12 +9,12 @@ defmodule AprsmeWeb.MapLive.RfPath do
@doc """ @doc """
Parse RF path string to extract digipeater/igate stations. Parse RF path string to extract digipeater/igate stations.
Excludes APRS-IS (Internet) paths that contain TCPIP. Excludes APRS-IS (Internet) paths that contain TCPIP.
APRS-IS path indicators: APRS-IS path indicators:
- TCPIP: Packet came via Internet connection - TCPIP: Packet came via Internet connection
- NOGATE: Should not be gated to RF - NOGATE: Should not be gated to RF
- qA*: Various APRS-IS q-constructs (qAC, qAS, qAR, etc.) - 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. These are not actual RF digipeaters, so we don't show path lines for them.
""" """
@spec parse_rf_path(binary()) :: list(binary()) @spec parse_rf_path(binary()) :: list(binary())