Skip to content

Commit 17b4c9b

Browse files
daniestevezdaniestevez
committed
Merge branch 'main' into maint-3.10
2 parents 43ba4ab + daab169 commit 17b4c9b

24 files changed

+638
-18
lines changed

‎CHANGELOG.md

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

77
## Unreleased
88

9+
## [5.2.0], [4.9.0], [3.16.0] - 2023-01-29
10+
11+
### Added
12+
- Support for BDSat-2
13+
- Support for CAS-5A
14+
- Support for CIRBE
15+
- Support for HKSAT
16+
- Support for INS-2B
17+
- Support for MARIO
18+
- Support for NUTSat
19+
- Support for SharjahSat-1
20+
- Support for SS-1
21+
- Support for TRISAT-R
22+
23+
### Changed
24+
- Doppler Correction block: use constant frequency before start of file
25+
- Doppler Correction block: use logging instead of printing
26+
- Marked Fixedlen Tagger block as deprecated
27+
28+
### Fixed
29+
- Throttle mode when used with --wavfile
30+
- MTCUBE-2 NORAD ID
31+
932
## [5.1.1], [4.8.1], [3.15.1] - 2022-11-19
1033

1134
### Fixed
@@ -546,10 +569,12 @@ Large refactor release bringing new functionality and improvements. This is an o
546569
## [1.0.0] - 2018-08-02
547570
First gr-satellites release using semantic versioning
548571

549-
[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v5.1.1...main
572+
[Unreleased]: https://github.com/daniestevez/gr-satellites/compare/v5.2.0...main
573+
[5.2.0]: https://github.com/daniestevez/gr-satellites/compare/v5.1.1...v5.2.0
550574
[5.1.1]: https://github.com/daniestevez/gr-satellites/compare/v5.1.0...v5.1.1
551575
[5.1.0]: https://github.com/daniestevez/gr-satellites/compare/v5.0.0...v5.1.0
552576
[5.0.0]: https://github.com/daniestevez/gr-satellites/compare/v4.6.0...v5.0.0
577+
[4.8.1]: https://github.com/daniestevez/gr-satellites/compare/v4.8.1...v4.9.0
553578
[4.8.1]: https://github.com/daniestevez/gr-satellites/compare/v4.8.0...v4.8.1
554579
[4.8.0]: https://github.com/daniestevez/gr-satellites/compare/v4.7.0...v4.8.0
555580
[4.7.0]: https://github.com/daniestevez/gr-satellites/compare/v4.6.0...v4.7.0
@@ -562,6 +587,7 @@ First gr-satellites release using semantic versioning
562587
[4.1.0]: https://github.com/daniestevez/gr-satellites/compare/v4.0.0...v4.1.0
563588
[4.0.0]: https://github.com/daniestevez/gr-satellites/compare/v4.0.0-rc1...v4.0.0
564589
[4.0.0-rc1]: https://github.com/daniestevez/gr-satellites/compare/v3.7.0...v4.0.0-rc1
590+
[3.16.0]: https://github.com/daniestevez/gr-satellites/compare/v3.15.1...v3.16.0
565591
[3.15.1]: https://github.com/daniestevez/gr-satellites/compare/v3.15.0...v3.15.1
566592
[3.15.0]: https://github.com/daniestevez/gr-satellites/compare/v3.14.0...v3.15.0
567593
[3.14.0]: https://github.com/daniestevez/gr-satellites/compare/v3.13.0...v3.14.0

‎CMakeLists.txt

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

4444
# Set the version information here
4545
set(VERSION_MAJOR 5)
46-
set(VERSION_API 1)
47-
set(VERSION_ABI 1)
46+
set(VERSION_API 2)
47+
set(VERSION_ABI 0)
4848
set(VERSION_PATCH 0)
4949

5050
cmake_policy(SET CMP0011 NEW)

‎apps/gr_satellites

+1-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ class gr_satellites_top_block(gr.top_block):
209209
if self.options.throttle:
210210
size = (gr.sizeof_gr_complex
211211
if self.options.iq else gr.sizeof_float)
212-
self.throttle = blocks.throttle(size,
213-
self.options.samp_rate, True)
212+
self.throttle = blocks.throttle(size, samp_rate, True)
214213
self.connect(self.input,
215214
self.throttle, self.gain, self.flowgraph)
216215
else:

‎debian/changelog

+18
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,33 @@
1+
gr-satellites (5.2.0-1) kinetic; urgency=medium
2+
3+
* Mainstream release v5.2.0
4+
5+
-- <[email protected]> Sun, 29 Jan 2023 08:32:00 +0000
6+
7+
gr-satellites (5.2.0-0) jammy; urgency=medium
8+
9+
* Mainstream release v5.2.0
10+
11+
-- <[email protected]> Sun, 29 Jan 2023 08:32:00 +0000
12+
113
gr-satellites (5.1.1-1) kinetic; urgency=medium
214

315
* Mainstream release v5.1.1
416

17+
-- <[email protected]> Sat, 11 Nov 2022 11:20:00 +0000
18+
519
gr-satellites (5.1.1-0) jammy; urgency=medium
620

721
* Mainstream release v5.1.1
822

23+
-- <[email protected]> Sat, 11 Nov 2022 11:20:00 +0000
24+
925
gr-satellites (5.1.0-1) kinetic; urgency=medium
1026

1127
* Mainstream release v5.1.0
1228

29+
-- <[email protected]> Mon, 24 Oct 2022 17:30:00 +0000
30+
1331
gr-satellites (5.1.0-0) jammy; urgency=medium
1432

1533
* Mainstream release v5.1.0

‎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 = '2016-2022, Daniel Estévez'
23+
copyright = '2016-2023, 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 = '5.1.1'
29+
release = '5.2.0'
3030

3131

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

‎grc/satellites_fixedlen_tagger.block.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# auto-generated by grc.converter
22

33
id: satellites_fixedlen_tagger
4-
label: Fixed Length Packet Tagger
5-
category: '[Satellites]/Packet'
4+
label: Fixed Length Packet Tagger (Deprecated)
5+
category: '[Satellites]/Deprecated'
66

77
parameters:
88
- id: stream_type

‎lib/doppler_correction_impl.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int doppler_correction_impl::work(int noutput_items,
7171
d_sample_t0 = tag.offset;
7272
d_t0 = static_cast<double>(pmt::to_uint64(pmt::tuple_ref(tag.value, 0))) +
7373
pmt::to_double(pmt::tuple_ref(tag.value, 1));
74-
printf("[doppler_correction] set time %f at sample %d\n", d_t0, d_sample_t0);
74+
d_logger->info("set time {} at sample {}", d_t0, d_sample_t0);
7575
}
7676
}
7777

