Changed name of hierarchical block

This commit is contained in:
George Vardakis 2016-05-13 17:46:19 +03:00
parent 855ac47c26
commit de61e34393
5 changed files with 8 additions and 8 deletions

View File

@ -36,6 +36,6 @@ install(FILES
satnogs_upsat_fsk_frame_encoder.xml satnogs_upsat_fsk_frame_encoder.xml
satnogs_whitening.xml satnogs_whitening.xml
satnogs_udp_msg_sink.xml satnogs_udp_msg_sink.xml
satnogs_transmitter.xml satnogs_upsat_transmitter.xml
satnogs_coarse_doppler_correction_cc.xml DESTINATION share/gnuradio/grc/blocks satnogs_coarse_doppler_correction_cc.xml DESTINATION share/gnuradio/grc/blocks
) )

View File

@ -1,10 +1,10 @@
<block> <block>
<name>Satnogs Transmitter</name> <name>Satnogs UPSat Transmitter</name>
<key>satnogs_transmitter</key> <key>satnogs_upsat_transmitter</key>
<category>satnogs</category> <category>satnogs</category>
<import>import satnogs</import> <import>import satnogs</import>
<make>satnogs.satnogs_transmitter(frame_preamble=$frame_preamble, <make>satnogs.satnogs_upsat_transmitter(frame_preamble=$frame_preamble,
sync_word=$sync_word, sync_word=$sync_word,
append_crc=$append_crc, append_crc=$append_crc,
whitening=$whitening, whitening=$whitening,

View File

@ -31,7 +31,7 @@ endif()
GR_PYTHON_INSTALL( GR_PYTHON_INSTALL(
FILES FILES
__init__.py __init__.py
satnogs_transmitter.py satnogs_upsat_transmitter.py
DESTINATION ${GR_PYTHON_DIR}/satnogs DESTINATION ${GR_PYTHON_DIR}/satnogs
) )

View File

@ -27,7 +27,7 @@ description here (python/__init__.py).
try: try:
# this might fail if the module is python-only # this might fail if the module is python-only
from satnogs_swig import * from satnogs_swig import *
from satnogs_transmitter import * from satnogs_upsat_transmitter import *
except ImportError: except ImportError:
pass pass

View File

@ -11,7 +11,7 @@ from gnuradio.filter import firdes
from gnuradio.gr.runtime_swig import sizeof_gr_complex from gnuradio.gr.runtime_swig import sizeof_gr_complex
class satnogs_transmitter(gr.hier_block2): class satnogs_upsat_transmitter(gr.hier_block2):
def __init__(self, def __init__(self,
frame_preamble, frame_preamble,
@ -32,7 +32,7 @@ class satnogs_transmitter(gr.hier_block2):
lo_offset, lo_offset,
deviation, deviation,
baud_rate): baud_rate):
gr.hier_block2.__init__(self, "satnogs_transmitter", gr.hier_block2.__init__(self, "satnogs_upsat_transmitter",
gr.io_signature(0 , 0 , 0), gr.io_signature(0 , 0 , 0),
# Output 0: The complex TX signal for the SDR device # Output 0: The complex TX signal for the SDR device
# Output 1: The constellation output for the vector analyzer # Output 1: The constellation output for the vector analyzer