Merge branch 'master' into maint-3.9

daniestevez · Aug 20, 2021 · 3956802 · 3956802
2 parents ba9f859 + 58b67d8
commit 3956802
Show file tree

Hide file tree

Showing 21 changed files with 270 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [4.3.0], [3.10.0] - 2021-08-20
+
+### Added
+- Support for DHABISAT
+- Support for ION SCV-003
+- Support for IT-SPINS
+- Support for JAISAT-1
+- Support for LEDSAT
+- Support for QMR-KWT
+- Support for RAMSAT
+- Support for SOAR
+- Support for TUBIN
+- Ability to change frame length in fixedlen_tagger block
+
+## [4.2.0], [3.9.0] - 2021-06-18
+
 ### Added
 - Support for CubeSX-HSE in 1k2, 2k4 and 4k8 modes
 - Support for CubeSX-Sirius-HSE in 1k2 and 2k4 modes
@@ -392,10 +408,14 @@ 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/v4.1.0...master
+[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v4.3.0...master
+[4.3.0]: https://github.com/daniestevez/gr-satellites/compare/v4.2.0...v4.3.0
+[4.2.0]: https://github.com/daniestevez/gr-satellites/compare/v4.1.0...v4.2.0
 [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.9.0]: https://github.com/daniestevez/gr-satellites/compare/v3.9.0...v3.10.0
+[3.9.0]: https://github.com/daniestevez/gr-satellites/compare/v3.8.0...v3.9.0
 [3.8.0]: https://github.com/daniestevez/gr-satellites/compare/v3.7.0...v3.8.0
 [3.7.0]: https://github.com/daniestevez/gr-satellites/compare/v3.6.0...v3.7.0
 [3.6.0]: https://github.com/daniestevez/gr-satellites/compare/v3.5.2...v3.6.0

diff --git a/CMakeLists.txt b/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 4)
-set(VERSION_API 2)
+set(VERSION_API 3)
 set(VERSION_ABI 0)
 
 cmake_policy(SET CMP0011 NEW)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+gr-satellites (3.10.0-0) groovy; urgency=medium
+
+  * Mainstream release v3.10.0
+
+ --  <daniel@destevez.net>  Fri, 20 Aug 2021 18:00:00 +0000
+
+gr-satellites (3.9.0-0) groovy; urgency=medium
+
+  * Mainstream release v3.9.0
+
+ --  <daniel@destevez.net>  Fri, 18 Jun 2021 14:05:00 +0000
+
 gr-satellites (3.8.0-0) groovy; urgency=medium
 
   * Mainstream release v3.8.0

diff --git a/docs/source/components.rst b/docs/source/components.rst
@@ -645,7 +645,7 @@ display image files in realtime using `feh`_ as they are being received.
 These receiver blocks use *FileReceiver definitions*, which are
 classes derived from ``FileReceiver``. The list of available definitions can be
 seen in ``python/filereceiver/__index__.py``, or by calling
-``import satellites.filreceiver; help(satellites.filereceiver)`` in
+``import satellites.filereceiver; help(satellites.filereceiver)`` in
 ``python3``. Classes used by the Image receiver must be derived from ``ImageReceiver``.
 
 The figure below shows an example flowgraph of the Image receiver block, which can be

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -20,13 +20,13 @@
 # -- Project information -----------------------------------------------------
 
 project = 'gr-satellites'
-copyright = '2020, Daniel Estévez'
+copyright = '2021, Daniel Estévez'
 author = 'Daniel Estévez'
 
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '4.2.0'
+release = '4.3.0'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/source/supported_satellites.rst b/docs/source/supported_satellites.rst
@@ -505,6 +505,18 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
     * **4k8 FSK downlink** (437.500 MHz): FSK modulation with AX100 ASM+Golay framing
     * **9k6 FSK downlink** (437.500 MHz): FSK modulation with AX100 ASM+Golay framing
 
+**DHABISAT**
+  Alternative names: MYSat-2
+
+  NORAD ID: 49016
+
+  Transmitters:
+
+    * **1k2 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
+    * **2k4 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
+    * **4k8 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
+    * **9k6 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
+
 **DIY-1**
   NORAD ID: 47963
 
@@ -746,6 +758,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
 
     * **1k2 FSK downlink** (435.080 MHz): FSK modulation with AX.25 framing
 
+**ION SCV-003**
+  NORAD ID: 48912
+
+  Transmitters:
+
+    * **1k2 FSK downlink** (437.515 MHz): FSK modulation with AX100 ASM+Golay framing
+
 **ION-MK01**
   Alternative names: ION mk01, ION SVC Lucas
 