@@ -83,9 +83,9 @@ int doppler_correction_impl::work(int noutput_items,
8383
++d_current_index;
8484
}
8585
double freq;
86-
if (d_current_index + 1 == times.size()) {
87-
// We are at the end of the file, so we maintain a constant
88-
// frequency.
86+
if ((time < times[d_current_index]) || (d_current_index + 1 == times.size())) {
87+
// We are before the beginning or past the end of the file, so we
88+
// maintain a constant frequency.
8989
freq = freqs_rad_per_sample[d_current_index];
9090
} else {
9191
// Linearly interpolate frequency

‎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-2022 Daniel Estevez <[email protected]>
4+
# Copyright 2020-2023 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__ = 'v5.1.1'
22+
__version__ = 'v5.2.0'
2323
__author__ = 'Daniel Estevez'
24-
__copyright__ = 'Copyright 2016-2022 Daniel Estevez'
24+
__copyright__ = 'Copyright 2016-2023 Daniel Estevez'
2525
__email__ = '[email protected]'
2626
__license__ = 'GPL-3.0'
2727
__all__ = [

‎python/satyaml/BDSat-2.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: BDSat-2
2+
norad: 55098
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
9k6 FSK downlink:
8+
frequency: 436.025e+6
9+
modulation: FSK
10+
baudrate: 9600
11+
framing: AX.25 G3RUH
12+
data:
13+
- *tlm

‎python/satyaml/CAS-5A.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: CAS-5A
2+
alternative_names:
3+
- CAMSAT
4+
norad: 54684
5+
data:
6+
&tlm Telemetry:
7+
telemetry: ax25
8+
transmitters:
9+
4k8 FSK downlink:
10+
frequency: 435.650e+6
11+
modulation: FSK
12+
baudrate: 4800
13+
framing: AX.25 G3RUH
14+
data:
15+
- *tlm
16+
9k6 FSK downlink:
17+
frequency: 435.650e+6
18+
modulation: FSK
19+
baudrate: 9600
20+
framing: AX.25 G3RUH
21+
data:
22+
- *tlm

‎python/satyaml/CIRBE.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: CIRBE
2+
norad: 99401
3+
data:
4+
&tlm Telemetry:
5+
telemetry: cirbe_70cm
6+
transmitters:
7+
9k6 FSK downlink:
8+
frequency: 437.250e+6
9+
modulation: FSK
10+
baudrate: 9600
11+
framing: AX.25
12+
data:
13+
- *tlm
14+
19k2 FSK downlink:
15+
frequency: 437.250e+6
16+
modulation: FSK
17+
baudrate: 19200
18+
framing: AX.25
19+
data:
20+
- *tlm
21+

‎python/satyaml/GREENCUBE.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: GREENCUBE
2-
norad: 53109
2+
norad: 53106
33
data:
44
&tlm Telemetry:
55
unknown

‎python/satyaml/HSKSAT.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: HSKSAT
2+
norad: 55182
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
9k6 FSK downlink:
8+
frequency: 437.275e+6
9+
modulation: FSK
10+
baudrate: 9600
11+
framing: AX.25 G3RUH
12+
data:
13+
- *tlm

‎python/satyaml/INS-2B.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: INS-2B
2+
norad: 54365
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
1k2 FSK downlink:
8+
frequency: 435.080e+6
9+
modulation: FSK
10+
baudrate: 1200
11+
framing: AX.25
12+
data:
13+
- *tlm

‎python/satyaml/MARIO.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: MARIO
2+
norad: 55123
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
9k6 FSK downlink:
8+
frequency: 437.485e+6
9+
modulation: FSK
10+
baudrate: 9600
11+
framing: AX.25 G3RUH
12+
data:
13+
- *tlm

‎python/satyaml/MTCUBE-2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: MTCUBE-2
22
alternative_names:
33
- ROBUSTA-1F
4-
norad: 53106
4+
norad: 53109
55
telemetry_servers:
66
- SIDS https://ddp.csum.umontpellier.fr/store_beacon
77
data:

‎python/satyaml/NUTSat.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: NUTSat
2+
norad: 55124
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
9k6 FSK downlink:
8+
frequency: 436.850e+6
9+
modulation: FSK
10+
baudrate: 9600
11+
framing: AX.25
12+
data:
13+
- *tlm
14+
1k2 AFSK downlink:
15+
frequency: 436.850e+6
16+
modulation: AFSK
17+
baudrate: 1200
18+
af_carrier: 1700
19+
deviation: 500
20+
framing: AX.25
21+
data:
22+
- *tlm

‎python/satyaml/SS-1.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: SS-1
2+
norad: 55181
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
1k2 AFSK downlink:
8+
frequency: 145.825e+6
9+
modulation: AFSK
10+
baudrate: 1200
11+
af_carrier: 1700
12+
deviation: 500
13+
framing: AX.25
14+
data:
15+
- *tlm

‎python/satyaml/Sharjahsat-1.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Sharjahsat-1
2+
norad: 55104
3+
data:
4+
&tlm Telemetry:
5+
telemetry: ax25
6+
transmitters:
7+
9k6 FSK downlink:
8+
frequency: 437.325e+6
9+
modulation: FSK
10+
baudrate: 9600
11+
framing: AX.25 G3RUH
12+
data:
13+
- *tlm

‎python/satyaml/TRISAT-R.yml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: TRISAT-R
2+
norad: 53108
3+
data:
4+
&tlm Telemetry:
5+
telemetry: trisat
6+
transmitters:
7+
1k baud FSK downlink:
8+
frequency: 435.6125e+6
9+
modulation: FSK
10+
baudrate: 1000
11+
framing: CCSDS Concatenated
12+
RS basis: dual
13+
convolutional: NASA-DSN
14+
frame size: 223
15+
data:
16+
- *tlm
17+
2k baud FSK downlink:
18+
frequency: 435.6125e+6
19+
modulation: FSK
20+
baudrate: 2000
21+
framing: CCSDS Concatenated
22+
RS basis: dual
23+
convolutional: NASA-DSN
24+
frame size: 223
25+
data:
26+
- *tlm
27+
3k baud FSK downlink:
28+
frequency: 435.6125e+6
29+
modulation: FSK
30+
baudrate: 3000
31+
framing: CCSDS Concatenated
32+
RS basis: dual
33+
convolutional: NASA-DSN
34+
frame size: 223
35+
data:
36+
- *tlm
37+
5k baud FSK downlink:
38+
frequency: 435.6125e+6
39+
modulation: FSK
40+
baudrate: 5000
41+
framing: CCSDS Concatenated
42+
RS basis: dual
43+
convolutional: NASA-DSN
44+
frame size: 223
45+
data:
46+
- *tlm

0 commit comments

Comments
 (0)