From aa6cd9782ccd26216e6ffce42dcd8f61ca38eee5 Mon Sep 17 00:00:00 2001 From: Max Johenneken <5088045+mjohenneken@users.noreply.github.com> Date: Tue, 1 Apr 2025 17:45:44 +0200 Subject: [PATCH 1/2] Link: Correct dataratelogging format --- MAVProxy/modules/mavproxy_link.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAVProxy/modules/mavproxy_link.py b/MAVProxy/modules/mavproxy_link.py index 29ced341d1..dd9eaf8f46 100644 --- a/MAVProxy/modules/mavproxy_link.py +++ b/MAVProxy/modules/mavproxy_link.py @@ -171,7 +171,7 @@ def idle_task(self): str(self.status.counters['MasterIn'][master.linknum]) + "," + str(self.status.bytecounters['MasterIn'][master.linknum].total()) + "," + str(linkdelay) + "," + - str(100 * round(master.packet_loss(), 3)) + "\n") + str(round(master.packet_loss(), 3)) + "\n") # update outstanding TimeSyncRequest objects. Reap any which # are past their use-by date: From a7b200b5407ea1cac81838e9bf017439b3fcadd7 Mon Sep 17 00:00:00 2001 From: Max Johenneken <5088045+mjohenneken@users.noreply.github.com> Date: Thu, 18 Sep 2025 13:15:49 +0000 Subject: [PATCH 2/2] Make Sending NMEA GGA Message configurable --- MAVProxy/modules/lib/ntrip.py | 4 ++++ MAVProxy/modules/mavproxy_ntrip.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MAVProxy/modules/lib/ntrip.py b/MAVProxy/modules/lib/ntrip.py index 66586c8cc8..6653b5e6fb 100755 --- a/MAVProxy/modules/lib/ntrip.py +++ b/MAVProxy/modules/lib/ntrip.py @@ -42,6 +42,7 @@ def __init__(self, height=1212, ssl=False, V2=False, + sendgga=True, ): if sys.version_info.major >= 3: user = bytearray(user, 'ascii') @@ -248,6 +249,9 @@ def readLoop(self): print("got: ", len(data)) def send_gga(self): + if not self.send_gga: + return + gga = self.getGGAByteString() try: diff --git a/MAVProxy/modules/mavproxy_ntrip.py b/MAVProxy/modules/mavproxy_ntrip.py index cee5148874..3c8b168a8e 100644 --- a/MAVProxy/modules/mavproxy_ntrip.py +++ b/MAVProxy/modules/mavproxy_ntrip.py @@ -23,7 +23,8 @@ def __init__(self, mpstate): ('logfile', str, None), ('sendalllinks', bool, False), ('frag_drop_pct', float, 0), - ('sendmul', int, 1)]) + ('sendmul', int, 1), + ('sendgga', bool, True)]) self.add_command('ntrip', self.cmd_ntrip, 'NTRIP control', ["", "", @@ -179,7 +180,8 @@ def cmd_start(self): mountpoint=self.ntrip_settings.mountpoint, lat=self.pos[0], lon=self.pos[1], - height=self.pos[2]) + height=self.pos[2], + sendgga=self.ntrip_settings.sendgga) print("NTRIP started") self.start_pending = False self.last_rate = time.time()