lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-21 05:36:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix imports

Browse Source
This commit is contained in:
Roman Zeyde
2014-08-07 17:00:31 +03:00
parent 99de92c7e8
commit cb08b23aa3
10 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
amodem/calib.py
View File

@@ -1,9 +1,10 @@
#!/usr/bin/env python #!/usr/bin/env python
import numpy as np import numpy as np
import common
import config from . import common
import sigproc from . import config
import wave from . import sigproc
from . import wave
Tsample = 1 Tsample = 1
t = np.arange(int(Tsample * config.Fs)) * config.Ts t = np.arange(int(Tsample * config.Fs)) * config.Ts

6
amodem/common.py
View File

@@ -108,3 +108,9 @@ def icapture(iterable, result):
def take(iterable, n): def take(iterable, n):
return np.array(list(itertools.islice(iterable, n))) return np.array(list(itertools.islice(iterable, n)))
try:
izip = itertools.izip
except AttributeError:
izip = zip # Python 3

2
amodem/ecc.py
View File

@@ -1,7 +1,7 @@
''' Reed-Solomon CODEC. ''' ''' Reed-Solomon CODEC. '''
from reedsolo import rs_encode_msg, rs_correct_msg from reedsolo import rs_encode_msg, rs_correct_msg
import common from . import common
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

7
amodem/loop.py
View File

@@ -1,8 +1,9 @@
import numpy as np import numpy as np
import itertools import itertools
import sampling from . import sampling
import sigproc from . import sigproc
from . import common
class Filter(object): class Filter(object):
@@ -33,4 +34,4 @@ class FreqLoop(object):
self.gens.append(gen) self.gens.append(gen)
def __iter__(self): def __iter__(self):
return itertools.izip(*self.gens) return common.izip(*self.gens)

22
amodem/recv.py
View File

@@ -8,21 +8,24 @@ import time
import sys import sys
import os import os
import bitarray
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
import stream from . import stream
import sigproc from . import sigproc
import loop from . import loop
import train from . import train
import common from . import common
import config from . import config
from . import ecc
modem = sigproc.MODEM(config) modem = sigproc.MODEM(config)
if os.environ.get('PYLAB') == '1': if os.environ.get('PYLAB') == '1':
import pylab from . import pylab
import show from . import show
WIDTH = np.floor(np.sqrt(len(modem.freqs))) WIDTH = np.floor(np.sqrt(len(modem.freqs)))
HEIGHT = np.ceil(len(modem.freqs) / float(WIDTH)) HEIGHT = np.ceil(len(modem.freqs) / float(WIDTH))
else: else:
@@ -223,9 +226,6 @@ def receive(signal, freqs, gain=1.0):
def decode(bits_iterator): def decode(bits_iterator):
import bitarray
import ecc
def blocks(): def blocks():
while True: while True:
bits = itertools.islice(bits_iterator, 8 * ecc.BLOCK_SIZE) bits = itertools.islice(bits_iterator, 8 * ecc.BLOCK_SIZE)

14
amodem/send.py
View File

@@ -7,13 +7,14 @@ import time
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
import train from . import train
import wave from . import wave
import common from . import common
import config from . import config
import sigproc from . import sigproc
import stream from . import stream
from . import ecc
modem = sigproc.MODEM(config) modem = sigproc.MODEM(config)
@@ -66,7 +67,6 @@ def modulate(fd, bits):
def main(args): def main(args):
import ecc
log.info('Running MODEM @ {:.1f} kbps'.format(modem.modem_bps / 1e3)) log.info('Running MODEM @ {:.1f} kbps'.format(modem.modem_bps / 1e3))
# padding audio with silence # padding audio with silence

4
amodem/sigproc.py
View File

@@ -1,8 +1,8 @@
import numpy as np import numpy as np
from numpy import linalg from numpy import linalg
import common from . import common
from config import Ts, Nsym from .config import Ts, Nsym
class Filter(object): class Filter(object):

1
amodem/stream.py
View File

@@ -1,6 +1,5 @@
import time import time
import wave
class Reader(object): class Reader(object):

2
amodem/wave.py
View File

@@ -6,7 +6,7 @@ import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
import config from . import config
Fs = int(config.Fs) # sampling rate Fs = int(config.Fs) # sampling rate
bits_per_sample = 16 bits_per_sample = 16

6
tests/test_full.py
View File

@@ -1,5 +1,9 @@
import os import os
from cStringIO import StringIO try:
from cStringIO import StringIO as BytesIO
except ImportError:
from io import BytesIO # Python 3
import numpy as np import numpy as np
from amodem import send from amodem import send