a3x/gr-digitalhf
1
0
Fork 0
mirror of https://github.com/hb9fxq/gr-digitalhf synced 2024-12-22 15:10:00 +00:00
Code Issues Releases Wiki Activity

deinterleaver fix for S4285 2400 baud

Browse source
This commit is contained in:
cmayer 2019-05-14 16:23:03 +02:00
parent f0dc97ed64
commit be31566ff1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
python/physical_layer/STANAG_4285.py
View file

@ -27,12 +27,12 @@ MODE_QPSK=1
MODE_8PSK=2 MODE_8PSK=2
MODES = { ## [BPS]['const'] [BPS]['punct'] [BPS]['repeat'] MODES = { ## [BPS]['const'] [BPS]['punct'] [BPS]['repeat']
'2400': {'const': MODE_8PSK, 'punct': ['11', '10'] , 'repeat': 1}, '2400': {'const': MODE_8PSK, 'punct': ['11', '10'] , 'repeat': 1, 'deintl_multiple': 4},
'1200': {'const': MODE_QPSK, 'punct': [ '1', '1'] , 'repeat': 1}, '1200': {'const': MODE_QPSK, 'punct': [ '1', '1'] , 'repeat': 1, 'deintl_multiple': 2},
'600': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 1}, '600': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 1, 'deintl_multiple': 1},
'300': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 2}, '300': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 2, 'deintl_multiple': 1},
'150': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 4}, '150': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 4, 'deintl_multiple': 1},
'75': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 8} '75': {'const': MODE_BPSK, 'punct': [ '1', '1'] , 'repeat': 8, 'deintl_multiple': 1}
} }
DEINTERLEAVER_INCR = { 'S': 1, 'L': 12 } DEINTERLEAVER_INCR = { 'S': 1, 'L': 12 }
@ -58,7 +58,7 @@ class PhysicalLayer(object):
print('set_mode', mode) print('set_mode', mode)
bps,intl = mode.split('/') bps,intl = mode.split('/')
self._mode = MODES[bps]['const'] self._mode = MODES[bps]['const']
self._deinterleaver = Deinterleaver(DEINTERLEAVER_INCR[intl]) self._deinterleaver = Deinterleaver(DEINTERLEAVER_INCR[intl] * MODES[bps]['deintl_multiple'])
self._depuncturer = common.Depuncturer(repeat = MODES[bps]['repeat'], self._depuncturer = common.Depuncturer(repeat = MODES[bps]['repeat'],
puncture_pattern = MODES[bps]['punct']) puncture_pattern = MODES[bps]['punct'])
@ -173,7 +173,7 @@ class PhysicalLayer(object):
@staticmethod @staticmethod
def make_psk(n, gray_code): def make_psk(n, gray_code):
"""generates n-PSK constellation data""" """generates n-PSK constellation data"""
c = np.zeros(n, dtype=[('points', np.complex64), ('symbols', np.int32)]) c = np.zeros(n, common.CONST_DTYPE)
c['points'] = np.exp(2*np.pi*1j*np.arange(n)/n) c['points'] = np.exp(2*np.pi*1j*np.arange(n)/n)
c['symbols'] = gray_code c['symbols'] = gray_code
return c return c