SatDump frm-files extend

Author: baskiton

SatsDecoder/systems/ax25.py

@@ -77,6 +77,7 @@ def get_receiver_callsign(ax25_hdr):
 class Ax25Protocol(common.Protocol):
     columns = ()
     c_width = ()
+    has_ax25 = 1
     dd = nt('Ax25Tlm', ('receiver_cs', 'sender_cs', 'control', 'pid', 'data', 'hex'))
     tlm_table = {
         'frame': {

SatsDecoder/systems/common.py

@@ -73,6 +73,7 @@ class Protocol:
     columns = ()
     c_width = ()
     tlm_table = {}
+    has_ax25 = 0
 
     def __init__(self, ir: ImageReceiver = None):
         self.ir = isinstance(ir, ImageReceiver) and ir

SatsDecoder/systems/cubebel2.py

@@ -283,6 +283,7 @@
 class Cubebel2Protocol(common.Protocol):
     columns = 'cdm_id',
     c_width = 60,
+    has_ax25 = 1
 
     _beacon = (
         ('beacon_name', 'TRX Beacon'),

SatsDecoder/systems/geoscan.py

@@ -422,6 +422,7 @@ class GeoscanProtocol(common.Protocol):
     PACKETSIZE = 64
     columns = ()
     c_width = ()
+    has_ax25 = 1
     tlm_table = {
         'geoscan_beacon': {
             'table': (

SatsDecoder/systems/roseycubesat.py

@@ -106,6 +106,7 @@ def push_data(self, data, **kw):
 class RoseyProtocol(common.Protocol):
     columns = 'msg_id',
     c_width = 60,
+    has_ax25 = 1
 
     tlm_table = {
         'message': {

SatsDecoder/systems/samsat_ion2.py

@@ -49,6 +49,7 @@
 class SamSatIon2Protocol(common.Protocol):
     columns = ()
     c_width = ()
+    has_ax25 = 1
     tlm_table = {
         'samsat_beacon': {
             'table': (

SatsDecoder/systems/sharjahsat.py

@@ -281,6 +281,7 @@ def reset(self):
 class SharjahProtocol(common.Protocol):
     columns = ()
     c_width = ()
+    has_ax25 = 1
 
     tlm_table = {
         'eser': {

SatsDecoder/systems/sonate2.py

@@ -4453,6 +4453,7 @@
 class SonateProtocol(common.Protocol):
     columns = 'APID',
     c_width = 60,
+    has_ax25 = 1
 
     tlm_table = {
         'std_hk': {

SatsDecoder/systems/usp.py

@@ -1521,6 +1521,7 @@ def push_data(self, data, **kw):
 class UspProtocol(common.Protocol):
     columns = 'msg-id',
     c_width = 60,
+    has_ax25 = 1
 
     _regular_tmpl = {
         'table': (

SatsDecoder/ui.py

@@ -752,12 +752,11 @@ def _kiss_files(self):
                 self.feed(data, t)
 
     def _satdump_files(self):
-        if self.proto not in (systems.ax25.proto_name, systems.geoscan.proto_name):
-            return
-
-        is_ax25 = self.proto == systems.ax25.proto_name
         is_geoscan = self.proto == systems.geoscan.proto_name
 
+        if not (is_geoscan or self.decoder.has_ax25):
+            return
+
         files = filedialog.askopenfilenames(filetypes=[('SatDump FRM', ['*.frm']), ('All files', '*.*')])
         if not files:
             return
@@ -772,13 +771,13 @@ def _satdump_files(self):
         for fn in files:
             with open(fn, 'rb') as f:
                 while 1:
-                    if is_ax25:
+                    if is_geoscan:
+                        f.read(4)
+                    else:
                         hdr = f.read(6)
                         if hdr[:4] != b'\x1a\xcf\xfc\x1d':
                             break
                         frm_len = hdr[4] << 8 | hdr[5]
-                    elif is_geoscan:
-                        f.read(4)
 
                     data = f.read(frm_len)
                     if len(data) < frm_len: