Merge branch 'main' into maint-3.10

Author: daniestevez

.github/workflows/build-ubuntu.yml

@@ -12,5 +12,5 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-      - uses: daniestevez/gr-satellites-ci-action@v2.0.6
+      - uses: actions/checkout@v4
+      - uses: daniestevez/gr-satellites-ci-action@v2.1.0

.github/workflows/clang-format-lint.yml

@@ -7,10 +7,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
-    - uses: gnuradio/clang-format[email protected]
-      with:
-        source: '.'
-        extensions: 'h,hpp,cpp,cc'
+    - uses: actions/checkout@v4
+    - name: Run clang-format
+      run: |
+        find . -name '*.cpp' -o -name '*.hpp' -o -name '*.h' -o -name '*.cc' -o -name '*.c' | \
+        xargs -exec clang-format -Werror --dry-run

.github/workflows/pycodestyle.yml

@@ -1,6 +1,5 @@
 name: pycodestyle
 
-# Controls when the action will run. 
 on:
   push:
   pull_request:
@@ -9,9 +8,9 @@ on:
 jobs:
   pycodestyle:
     runs-on: ubuntu-latest
-
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - uses: daniestevez/[email protected]
+      - uses: actions/checkout@v4
+      - name: Install pycodestyle
+        run: pip install pycodestyle
+      - name: Run pycodestyle
+        run: pycodestyle . --exclude python/ccsds,docs,tools,tests,examples,python/bindings

CHANGELOG.md

@@ -6,6 +6,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [5.7.0], [4.14.0], [3.21.0] - 2025-02-10
+
+### Added
+- Check Hex String block
+- OpenLST deframer
+- Repeater address matching to Check AX.25 Address block
+- Support for AEPEX
+- Support for ARTICSAT-1
+- Support for ASRTU-1
+- Support for BINAR-2, -3, and -4
+- Support for Bluebird-01 to -05
+- Support for COLIBRI-S
+- Support for DORA
+- Support for HADES-R
+- Support for HORIZON
+- Support for HYPERVIEW-1G
+- Support for MORDOVIA-IOT
+- Support for RTU-MIREA1
+- Support for RUZAEVKA-390
+- Support for TUSUR-GO
+- Support for VIZARD-ION
+- Support for ZIMSAT-2
+- TM KISS transport
+- Vector stream IO Reed-Solomon encoder block
+
+## Fixed
+- Error when opening Doppler file fails in Doppler correction block
+
+## Changed
+- Added frame length parameter to GEOSCAN deframer
+- Replaced erminaz_ssdv and jy1sat_ssdv by generic gr_satellites_ssdv script
+
 ## [5.6.0], [4.13.0], [3.20.0] - 2024-09-03
 
 ### Added
@@ -767,15 +799,17 @@ Large refactor release bringing new functionality and improvements. This is an o
 ## [1.0.0] - 2018-08-02
 First gr-satellites release using semantic versioning
 
-[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v5.6.0...main
-[5.5.0]: https://github.com/daniestevez/gr-satellites/compare/v5.5.0...v5.6.0
+[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v5.7.0...main
+[5.7.0]: https://github.com/daniestevez/gr-satellites/compare/v5.6.0...v5.7.0
+[5.6.0]: https://github.com/daniestevez/gr-satellites/compare/v5.5.0...v5.6.0
 [5.5.0]: https://github.com/daniestevez/gr-satellites/compare/v5.4.0...v5.5.0
 [5.4.0]: https://github.com/daniestevez/gr-satellites/compare/v5.3.0...v5.4.0
 [5.3.0]: https://github.com/daniestevez/gr-satellites/compare/v5.2.0...v5.3.0
 [5.2.0]: https://github.com/daniestevez/gr-satellites/compare/v5.1.1...v5.2.0
 [5.1.1]: https://github.com/daniestevez/gr-satellites/compare/v5.1.0...v5.1.1
 [5.1.0]: https://github.com/daniestevez/gr-satellites/compare/v5.0.0...v5.1.0
 [5.0.0]: https://github.com/daniestevez/gr-satellites/compare/v4.6.0...v5.0.0
+[4.14.0]: https://github.com/daniestevez/gr-satellites/compare/v4.13.0...v4.14.0
 [4.13.0]: https://github.com/daniestevez/gr-satellites/compare/v4.12.0...v4.13.0
 [4.12.0]: https://github.com/daniestevez/gr-satellites/compare/v4.11.0...v4.12.0
 [4.11.0]: https://github.com/daniestevez/gr-satellites/compare/v4.10.0...v4.11.0
@@ -793,6 +827,7 @@ First gr-satellites release using semantic versioning
 [4.1.0]: https://github.com/daniestevez/gr-satellites/compare/v4.0.0...v4.1.0
 [4.0.0]: https://github.com/daniestevez/gr-satellites/compare/v4.0.0-rc1...v4.0.0
 [4.0.0-rc1]: https://github.com/daniestevez/gr-satellites/compare/v3.7.0...v4.0.0-rc1
+[3.21.0]: https://github.com/daniestevez/gr-satellites/compare/v3.20.0...v3.21.0
 [3.20.0]: https://github.com/daniestevez/gr-satellites/compare/v3.19.0...v3.20.0
 [3.19.0]: https://github.com/daniestevez/gr-satellites/compare/v3.18.0...v3.19.0
 [3.18.0]: https://github.com/daniestevez/gr-satellites/compare/v3.17.0...v3.18.0

CMakeLists.txt

@@ -43,7 +43,7 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 # Set the version information here
 set(VERSION_MAJOR 5)
-set(VERSION_API 6)
+set(VERSION_API 7)
 set(VERSION_ABI 0)
 set(VERSION_PATCH 0)
 

README.md

@@ -98,17 +98,6 @@ channels such as email. Please understand this when asking for support.
 Take a look [here](https://github.com/daniestevez/gr-satellites/discussions/304) to
 check whether a new topic fits better in the issues page or in the discussions page.
 
-## Known problems
-
-The AVX2 Viterbi decoder in [Volk](https://github.com/gnuradio/volk) versions
-earlier than 1.5.0 is broken (the decoder
-[was disabled in Volk 1.5.0](https://github.com/gnuradio/volk/commit/61497d115aead301850453d418415f5ad346ee25)).
-If using an older version of Volk on a machine that supports AVX2, the
-gr-satellites decoders for the satellites that use convolutional coding will not
-work. To solve this, the AVX2 kernel should be disabled in `~/.volk/volk_config` or by using
-the `VOLK_GENERIC=1` environment variable. See
-[issue #217](https://github.com/daniestevez/gr-satellites/issues/217)).
-
 ## Satellite teams
 
 Satellite teams interested in using gr-satellites for your groundstation

apps/CMakeLists.txt

@@ -23,8 +23,7 @@ include(GrPython)
 GR_PYTHON_INSTALL(
     PROGRAMS
     gr_satellites
-    erminaz_ssdv
-    jy1sat_ssdv
+    gr_satellites_ssdv
     smog_p_spectrum
     DESTINATION bin
 )

apps/erminaz_ssdv

@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Copyright 2019-2020, 2024 Daniel Estevez <[email protected]>
+#
+# This file is part of gr-satellites
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+import argparse
+from enum import Enum
+import struct
+import subprocess
+import sys
+
+import numpy as np
+
+from satellites.kiss import *
+from satellites.telemetry.by02 import TMPrimaryHeader as TMPrimaryHeaderShort
+from satellites.telemetry.erminaz import TMPrimaryHeader
+
+
+class Satellite(Enum):
+    JY1SAT = 'JY1SAT'
+    ERMINAZ = 'ERMINAZ'
+    DSLWP = 'DSLWP'
+
+    def __str__(self):
+        return self.value
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        '--satellite', type=Satellite, choices=list(Satellite),
+        help='Satellite')
+    parser.add_argument('input', help='Input KISS file')
+    parser.add_argument(
+        'output',
+        help='Output filenames (start of filenames)')
+    return parser.parse_args()
+
+
+def seqnum(packet, satellite):
+    offsets = {
+        Satellite.JY1SAT: 3,
+        Satellite.ERMINAZ: 8,
+        Satellite.DSLWP: 1,
+    }
+    off = offsets[satellite]
+    return struct.unpack('>H', packet[off:off+2])[0]
+
+
+def read_kiss_file(path, framesize=None):
+    frames = list()
+    frame = list()
+    transpose = False
+    with open(path, 'rb') as f:
+        for c in f.read():
+            if c == FEND:
+                if ((framesize is None or len(frame) == framesize + 1)
+                    and len(frame) > 1
+                    and (frame[0] & 0x0f) == 0):
+                    frames.append(frame[1:])
+                frame = list()
+            elif transpose:
+                if c == TFEND:
+                    frame.append(FEND)
+                elif c == TFESC:
+                    frame.append(FESC)
+                transpose = False
+            elif c == FESC:
+                transpose = True
+            else:
+                frame.append(c)
+    return np.array(frames, dtype='uint8')
+
+
+def main():
+    args = parse_args()
+
+    # Read frames
+    framesizes = {Satellite.JY1SAT: 256}
+    framesize = framesizes.get(args.satellite)
+    x = read_kiss_file(args.input, framesize)
+
+    if args.satellite == Satellite.JY1SAT:
+        # Filter out by frame id and trim to payload
+        x = x[((x[:, 0] == 0xe0) | (x[:, 0] == 0xe1)) & (x[:, 1] == 0x10), 56:]
+
+        # Filter SSDV packets
+        x = x[(x[:, 0] == 0x55) & (x[:, 1] == 0x68), :]
+    elif args.satellite == Satellite.ERMINAZ:
+        vcid = 4
+        headers = [TMPrimaryHeader.parse(y) for y in x]
+        x = np.array([y for h, y in zip(headers, x)
+                      if h.virtual_channel_id == vcid])
+        x = x[:, TMPrimaryHeader.sizeof() + 2:]
+    elif args.satellite == Satellite.DSLWP:
+        vcid = 1
+        headers = [TMPrimaryHeaderShort.parse(y) for y in x]
+        x = np.array([y for h, y in zip(headers, x)
+                      if h.virtual_channel_id == vcid])
+        x = x[:, TMPrimaryHeaderShort.sizeof():]
+
+    if x.size == 0:
+        # there are no SSDV packets
+        return
+
+    id_idxs = {
+        Satellite.JY1SAT: 2,
+        Satellite.ERMINAZ: 6,
+        Satellite.DSLWP: 0,
+    }
+    id_idx = id_idxs[args.satellite]
+    ids = set(x[:, id_idx])
+
+    decoder_args = {
+        Satellite.JY1SAT: ['-J'],
+        Satellite.ERMINAZ: ['-l', str(x.shape[1])],
+        Satellite.DSLWP: ['-D'],
+    }[args.satellite]
+    for i in ids:
+        L = list(x[x[:, id_idx] == i, :])
+        L.sort(key=lambda x: seqnum(x, satellite=args.satellite))
+        ssdv = '{}_{}.ssdv'.format(args.output, i)
+        jpeg = '{}_{}.jpg'.format(args.output, i)
+        np.array(L).tofile(ssdv)
+        print('Calling SSDV decoder for image {}'.format(hex(i)))
+        subprocess.call(['ssdv', '-d'] + decoder_args + [ssdv, jpeg])
+        print()
+
+
+if __name__ == '__main__':
+    main()