hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-08-03 05:52:26 -04:00
Code Issues Projects Releases Wiki Activity

Added packet log distance and new arrows

Browse Source 
this patch adds unicode arrows during logging of packet arrows
(tx/rx) and adds distance for GPSPackets
This commit is contained in:
Hemna 2024-10-17 17:06:28 -04:00
parent 5e9f92dfa6
commit 3e9bf2422a
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
aprsd/packets/log.py
View File

@ -1,10 +1,12 @@
import logging import logging
from typing import Optional from typing import Optional
from geopy.distance import geodesic
from loguru import logger from loguru import logger
from oslo_config import cfg from oslo_config import cfg
from aprsd.packets.core import AckPacket, RejectPacket from aprsd import utils
from aprsd.packets.core import AckPacket, GPSPacket, RejectPacket
LOG = logging.getLogger() LOG = logging.getLogger()
@ -16,6 +18,8 @@ TO_COLOR = "fg #D033FF"
TX_COLOR = "red" TX_COLOR = "red"
RX_COLOR = "green" RX_COLOR = "green"
PACKET_COLOR = "cyan" PACKET_COLOR = "cyan"
DISTANCE_COLOR = "fg #FF5733"
DEGREES_COLOR = "fg #FFA900"
def log_multiline(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> None: def log_multiline(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> None:
@ -97,19 +101,21 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
if header: if header:
if tx: if tx:
via_color = "red" via_color = "red"
arrow = f"<{via_color}>-></{via_color}>" # arrow = f"<{via_color}>-></{via_color}>"
arrow = f"<{via_color}>\u2192</{via_color}>"
logit.append( logit.append(
f"<red>TX {arrow}</red> " f"<red>TX\u2191</red> "
f"<cyan>{name}</cyan>" f"<cyan>{name}</cyan>"
f":{packet.msgNo}" f":{packet.msgNo}"
f" ({packet.send_count + 1} of {pkt_max_send_count})", f" ({packet.send_count + 1} of {pkt_max_send_count})",
) )
else: else:
via_color = "fg #828282" via_color = "fg #1AA730"
arrow = f"<{via_color}>-></{via_color}>" #arrow = f"<{via_color}>-></{via_color}>"
left_arrow = f"<{via_color}><-</{via_color}>" arrow = f"<{via_color}>\u2192</{via_color}>"
f"<{via_color}><-</{via_color}>"
logit.append( logit.append(
f"<fg #1AA730>RX</fg #1AA730> {left_arrow} " f"<fg #1AA730>RX\u2193</fg #1AA730> "
f"<cyan>{name}</cyan>" f"<cyan>{name}</cyan>"
f":{packet.msgNo}", f":{packet.msgNo}",
) )
@ -139,5 +145,19 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
msg = msg.replace("<", "\\<") msg = msg.replace("<", "\\<")
logit.append(f"<light-yellow><b>{msg}</b></light-yellow>") logit.append(f"<light-yellow><b>{msg}</b></light-yellow>")
# is there distance information?
if isinstance(packet, GPSPacket) and CONF.latitude and CONF.longitude:
my_coords = (CONF.latitude, CONF.longitude)
packet_coords = (packet.latitude, packet.longitude)
try:
bearing = utils.calculate_initial_compass_bearing(my_coords, packet_coords)
except Exception as e:
LOG.error(f"Failed to calculate bearing: {e}")
bearing = 0
logit.append(
f" : <{DEGREES_COLOR}>{utils.degrees_to_cardinal(bearing, full_string=True)}</{DEGREES_COLOR}>"
f"<{DISTANCE_COLOR}>@{geodesic(my_coords, packet_coords).miles:.2f}miles</{DISTANCE_COLOR}>",
)
LOGU.opt(colors=True).info(" ".join(logit)) LOGU.opt(colors=True).info(" ".join(logit))
log_multiline(packet, tx, header) log_multiline(packet, tx, header)