@@ -771,13 +790,27 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
 
     * **9k6 FSK downlink** (437.800 MHz): FSK modulation with AX.25 G3RUH framing
 
+**IT-SPINS**
+  NORAD ID: 49017
+
+  Transmitters:
+
+    * **19k2 FSK downlink** (437.405 MHz): FSK modulation with AX.25 G3RUH framing
+
 **ITASAT 1**
   NORAD ID: 43786
 
   Transmitters:
 
     * **1k2 BPSK downlink** (145.860 MHz): BPSK modulation with AX.25 framing
 
+**JAISAT-1**
+  NORAD ID: 44419
+
+  Transmitters:
+
+    * **4k8 FSK downlink** (435.700 MHz): FSK modulation with Mobitex framing
+
 **JY1-Sat**
   Alternative names: FUNcube-6, JO-97
 
@@ -834,6 +867,14 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
 
     * **4k8 FSK downlink** (437.130 MHz): FSK modulation with AX.25 G3RUH framing
 
+**LEDSAT**
+  NORAD ID: 99670
+
+  Transmitters:
+
+    * **1k2 FSK downlink** (435.190 MHz): FSK modulation with AX100 ASM+Golay framing
+    * **9k6 FSK downlink** (435.190 MHz): FSK modulation with AX100 ASM+Golay framing
+
 **LightSail-2**
   Alternative names: WM9XPA, LightSail-B
 
@@ -928,7 +969,7 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
     * **19k2 FSK downlink** (437.250 MHz): FSK modulation with AX.25 G3RUH framing
 
 **MIR-SAT1**
-  NORAD ID: 99718
+  NORAD ID: 48868
 
   Transmitters:
 
@@ -957,7 +998,7 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
     * **1k2 BPSK downlink** (145.865 MHz): BPSK modulation with AX.25 framing
 
 **NanosatC-BR2**
-  NORAD ID: 99734
+  NORAD ID: 47950
 
   Transmitters:
 
@@ -1158,6 +1199,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
 
     * **9k6 FSK downlink** (435.800 MHz): FSK modulation with AX.25 G3RUH framing
 
+**QMR-KWT**
+  NORAD ID: 48943
+
+  Transmitters:
+
+    * **9k6 FSK downlink** (436.500 MHz): FSK modulation with AX.25 G3RUH framing
+
 **QO-100**
   Alternative names: Es'hail 2
 
@@ -1175,6 +1223,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
 
     * **4k8 FSK downlink** (437.200 MHz): FSK modulation with AX.25 G3RUH framing
 
+**RAMSAT**
+  NORAD ID: 48850
+
+  Transmitters:
+
+    * **9k6 FSK downlink** (436.300 MHz): FSK modulation with AX.25 G3RUH framing
+
 **Reaktor Hello World**
   NORAD ID: 43743
 
@@ -1333,6 +1388,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
 
     * **9k6 FSK downlink** (437.275 MHz): FSK modulation with AX.25 G3RUH framing
 
+**SOAR**
+  NORAD ID: 48851
+
+  Transmitters:
+
+    * **4k8 FSK downlink** (401.725 MHz): FSK modulation with AX100 ASM+Golay framing
+
 **SOKRAT**
   NORAD ID: 44404
 
@@ -1476,6 +1538,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
 
     * **9k6 FSK downlink** (435.450 MHz): FSK modulation with AX.25 G3RUH framing
 
+**TUBIN**
+  NORAD ID: 48900
+
+  Transmitters:
+
+    * **4k8 FSK downlink** (435.950 MHz): FSK modulation with Mobitex-NX framing
+
 **TW-1A**
   NORAD ID: 40928
 

diff --git a/grc/satellites_fixedlen_tagger.block.yml b/grc/satellites_fixedlen_tagger.block.yml
@@ -38,5 +38,7 @@ templates:
         import numpy
     make: satellites.fixedlen_tagger(${syncword_tag}, ${packetlen_tag}, ${packet_len},
         ${stream_type.t})
+    callbacks:
+    - set_packet_len(${packet_len})
 
 file_format: 1
diff --git a/python/__init__.py b/python/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright 2020 Daniel Estevez <daniel@destevez.net>
+# Copyright 2020-2021 Daniel Estevez <daniel@destevez.net>
 #
 # This file is part of gr-satellites
 #
