Merge branch 'master' into maint-3.9

Author: daniestevez

.github/workflows/build-ubuntu-gr310.yml

@@ -0,0 +1,16 @@
+name: build-ubuntu-gr310
+
+# Controls when the action will run.
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-ubuntu:
+    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]

.github/workflows/build-ubuntu.yml

@@ -13,4 +13,4 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      - uses: daniestevez/gr-satellites-ci-action@v1.2.1
+      - uses: daniestevez/gr-satellites-ci-action@v1.3.0

CHANGELOG.md

@@ -6,6 +6,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [4.5.0], [3.12.0] - 2022-02-19
+
+### Added
+- Support for GNU Radio 3.10
+- Support for DELFI-PQ
+- Support for EXP-1
+- Support for GASPACS
+- Support for GT-1
+- Support for HUMSAT-D
+- Support for IRIS-A
+- Support for TARGIT
+- Support for the TEVEL satellites
+- Support for XW-3
+- Telemetry parser for Delfi-C3
+
+### Changed
+- Final NORAD ID for CUAVA-1
+- Final NORAD ID for Grizu-263A
+
+### Fixed
+- Bug in sx12xx_packet_crop under GNU Radio 3.9
+- Bug in --kiss_in mode
+- NORAD ID for KSU CubeSat
+
 ## [4.4.0], [3.11.0] - 2021-11-03
 
 ### Added
@@ -436,16 +460,18 @@ 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.4.0...master
+[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v4.5.0...master
+[4.4.0]: https://github.com/daniestevez/gr-satellites/compare/v4.4.0...v4.5.0
 [4.4.0]: https://github.com/daniestevez/gr-satellites/compare/v4.3.1...v4.4.0
 [4.3.1]: https://github.com/daniestevez/gr-satellites/compare/v4.3.0...v4.3.1
 [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.11.1]: https://github.com/daniestevez/gr-satellites/compare/v3.11.0...v3.11.1
-[3.11.0]: https://github.com/daniestevez/gr-satellites/compare/v3.10.0...v3.11.0
+[3.12.0]: https://github.com/daniestevez/gr-satellites/compare/v3.11.0...v3.12.0
+[3.11.0]: https://github.com/daniestevez/gr-satellites/compare/v3.10.1...v3.11.0
+[3.10.1]: https://github.com/daniestevez/gr-satellites/compare/v3.10.0...v3.10.1
 [3.10.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
@@ -472,7 +498,7 @@ First gr-satellites release using semantic versioning
 [1.6.0]: https://github.com/daniestevez/gr-satellites/compare/v1.5.0...v1.6.0
 [1.5.0]: https://github.com/daniestevez/gr-satellites/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/daniestevez/gr-satellites/compare/v1.3.1...v1.4.0
-[1.3.0]: https://github.com/daniestevez/gr-satellites/compare/v1.3.0...v1.3.1
+[1.3.1]: https://github.com/daniestevez/gr-satellites/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/daniestevez/gr-satellites/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/daniestevez/gr-satellites/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/daniestevez/gr-satellites/compare/v1.0.0...v1.1.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 4)
-set(VERSION_API 4)
+set(VERSION_API 5)
 set(VERSION_ABI 0)
 set(VERSION_PATCH 0)
 

MANIFEST.md

@@ -11,7 +11,7 @@ copyright_owner:
   - Daniel Estévez
 license: GPLv3
 repo: https://github.com/daniestevez/gr-satellites
-gr_supported_version: v3.8, v3.9
+gr_supported_version: v3.8, v3.9, v3.10
 #website: <module_website> # If you have a separate project website, put it here
 #icon: <icon_url> # Put a URL to a square image here that will be used as an icon on CGRAN
 ---

README.md

@@ -39,7 +39,7 @@ Currently there are the following series of releases in the history of
 gr-satellites:
 
 * `v4.x.y` has the same functionality as the v3.x.y series, but supports
-   GNU Radio 3.9.
+   GNU Radio 3.9 and 3.10.
 
 * `v3.x.y` is the result of a large refactor that introduces a lot of
   new functionality and improvements. The refactor started on September
@@ -56,10 +56,11 @@ gr-satellites:
 The repository is organized in the following branches:
 
 * `master` is where the active development happens. From time to time, features
-  will be frozen in a new release. This branch is compatible with GNU Radio 3.9.
+  will be frozen in a new release. This branch is compatible with GNU Radio 3.9
+  and 3.10.
 
 * `maint-3.9` is the branch where releases in the current `v4.x.y` line are
-  published. This branch is compatible with GNU Radio 3.9.
+  published. This branch is compatible with GNU Radio 3.9 and 3.10.
 
 * `maint-3.8` is the branch where releases in the current `v3.x.y` line are
   published. This branch is compatible with GNU Radio 3.8.

apps/gr_satellites

@@ -179,7 +179,7 @@ class gr_satellites_top_block(gr.top_block):
         self.setup_input()
 
         # Set appropriate sample rate
-        if options.samp_rate:
+        if options.samp_rate or pdu_in:
             samp_rate = options.samp_rate
         elif options.wavfile:
             samp_rate = self.wavfile_source.sample_rate()

docs/source/command_line.rst

@@ -513,7 +513,7 @@ To enable telemetry submission, it is necessary to edit some parameters in
 with a template when ``gr_satellites`` is first run. The template looks like
 this:
 
-.. code-block::
+.. code-block:: ini
 
     [Groundstation]
     callsign = 

docs/source/conf.py

@@ -20,13 +20,13 @@
 # -- Project information -----------------------------------------------------
 
 project = 'gr-satellites'
-copyright = '2021, Daniel Estévez'
+copyright = '2016-2022, Daniel Estévez'
 author = 'Daniel Estévez'
 
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '4.4.0'
+release = '4.5.0'
 
 
 # -- General configuration ---------------------------------------------------

docs/source/satyaml.rst

@@ -15,7 +15,7 @@ SatYAML files are stored in the ``python/satyaml`` directory. Below we show the
 SatYAML file ``1KUNS-PF.yml`` to give an overall idea of the format of these
 files.
 
-.. code-block:: none
+.. code-block:: yaml
 
    name: 1KUNS-PF
    alternative_names:
@@ -243,6 +243,8 @@ The framings allowed in the ``framing`` field are the following:
 * ``DIY-1``, the custom framing used by DIY-1, which uses an RFM22 chip transceiver.
 
 * ``BINAR-1``, the custom framing used by the BINAR-1 satellite.
+
+* ``Endurosat``, the custom framing used by the Endurosat modem.
 
 Some framings, such as the CCSDS protocols need the additional field
 ``frame size`` to indicate the frame size.
@@ -275,7 +277,7 @@ rarely used feature).
 
 The following example shows how transports are indicated in SatYAML files.
 
-.. code-block:: none
+.. code-block:: yaml
 
    name: KS-1Q
    norad: 41845