From 2dadb016344ee2afc455655a90ec5cb217daf8cc Mon Sep 17 00:00:00 2001 From: tpollina Date: Sat, 14 Dec 2019 01:33:17 -0800 Subject: [PATCH] Add files via upload --- scripts/fan.py | 10 +++------- scripts/image.py | 4 ++-- scripts/kill_image.sh | 11 +++++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/fan.py b/scripts/fan.py index ac2728b..c4c65d9 100644 --- a/scripts/fan.py +++ b/scripts/fan.py @@ -9,15 +9,11 @@ bus = smbus.SMBus(1) DEVICE_ADDRESS = 0x0d def fan(state): - if state == 'off': + if state == "false": bus.write_byte_data(DEVICE_ADDRESS, 0x08, 0x00) bus.write_byte_data(DEVICE_ADDRESS, 0x08, 0x00) - if state == 'on': + if state == "true": bus.write_byte_data(DEVICE_ADDRESS, 0x08, 0x01) bus.write_byte_data(DEVICE_ADDRESS, 0x08, 0x01) -fan(state) - - - - +fan(state) \ No newline at end of file diff --git a/scripts/image.py b/scripts/image.py index f538864..ca2663c 100644 --- a/scripts/image.py +++ b/scripts/image.py @@ -23,10 +23,10 @@ sample_id = str(sys.argv[3]) acq_id = str(sys.argv[4]) #[i] : ex:24ml -volume = int(sys.argv[5]) +volume = 24 #[f] : ex:3.2ml/min -flowrate = float(sys.argv[6]) +flowrate = float(sys.argv[5]) warm_up_duration=3 diff --git a/scripts/kill_image.sh b/scripts/kill_image.sh index 65a2da9..b4b4f50 100644 --- a/scripts/kill_image.sh +++ b/scripts/kill_image.sh @@ -3,10 +3,13 @@ #In order to kill an on going acquisition, type this command #bash $HOME/PlanktonScope/scripts/kill_image.sh image.py sample_project sample_id acq_id -sample_project=$1 -sample_id=$2 -acq_id=$3 +in_path=$1 +sample_project=$2 +sample_id=$3 +acq_id=$4 kill -9 `ps ax | grep "image.py" | head -1 | awk '{print $1}'` -rm -r $HOME/PlanktonScope/acquisitions/$sample_project/$sample_id/$acq_id +rm -r $in_path/$sample_project/$sample_id/$acq_id +bash $HOME/RPi_Cam_Web_Interface/start.sh +