Merge branch 'master' into maint-3.9

Author: daniestevez

CHANGELOG.md

@@ -6,15 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## [4.0.0-rc1] - 2021-02-19
+## [4.0.0] - 2021-03-06
 
 ### Added
-- Support for GNU Radio 3.9
+- Support for DELFI-n3xt
 
-### Removed
-- Support for GNU Radio 3.8
+### Changed
+- Final NORAD for UVSQ-Sat
+- Document that --wavfile allows OGG/FLAC
 
-## [3.7.0] - 2021-02-19
+## [3.7.0] and [4.0.0-rc1] - 2021-02-19
 
 ### Added
 - Read sample rate from WAV files automatically
@@ -353,7 +354,8 @@ 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.0.0-rc1...master
+[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v4.0.0...master
+[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.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

CMakeLists.txt

@@ -45,7 +45,6 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
 set(VERSION_MAJOR 4)
 set(VERSION_API 0)
 set(VERSION_ABI 0)
-set(VERSION_PATCH rc1)
 
 cmake_policy(SET CMP0011 NEW)
 

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
+gr_supported_version: v3.8, v3.9
 #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

@@ -38,9 +38,12 @@ gr-satellites [documentation](https://gr-satellites.readthedocs.io/) is hosted i
 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.
+
 * `v3.x.y` is the result of a large refactor that introduces a lot of
   new functionality and improvements. The refactor started on September
-  2019 and was finished in May 2020.
+  2019 and was finished in May 2020. This supports GNU Radio 3.8.
 
 * `v2.x.y` is a series of releases compatible with GNU Radio 3.8 that existed
   between September 2019 and May 2020. The functionality in this series is
@@ -53,7 +56,10 @@ 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.8.
+  will be frozen in a new release. This branch is compatible with GNU Radio 3.9.
+
+* `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.
 
 * `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

@@ -49,7 +49,7 @@ def argument_parser():
     p_input = p.add_argument_group('input')
 
     p_sources = p_input.add_mutually_exclusive_group(required = True)
-    p_sources.add_argument('--wavfile', help = 'WAV input file')
+    p_sources.add_argument('--wavfile', help = 'WAV/OGG/FLAC input file (using libsndfile)')
     p_sources.add_argument('--rawfile', help = 'RAW input file (float32 or complex64)')
     p_sources.add_argument('--rawint16', help = 'RAW input file (int16)')
     p_sources.add_argument('--audio', const = '', nargs = '?', metavar = 'DEVICE',  help = 'Soundcard device input')

docs/gr_satellites.1

@@ -41,7 +41,7 @@ list supported satellites and exit
 .SS "Input options"
 .TP
 .BR \-\-wavfile\ \fIWAVFILE\fR
-WAV input file
+WAV/OGG/FLAC input file (using libsndfile)
 .TP
 .BR \-\-rawfile\ \fIRAWFILE\fR
 RAW input file (float32 or complex64)

docs/source/command_line.rst

@@ -91,11 +91,14 @@ Specifying the input source
 Besides specifying the satellite to use for decoding, it is mandatory to specify
 the input source by using exactly one of the following options:
 
-* ``--wavfile`` can be used to read a recording in WAV format. The sample rate
-  is obtained from the WAV header, but it can be overriden using the the
+* ``--wavfile`` can be used to read a recording in WAV/OGG/FLAC format.
+  This uses libsndfile through the GNU Radio WAV File Source block, so any
+  format supported by libsndfile can be used.
+  The sample rate
+  is obtained from the file header, but it can be overriden using the the
   ``--samp_rate`` argument if necessary.
 
-  By default, the WAV file is interpreted as a one-channel file containing real
+  By default, the WAV/OGG/FLAC file is interpreted as a one-channel file containing real
   RF samples. To read a two-channel file containing IQ RF samples, the ``--iq``
   argument needs to be specified.
 
@@ -231,7 +234,7 @@ For example, this shows all the options allowed by the FUNcube-1 decoder:
      --ignore_unknown_args Treat unknown arguments as warning
 
    input:
-     --wavfile WAVFILE     WAV input file
+     --wavfile WAVFILE     WAV/OGG/FLAC input file (using libsndfile)
      --rawfile RAWFILE     RAW input file (float32 or complex64)
      --rawint16 RAWINT16   RAW input file (int16)
      --audio [DEVICE]      Soundcard device input

docs/source/conf.py

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '4.0.0-rc1'
+release = '4.0.0'
 
 
 # -- General configuration ---------------------------------------------------

python/__init__.py

@@ -19,7 +19,7 @@
 ad-hoc protocols used in other satellites.
 '''
 
-__version__ = 'v4.0.0-rc1'
+__version__ = 'v4.0.0'
 __author__ = 'Daniel Estevez'
 __copyright__ = 'Copyright 2016-2020 Daniel Estevez'
 __email__ = '[email protected]'

python/satyaml/DELFI-n3xt.yml

@@ -0,0 +1,13 @@
+name: DELFI-n3xt
+norad: 39428
+data:
+  &tlm Telemetry:
+    telemetry: ax25
+transmitters:
+  2k4 BPSK downlink:
+    frequency: 145.870e+6
+    modulation: BPSK
+    baudrate: 2400
+    framing: AX.25
+    data:
+    - *tlm

python/satyaml/UVSQ-SAT.yml

@@ -1,5 +1,5 @@
 name: UVSQ-SAT
-norad: 99991
+norad: 47438
 telemetry_servers:
   - SIDS https://amsat.electrolab.fr/api/V2/SIDS
 data: