From cc4a18e15e6f4e88e8c22ea61ec9692b442e7b28 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 9 Aug 2014 12:12:33 +0300 Subject: [PATCH] move calib.py __main__ part to scripts. --- amodem/calib.py | 13 ------------- scripts/auto-calib.sh | 4 ++-- scripts/calib.py | 9 +++++++++ 3 files changed, 11 insertions(+), 15 deletions(-) mode change 100755 => 100644 amodem/calib.py create mode 100755 scripts/calib.py diff --git a/amodem/calib.py b/amodem/calib.py old mode 100755 new mode 100644 index cf911d1..6d9b4cf --- a/amodem/calib.py +++ b/amodem/calib.py @@ -50,16 +50,3 @@ def recv(wave_record=wave.record, reporter=sys.stdout.write): reporter(fmt.format(coherence, amplitude, phase * 180/np.pi, peak)) except KeyboardInterrupt: p.kill() - - -if __name__ == '__main__': - import argparse - p = argparse.ArgumentParser() - sub = p.add_subparsers() - sub.add_parser('send').set_defaults(func=send) - sub.add_parser('recv').set_defaults(func=recv) - args = p.parse_args() - try: - args.func() - except KeyboardInterrupt: - pass diff --git a/scripts/auto-calib.sh b/scripts/auto-calib.sh index d97687d..c776e00 100755 --- a/scripts/auto-calib.sh +++ b/scripts/auto-calib.sh @@ -1,7 +1,7 @@ #!/bin/bash killall -q aplay arecord -python -m amodem.calib send & +python -m calib send & SENDER_PID=$! -python -m amodem.calib recv +python -m calib recv kill -INT $SENDER_PID diff --git a/scripts/calib.py b/scripts/calib.py new file mode 100755 index 0000000..f969e4b --- /dev/null +++ b/scripts/calib.py @@ -0,0 +1,9 @@ +from amodem import calib + +import argparse +p = argparse.ArgumentParser() +sub = p.add_subparsers() +sub.add_parser('send').set_defaults(func=calib.send) +sub.add_parser('recv').set_defaults(func=calib.recv) +args = p.parse_args() +args.func()