@@ -19,9 +19,9 @@
 ad-hoc protocols used in other satellites.
 """
 
-__version__ = 'v4.2.0'
+__version__ = 'v4.3.0'
 __author__ = 'Daniel Estevez'
-__copyright__ = 'Copyright 2016-2020 Daniel Estevez'
+__copyright__ = 'Copyright 2016-2021 Daniel Estevez'
 __email__ = 'daniel@destevez.net'
 __license__ = 'GPL-3.0'
 __all__ = [

diff --git a/python/fixedlen_tagger.py b/python/fixedlen_tagger.py
@@ -36,6 +36,11 @@ def __init__(self, syncword_tag, packetlen_tag, packet_len, stream_type):
         self.written = 0
         self.really_written = 0
 
+    def set_packet_len(self, packet_len):
+        self.packet_len = packet_len
+        self.stream = collections.deque(
+            self.stream, maxlen=self.packet_len - 1)
+
     def try_to_flush(self, out):
         # Try to send as much items as we have in buffer
         len_write = min(len(self.data), len(out))

diff --git a/python/hier/sync_to_pdu_packed.py b/python/hier/sync_to_pdu_packed.py
@@ -77,6 +77,7 @@ def get_packlen(self):
 
     def set_packlen(self, packlen):
         self.packlen = packlen
+        self.satellites_fixedlen_tagger_0_0_0.set_packet_len(self.packlen)
 
     def get_sync(self):
         return self.sync

diff --git a/python/satyaml/DHABISAT.yml b/python/satyaml/DHABISAT.yml
@@ -0,0 +1,36 @@
+name: DHABISAT
+alternative_names:
+  - MYSat-2
+norad: 49016
+data:
+  &tlm Telemetry:
+    telemetry: ax25
+transmitters:
+  1k2 BPSK downlink:
+    frequency: 436.908e+6
+    modulation: BPSK
+    baudrate: 1200
+    framing: AX.25 G3RUH
+    data:
+    - *tlm
+  2k4 BPSK downlink:
+    frequency: 436.908e+6
+    modulation: BPSK
+    baudrate: 2400
+    framing: AX.25 G3RUH
+    data:
+    - *tlm
+  4k8 BPSK downlink:
+    frequency: 436.908e+6
+    modulation: BPSK
+    baudrate: 4800
+    framing: AX.25 G3RUH
+    data:
+    - *tlm
+  9k6 BPSK downlink:
+    frequency: 436.908e+6
+    modulation: BPSK
+    baudrate: 9600
+    framing: AX.25 G3RUH
+    data:
+    - *tlm
diff --git a/python/satyaml/ION_SCV-003.yml b/python/satyaml/ION_SCV-003.yml
@@ -0,0 +1,13 @@
+name: ION SCV-003
+norad: 48912
+data:
+  &tlm Telemetry:
+    telemetry: csp
+transmitters:
+  1k2 FSK downlink:
+    frequency: 437.515e+6
+    modulation: FSK
+    baudrate: 1200
+    framing: AX100 ASM+Golay
+    data:
+    - *tlm
diff --git a/python/satyaml/IT-SPINS.yml b/python/satyaml/IT-SPINS.yml
@@ -0,0 +1,13 @@
+name: IT-SPINS
+norad: 49017
+data:
+  &tlm Telemetry:
+    telemetry: ax25
+transmitters:
+  19k2 FSK downlink:
+    frequency: 437.405e+6
+    modulation: FSK
+    baudrate: 19200
+    framing: AX.25 G3RUH
+    data:
+    - *tlm
diff --git a/python/satyaml/JAISAT-1.yml b/python/satyaml/JAISAT-1.yml
@@ -0,0 +1,13 @@
+name: JAISAT-1
+norad: 44419
+data:
+  &tlm Telemetry:
+    unknown
+transmitters:
+  4k8 FSK downlink:
+    frequency: 435.700e+6
+    modulation: FSK
+    baudrate: 4800
+    framing: Mobitex
+    data:
+    - *tlm
diff --git a/python/satyaml/LEDSAT.yml b/python/satyaml/LEDSAT.yml
@@ -0,0 +1,20 @@
+name: LEDSAT
+norad: 99670
+data:
+  &tlm Telemetry:
+    telemetry: csp
+transmitters:
+  1k2 FSK downlink:
+    frequency: 435.190e+6
+    modulation: FSK
+    baudrate: 1200
+    framing: AX100 ASM+Golay
+    data:
+    - *tlm
+  9k6 FSK downlink:
+    frequency: 435.190e+6
+    modulation: FSK
+    baudrate: 9600
+    framing: AX100 ASM+Golay
+    data:
+    - *tlm
diff --git a/python/satyaml/MIR-SAT1.yml b/python/satyaml/MIR-SAT1.yml
@@ -1,5 +1,5 @@
 name: MIR-SAT1
-norad: 99718
+norad: 48868
 data:
   &tlm Telemetry:
     telemetry: mirsat1