lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-28 12:46:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor iterations into generators

Browse Source
This commit is contained in:
Roman Zeyde
2014-07-19 15:39:00 +03:00
parent 4bc5351fac
commit 067cbf8428
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
recv.py
View File

@@ -134,15 +134,17 @@ def demodulate(symbols, filters, freqs):
streams.append(bits) # stream per frequency streams.append(bits) # stream per frequency
log.info('Demodulation started') log.info('Demodulation started')
bitstream = [] decoded_bits = 0
start = time.time() start = time.time()
for block in itertools.izip(*streams): # block per frequency for block in itertools.izip(*streams): # block per frequency
for bits in block: for bits in block:
bitstream.extend(bits) yield bits
decoded_bits = decoded_bits + len(bits)
duration = time.time() - start duration = time.time() - start
audio_time = len(bitstream) / sigproc.modem_bps audio_time = decoded_bits / sigproc.modem_bps
log.info('Demodulated %.3f kB @ %.3f seconds = %.1f%% realtime', log.info('Demodulated %.3f kB @ %.3f seconds = %.1f%% realtime',
len(bitstream) / 8e3, duration, 100 * duration / audio_time) decoded_bits / 8e3, duration, 100 * duration / audio_time)
if pylab: if pylab:
pylab.figure() pylab.figure()
@@ -150,7 +152,6 @@ def demodulate(symbols, filters, freqs):
for i, freq in enumerate(freqs): for i, freq in enumerate(freqs):
pylab.subplot(HEIGHT, WIDTH, i+1) pylab.subplot(HEIGHT, WIDTH, i+1)
show.constellation(symbol_list[i], '$F_c = {} Hz$'.format(freq)) show.constellation(symbol_list[i], '$F_c = {} Hz$'.format(freq))
return bitstream
def receive(signal, freqs): def receive(signal, freqs):
@@ -164,6 +165,19 @@ def receive(signal, freqs):
return demodulate(symbols, filters, freqs) return demodulate(symbols, filters, freqs)
def decode(bits_iterator):
bits = list(bits_iterator)
data = iterate(bits, 8, func=to_byte)
data = ''.join(c for _, c in data)
import ecc
data = ecc.decode(data)
if data is None:
log.warning('No blocks decoded!')
return data
def main(fname): def main(fname):
log.info('Running MODEM @ {:.1f} kbps'.format(sigproc.modem_bps / 1e3)) log.info('Running MODEM @ {:.1f} kbps'.format(sigproc.modem_bps / 1e3))
@@ -191,19 +205,11 @@ def main(fname):
raise ValueError('Saturation detected: {:.3f}'.format(peak)) raise ValueError('Saturation detected: {:.3f}'.format(peak))
data_bits = receive(x / amp, frequencies) data_bits = receive(x / amp, frequencies)
if data_bits is None: bits = itertools.chain.from_iterable(data_bits)
log.warning('Training failed!') data = decode(bits)
else:
data = iterate(data_bits, 8, func=to_byte)
data = ''.join(c for _, c in data)
import ecc
data = ecc.decode(data)
if data is None:
log.warning('No blocks decoded!')
return
log.info('Decoded %.3f kB', len(data) / 1e3) log.info('Decoded %.3f kB', len(data) / 1e3)
sys.stdout.write(data) sys.stdout.write(data)
if __name__ == '__main__': if __name__ == '__main__':
logging.basicConfig(level=logging.INFO, logging.basicConfig(level=logging.INFO,