diff --git a/amodem/scripts/auto-calib.sh b/scripts/auto-calib.sh similarity index 56% rename from amodem/scripts/auto-calib.sh rename to scripts/auto-calib.sh index af47cc2..d97687d 100755 --- a/amodem/scripts/auto-calib.sh +++ b/scripts/auto-calib.sh @@ -1,7 +1,7 @@ #!/bin/bash killall -q aplay arecord -./calib.py send & +python -m amodem.calib send & SENDER_PID=$! -./calib.py recv +python -m amodem.calib recv kill -INT $SENDER_PID diff --git a/amodem/scripts/profile.sh b/scripts/profile.sh similarity index 100% rename from amodem/scripts/profile.sh rename to scripts/profile.sh diff --git a/amodem/scripts/test.sh b/scripts/test.sh similarity index 78% rename from amodem/scripts/test.sh rename to scripts/test.sh index f97bb2b..0e9b640 100755 --- a/amodem/scripts/test.sh +++ b/scripts/test.sh @@ -32,20 +32,20 @@ run_src dd if=/dev/urandom of=$TEST_DIR/data.send bs=125kB count=1 status=none SRC_HASH=`run_src sha256sum $TEST_DIR/data.send` # modulate data into audio file -run_src "./send.py <$TEST_DIR/data.send >$TEST_DIR/audio.send" +run_src "python -m amodem.send -i $TEST_DIR/data.send -o $TEST_DIR/audio.send" # stop old recording and start a new one run_src killall -q aplay || true run_dst killall -q arecord || true -run_dst "./wave.py record $TEST_DIR/audio.recv" & +run_dst "python -m amodem.wave record $TEST_DIR/audio.recv" & sleep 1 # let audio.recv be filled # play the modulated data -run_src ./wave.py play $TEST_DIR/audio.send & +run_src "python -m amodem.wave play $TEST_DIR/audio.send" & # start the receiever -run_dst "./recv.py <$TEST_DIR/audio.recv >$TEST_DIR/data.recv" +run_dst "python -m amodem.recv -i $TEST_DIR/audio.recv -o $TEST_DIR/data.recv" # stop recording after playing is over run_src killall -q aplay || true