diff --git a/aprsd/conf/common.py b/aprsd/conf/common.py
index 2bd64c3..3c670c9 100644
--- a/aprsd/conf/common.py
+++ b/aprsd/conf/common.py
@@ -105,6 +105,11 @@ aprsd_opts = [
"'multiline' will use multiple lines for each packet and is the traditional format."
"both will log both compact and multiline.",
),
+ cfg.IntOpt(
+ "default_packet_send_count",
+ default=3,
+ help="The number of times to send a non ack packet before giving up.",
+ ),
cfg.IntOpt(
"default_ack_send_count",
default=3,
diff --git a/aprsd/packets/log.py b/aprsd/packets/log.py
index ff4704a..9951331 100644
--- a/aprsd/packets/log.py
+++ b/aprsd/packets/log.py
@@ -22,15 +22,22 @@ def log_multiline(packet, tx: Optional[bool] = False, header: Optional[bool] = T
"""LOG a packet to the logfile."""
if CONF.log_packet_format == "compact":
return
+
# asdict(packet)
logit = ["\n"]
name = packet.__class__.__name__
+
+ if isinstance(packet, AckPacket):
+ pkt_max_send_count = CONF.default_ack_send_count
+ else:
+ pkt_max_send_count = CONF.default_packet_send_count
+
if header:
if tx:
header_str = f"<{TX_COLOR}>TX{TX_COLOR}>"
logit.append(
f"{header_str}________(<{PACKET_COLOR}>{name}{PACKET_COLOR}> "
- f"TX:{packet.send_count + 1} of {packet.retry_count})",
+ f"TX:{packet.send_count + 1} of {pkt_max_send_count}",
)
else:
header_str = f"<{RX_COLOR}>RX{RX_COLOR}>"
@@ -78,6 +85,10 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
logit = []
name = packet.__class__.__name__
+ if isinstance(packet, AckPacket):
+ pkt_max_send_count = CONF.default_ack_send_count
+ else:
+ pkt_max_send_count = CONF.default_packet_send_count
if header:
if tx:
@@ -87,7 +98,7 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
f"TX {arrow} "
f"{name}"
f":{packet.msgNo}"
- f" ({packet.send_count + 1} of {packet.retry_count})",
+ f" ({packet.send_count + 1} of {pkt_max_send_count})",
)
else:
via_color = "fg #828282"