Skip to content

Commit 3956802

Browse files
daniestevezdaniestevez
committed
Merge branch 'master' into maint-3.9
2 parents ba9f859 + 58b67d8 commit 3956802

21 files changed

+270
-12
lines changed

‎CHANGELOG.md

+21-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9+
## [4.3.0], [3.10.0] - 2021-08-20
10+
11+
### Added
12+
- Support for DHABISAT
13+
- Support for ION SCV-003
14+
- Support for IT-SPINS
15+
- Support for JAISAT-1
16+
- Support for LEDSAT
17+
- Support for QMR-KWT
18+
- Support for RAMSAT
19+
- Support for SOAR
20+
- Support for TUBIN
21+
- Ability to change frame length in fixedlen_tagger block
22+
23+
## [4.2.0], [3.9.0] - 2021-06-18
24+
925
### Added
1026
- Support for CubeSX-HSE in 1k2, 2k4 and 4k8 modes
1127
- 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
392408
## [1.0.0] - 2018-08-02
393409
First gr-satellites release using semantic versioning
394410

395-
[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v4.1.0...master
411+
[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v4.3.0...master
412+
[4.3.0]: https://github.com/daniestevez/gr-satellites/compare/v4.2.0...v4.3.0
413+
[4.2.0]: https://github.com/daniestevez/gr-satellites/compare/v4.1.0...v4.2.0
396414
[4.1.0]: https://github.com/daniestevez/gr-satellites/compare/v4.0.0...v4.1.0
397415
[4.0.0]: https://github.com/daniestevez/gr-satellites/compare/v4.0.0-rc1...v4.0.0
398416
[4.0.0-rc1]: https://github.com/daniestevez/gr-satellites/compare/v3.7.0...v4.0.0-rc1
417+
[3.9.0]: https://github.com/daniestevez/gr-satellites/compare/v3.9.0...v3.10.0
418+
[3.9.0]: https://github.com/daniestevez/gr-satellites/compare/v3.8.0...v3.9.0
399419
[3.8.0]: https://github.com/daniestevez/gr-satellites/compare/v3.7.0...v3.8.0
400420
[3.7.0]: https://github.com/daniestevez/gr-satellites/compare/v3.6.0...v3.7.0
401421
[3.6.0]: https://github.com/daniestevez/gr-satellites/compare/v3.5.2...v3.6.0

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
4343

4444
# Set the version information here
4545
set(VERSION_MAJOR 4)
46-
set(VERSION_API 2)
46+
set(VERSION_API 3)
4747
set(VERSION_ABI 0)
4848

4949
cmake_policy(SET CMP0011 NEW)

‎debian/changelog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
gr-satellites (3.10.0-0) groovy; urgency=medium
2+
3+
* Mainstream release v3.10.0
4+
5+
-- <[email protected]> Fri, 20 Aug 2021 18:00:00 +0000
6+
7+
gr-satellites (3.9.0-0) groovy; urgency=medium
8+
9+
* Mainstream release v3.9.0
10+
11+
-- <[email protected]> Fri, 18 Jun 2021 14:05:00 +0000
12+
113
gr-satellites (3.8.0-0) groovy; urgency=medium
214

315
* Mainstream release v3.8.0

‎docs/source/components.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ display image files in realtime using `feh`_ as they are being received.
645645
These receiver blocks use *FileReceiver definitions*, which are
646646
classes derived from ``FileReceiver``. The list of available definitions can be
647647
seen in ``python/filereceiver/__index__.py``, or by calling
648-
``import satellites.filreceiver; help(satellites.filereceiver)`` in
648+
``import satellites.filereceiver; help(satellites.filereceiver)`` in
649649
``python3``. Classes used by the Image receiver must be derived from ``ImageReceiver``.
650650

651651
The figure below shows an example flowgraph of the Image receiver block, which can be

‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
# -- Project information -----------------------------------------------------
2121

2222
project = 'gr-satellites'
23-
copyright = '2020, Daniel Estévez'
23+
copyright = '2021, Daniel Estévez'
2424
author = 'Daniel Estévez'
2525

2626
# The short X.Y version
2727
version = ''
2828
# The full version, including alpha/beta/rc tags
29-
release = '4.2.0'
29+
release = '4.3.0'
3030

3131

3232
# -- General configuration ---------------------------------------------------

‎docs/source/supported_satellites.rst

+71-2
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,18 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
505505
* **4k8 FSK downlink** (437.500 MHz): FSK modulation with AX100 ASM+Golay framing
506506
* **9k6 FSK downlink** (437.500 MHz): FSK modulation with AX100 ASM+Golay framing
507507

508+
**DHABISAT**
509+
Alternative names: MYSat-2
510+
511+
NORAD ID: 49016
512+
513+
Transmitters:
514+
515+
* **1k2 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
516+
* **2k4 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
517+
* **4k8 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
518+
* **9k6 BPSK downlink** (436.908 MHz): BPSK modulation with AX.25 G3RUH framing
519+
508520
**DIY-1**
509521
NORAD ID: 47963
510522

@@ -746,6 +758,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
746758

747759
* **1k2 FSK downlink** (435.080 MHz): FSK modulation with AX.25 framing
748760

761+
**ION SCV-003**
762+
NORAD ID: 48912
763+
764+
Transmitters:
765+
766+
* **1k2 FSK downlink** (437.515 MHz): FSK modulation with AX100 ASM+Golay framing
767+
749768
**ION-MK01**
750769
Alternative names: ION mk01, ION SVC Lucas
751770

@@ -771,13 +790,27 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
771790

772791
* **9k6 FSK downlink** (437.800 MHz): FSK modulation with AX.25 G3RUH framing
773792

793+
**IT-SPINS**
794+
NORAD ID: 49017
795+
796+
Transmitters:
797+
798+
* **19k2 FSK downlink** (437.405 MHz): FSK modulation with AX.25 G3RUH framing
799+
774800
**ITASAT 1**
775801
NORAD ID: 43786
776802

777803
Transmitters:
778804

779805
* **1k2 BPSK downlink** (145.860 MHz): BPSK modulation with AX.25 framing
780806

807+
**JAISAT-1**
808+
NORAD ID: 44419
809+
810+
Transmitters:
811+
812+
* **4k8 FSK downlink** (435.700 MHz): FSK modulation with Mobitex framing
813+
781814
**JY1-Sat**
782815
Alternative names: FUNcube-6, JO-97
783816

@@ -834,6 +867,14 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
834867

835868
* **4k8 FSK downlink** (437.130 MHz): FSK modulation with AX.25 G3RUH framing
836869

870+
**LEDSAT**
871+
NORAD ID: 99670
872+
873+
Transmitters:
874+
875+
* **1k2 FSK downlink** (435.190 MHz): FSK modulation with AX100 ASM+Golay framing
876+
* **9k6 FSK downlink** (435.190 MHz): FSK modulation with AX100 ASM+Golay framing
877+
837878
**LightSail-2**
838879
Alternative names: WM9XPA, LightSail-B
839880

@@ -928,7 +969,7 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
928969
* **19k2 FSK downlink** (437.250 MHz): FSK modulation with AX.25 G3RUH framing
929970

930971
**MIR-SAT1**
931-
NORAD ID: 99718
972+
NORAD ID: 48868
932973

933974
Transmitters:
934975

@@ -957,7 +998,7 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
957998
* **1k2 BPSK downlink** (145.865 MHz): BPSK modulation with AX.25 framing
958999

9591000
**NanosatC-BR2**
960-
NORAD ID: 99734
1001+
NORAD ID: 47950
9611002

9621003
Transmitters:
9631004

@@ -1158,6 +1199,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
11581199

11591200
* **9k6 FSK downlink** (435.800 MHz): FSK modulation with AX.25 G3RUH framing
11601201

1202+
**QMR-KWT**
1203+
NORAD ID: 48943
1204+
1205+
Transmitters:
1206+
1207+
* **9k6 FSK downlink** (436.500 MHz): FSK modulation with AX.25 G3RUH framing
1208+
11611209
**QO-100**
11621210
Alternative names: Es'hail 2
11631211

@@ -1175,6 +1223,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
11751223

11761224
* **4k8 FSK downlink** (437.200 MHz): FSK modulation with AX.25 G3RUH framing
11771225

1226+
**RAMSAT**
1227+
NORAD ID: 48850
1228+
1229+
Transmitters:
1230+
1231+
* **9k6 FSK downlink** (436.300 MHz): FSK modulation with AX.25 G3RUH framing
1232+
11781233
**Reaktor Hello World**
11791234
NORAD ID: 43743
11801235

@@ -1333,6 +1388,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
13331388

13341389
* **9k6 FSK downlink** (437.275 MHz): FSK modulation with AX.25 G3RUH framing
13351390

1391+
**SOAR**
1392+
NORAD ID: 48851
1393+
1394+
Transmitters:
1395+
1396+
* **4k8 FSK downlink** (401.725 MHz): FSK modulation with AX100 ASM+Golay framing
1397+
13361398
**SOKRAT**
13371399
NORAD ID: 44404
13381400

@@ -1476,6 +1538,13 @@ The list is auto-generated by reading the SatYAML files and using the script ``d
14761538

14771539
* **9k6 FSK downlink** (435.450 MHz): FSK modulation with AX.25 G3RUH framing
14781540

1541+
**TUBIN**
1542+
NORAD ID: 48900
1543+
1544+
Transmitters:
1545+
1546+
* **4k8 FSK downlink** (435.950 MHz): FSK modulation with Mobitex-NX framing
1547+
14791548
**TW-1A**
14801549
NORAD ID: 40928
14811550

‎grc/satellites_fixedlen_tagger.block.yml

+2
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,7 @@ templates:
3838
import numpy
3939
make: satellites.fixedlen_tagger(${syncword_tag}, ${packetlen_tag}, ${packet_len},
4040
${stream_type.t})
41+
callbacks:
42+
- set_packet_len(${packet_len})
4143

4244
file_format: 1

‎python/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
# Copyright 2020 Daniel Estevez <[email protected]>
4+
# Copyright 2020-2021 Daniel Estevez <[email protected]>
55
#
66
# This file is part of gr-satellites
77
#
@@ -19,9 +19,9 @@
1919
ad-hoc protocols used in other satellites.
2020
"""
2121

22-
__version__ = 'v4.2.0'
22+
__version__ = 'v4.3.0'
2323
__author__ = 'Daniel Estevez'
24-
__copyright__ = 'Copyright 2016-2020 Daniel Estevez'
24+
__copyright__ = 'Copyright 2016-2021 Daniel Estevez'
2525
__email__ = '[email protected]'
2626
__license__ = 'GPL-3.0'
2727
__all__ = [

‎python/fixedlen_tagger.py

+5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ def __init__(self, syncword_tag, packetlen_tag, packet_len, stream_type):
3636
self.written = 0
3737
self.really_written = 0
3838

39+
def set_packet_len(self, packet_len):
40+
self.packet_len = packet_len
41+
self.stream = collections.deque(
42+
self.stream, maxlen=self.packet_len - 1)
43+
3944
def try_to_flush(self, out):
4045
# Try to send as much items as we have in buffer
4146
len_write = min(len(self.data), len(out))

‎python/hier/sync_to_pdu_packed.py

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def get_packlen(self):
7777

7878
def set_packlen(self, packlen):
7979
self.packlen = packlen
80+
self.satellites_fixedlen_tagger_0_0_0.set_packet_len(self.packlen)
8081

8182
def get_sync(self):
8283
return self.sync

‎python/satyaml/DHABISAT.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: DHABISAT
2+
alternative_names:
3+
- MYSat-2
4+
norad: 49016
5+
data:
6+
&tlm Telemetry:
7+
telemetry: ax25
8+
transmitters:
9+
1k2 BPSK downlink:
10+
frequency: 436.908e+6
11+
modulation: BPSK
12+
baudrate: 1200
13+
framing: AX.25 G3RUH
14+
data:
15+
- *tlm
16+
2k4 BPSK downlink:
17+
frequency: 436.908e+6
18+
modulation: BPSK
19+
baudrate: 2400
20+
framing: AX.25 G3RUH
21+
data:
22+
- *tlm
23+
4k8 BPSK downlink:
24+
frequency: 436.908e+6
25+
modulation: BPSK
26+
baudrate: 4800
27+
framing: AX.25 G3RUH
28+
data:
29+
- *tlm
30+
9k6 BPSK downlink:
31+
frequency: 436.908e+6
32+
modulation: BPSK
33+
baudrate: 9600
34+
framing: AX.25 G3RUH
35+
data:
36+
- *tlm

‎python/satyaml/ION_SCV-003.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: ION SCV-003
2+
norad: 48912
3+
data:
4+
&tlm Telemetry:
5+
telemetry: csp
6+
transmitters:
7+
1k2 FSK downlink:
8+
frequency: 437.515e+6
9+
modulation: FSK
10+
baudrate: 1200
11+
framing: AX100 ASM+Golay
12+
data:
13+
- *tlm

‎python/satyaml/IT-SPINS.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: IT-SPINS
2+
norad: 49017
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
19k2 FSK downlink:
8+
frequency: 437.405e+6
9+
modulation: FSK
10+
baudrate: 19200
11+
framing: AX.25 G3RUH
12+
data:
13+
- *tlm

‎python/satyaml/JAISAT-1.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: JAISAT-1
2+
norad: 44419
3+
data:
4+
&tlm Telemetry:
5+
unknown
6+
transmitters:
7+
4k8 FSK downlink:
8+
frequency: 435.700e+6
9+
modulation: FSK
10+
baudrate: 4800
11+
framing: Mobitex
12+
data:
13+
- *tlm

‎python/satyaml/LEDSAT.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: LEDSAT
2+
norad: 99670
3+
data:
4+
&tlm Telemetry:
5+
telemetry: csp
6+
transmitters:
7+
1k2 FSK downlink:
8+
frequency: 435.190e+6
9+
modulation: FSK
10+
baudrate: 1200
11+
framing: AX100 ASM+Golay
12+
data:
13+
- *tlm
14+
9k6 FSK downlink:
15+
frequency: 435.190e+6
16+
modulation: FSK
17+
baudrate: 9600
18+
framing: AX100 ASM+Golay
19+
data:
20+
- *tlm

‎python/satyaml/MIR-SAT1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: MIR-SAT1
2-
norad: 99718
2+
norad: 48868
33
data:
44
&tlm Telemetry:
55
telemetry: mirsat1

0 commit comments

Comments
 (0)