From 31df098fa8f48d9ce7813ecac7c01ec2d161ef76 Mon Sep 17 00:00:00 2001
From: Satu Koskinen <satu.a.koskinen@gmail.com>
Date: Tue, 4 Oct 2022 21:24:42 +0300
Subject: [PATCH] Clean up

---
 configuration/hydrophonitor-config.txt        |  2 +-
 data/depth/2022-09-03T17-55-58_depth_data.csv | 43 ----------------
 data/depth/2022-09-03T18-01-18_depth_data.csv | 49 -------------------
 data/depth/2022-09-04T11-50-21_depth_data.csv | 17 -------
 data/depth/2022-09-04T11-56-09_depth_data.csv |  7 ---
 data/gps/2022-08-20T12-23-39_GPS_data.csv     | 11 -----
 scripts/start-all.sh                          |  4 +-
 scripts/start-audio.sh                        |  6 +--
 scripts/start-gps.sh                          |  7 +--
 scripts/start-pressure-depth.sh               |  4 +-
 10 files changed, 11 insertions(+), 139 deletions(-)
 delete mode 100644 data/depth/2022-09-03T17-55-58_depth_data.csv
 delete mode 100644 data/depth/2022-09-03T18-01-18_depth_data.csv
 delete mode 100644 data/depth/2022-09-04T11-50-21_depth_data.csv
 delete mode 100644 data/depth/2022-09-04T11-56-09_depth_data.csv
 delete mode 100644 data/gps/2022-08-20T12-23-39_GPS_data.csv

diff --git a/configuration/hydrophonitor-config.txt b/configuration/hydrophonitor-config.txt
index 008aa7f..96eba0f 100644
--- a/configuration/hydrophonitor-config.txt
+++ b/configuration/hydrophonitor-config.txt
@@ -15,7 +15,7 @@ DEPTH_INTERVAL=5
 
 # Output location
 
-TRY_MOUNT_SSD="true"
+TRY_MOUNT_SSD=true
 
 DEFAULT_BASE_DIR_PATH=/home/pi/recordings
 BASE_DIR_PATH=/home/pi/data
diff --git a/data/depth/2022-09-03T17-55-58_depth_data.csv b/data/depth/2022-09-03T17-55-58_depth_data.csv
deleted file mode 100644
index 51e0d0c..0000000
--- a/data/depth/2022-09-03T17-55-58_depth_data.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-time and date, Voltage of depth sensor (V), Depth (m)
-2022-09-03T17:55:58,0.714,-0.13
-2022-09-03T17:56:01,0.714,-0.13
-2022-09-03T17:56:04,0.714,-0.19
-2022-09-03T17:56:07,0.714,-0.19
-2022-09-03T17:56:10,0.714,-0.19
-2022-09-03T17:56:13,0.714,-0.13
-2022-09-03T17:56:16,0.714,-0.19
-2022-09-03T17:56:19,0.716,-0.19
-2022-09-03T17:56:22,0.714,-0.13
-2022-09-03T17:56:25,0.714,-0.19
-2022-09-03T17:56:28,0.714,-0.19
-2022-09-03T17:56:31,0.714,-0.19
-2022-09-03T17:56:34,0.714,-0.19
-2022-09-03T17:56:37,0.714,-0.13
-2022-09-03T17:56:40,0.714,-0.13
-2022-09-03T17:56:43,0.714,-0.19
-2022-09-03T17:56:46,0.716,-0.13
-2022-09-03T17:56:49,0.714,-0.13
-2022-09-03T17:56:52,0.714,-0.13
-2022-09-03T17:56:55,0.716,-0.19
-2022-09-03T17:56:59,0.714,-0.19
-2022-09-03T17:57:02,0.714,-0.19
-2022-09-03T17:57:05,0.716,-0.13
-2022-09-03T17:57:08,0.714,-0.13
-2022-09-03T17:57:11,0.714,-0.19
-2022-09-03T17:57:14,0.714,-0.13
-2022-09-03T17:57:17,0.894,5.48
-2022-09-03T17:57:20,0.986,8.54
-2022-09-03T17:57:23,0.988,8.47
-2022-09-03T17:57:26,1.368,20.58
-2022-09-03T17:57:29,1.354,20.26
-2022-09-03T17:57:32,0.714,-0.19
-2022-09-03T17:57:35,0.716,-0.13
-2022-09-03T17:57:38,0.714,-0.19
-2022-09-03T17:57:41,0.714,-0.19
-2022-09-03T17:57:44,0.714,-0.19
-2022-09-03T17:57:47,0.716,-0.19
-2022-09-03T17:57:50,0.714,-0.19
-2022-09-03T17:57:53,0.714,-0.13
-2022-09-03T17:57:56,0.714,-0.13
-2022-09-03T17:57:59,0.714,-0.19
-2022-09-03T17:58:02,0.714,-0.13
diff --git a/data/depth/2022-09-03T18-01-18_depth_data.csv b/data/depth/2022-09-03T18-01-18_depth_data.csv
deleted file mode 100644
index 60e093b..0000000
--- a/data/depth/2022-09-03T18-01-18_depth_data.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-time and date, Voltage of depth sensor (V), Depth (m)
-2022-09-03T18:01:18,0.716,-0.13
-2022-09-03T18:01:21,0.716,-0.13
-2022-09-03T18:01:24,0.714,-0.19
-2022-09-03T18:01:27,0.716,-0.13
-2022-09-03T18:01:30,0.714,-0.19
-2022-09-03T18:01:33,0.716,-0.13
-2022-09-03T18:01:36,0.716,-0.13
-2022-09-03T18:01:39,0.716,-0.13
-2022-09-03T18:01:42,0.716,-0.13
-2022-09-03T18:01:45,0.714,-0.19
-2022-09-03T18:01:48,0.714,-0.19
-2022-09-03T18:01:51,0.714,-0.19
-2022-09-03T18:01:54,0.714,-0.19
-2022-09-03T18:01:57,0.716,-0.13
-2022-09-03T18:02:00,0.716,-0.13
-2022-09-03T18:02:03,0.714,-0.19
-2022-09-03T18:02:06,0.714,-0.19
-2022-09-03T18:02:09,0.714,-0.19
-2022-09-03T18:02:12,0.714,-0.19
-2022-09-03T18:02:15,0.714,-0.19
-2022-09-03T18:02:18,0.716,-0.13
-2022-09-03T18:02:21,0.716,-0.13
-2022-09-03T18:02:24,0.714,-0.19
-2022-09-03T18:02:27,0.714,-0.19
-2022-09-03T18:02:30,0.714,-0.19
-2022-09-03T18:02:33,0.714,-0.19
-2022-09-03T18:02:36,0.714,-0.19
-2022-09-03T18:02:39,0.716,-0.13
-2022-09-03T18:02:42,0.714,-0.19
-2022-09-03T18:02:45,0.714,-0.19
-2022-09-03T18:02:48,0.714,-0.19
-2022-09-03T18:02:51,0.714,-0.19
-2022-09-03T18:02:54,0.714,-0.19
-2022-09-03T18:02:57,0.714,-0.19
-2022-09-03T18:03:00,0.714,-0.19
-2022-09-03T18:03:03,0.714,-0.19
-2022-09-03T18:03:06,0.714,-0.19
-2022-09-03T18:03:09,0.714,-0.19
-2022-09-03T18:03:12,0.714,-0.19
-2022-09-03T18:03:15,0.714,-0.19
-2022-09-03T18:03:18,0.716,-0.13
-2022-09-03T18:03:21,0.716,-0.13
-2022-09-03T18:03:24,0.714,-0.19
-2022-09-03T18:03:27,0.716,-0.13
-2022-09-03T18:03:30,0.714,-0.19
-2022-09-03T18:03:33,0.714,-0.19
-2022-09-03T18:03:36,0.714,-0.19
-2022-09-03T18:03:39,0.714,-0.19
diff --git a/data/depth/2022-09-04T11-50-21_depth_data.csv b/data/depth/2022-09-04T11-50-21_depth_data.csv
deleted file mode 100644
index 7998f67..0000000
--- a/data/depth/2022-09-04T11-50-21_depth_data.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-time and date, Voltage of depth sensor (V), Depth (m)
-2022-09-04T11:50:21,0.716,-0.13
-2022-09-04T11:50:24,0.716,-0.13
-2022-09-04T11:50:27,0.716,-0.13
-2022-09-04T11:50:31,1.12,12.74
-2022-09-04T11:50:34,0.716,-0.13
-2022-09-04T11:50:37,1.074,11.28
-2022-09-04T11:50:40,1.154,13.82
-2022-09-04T11:50:43,0.716,-0.13
-2022-09-04T11:50:46,1.034,10.0
-2022-09-04T11:50:49,1.234,16.37
-2022-09-04T11:50:52,1.212,15.67
-2022-09-04T11:50:55,0.714,-0.19
-2022-09-04T11:50:58,0.716,-0.13
-2022-09-04T11:51:01,0.716,-0.13
-2022-09-04T11:51:04,0.716,-0.13
-2022-09-04T11:51:07,0.716,-0.13
diff --git a/data/depth/2022-09-04T11-56-09_depth_data.csv b/data/depth/2022-09-04T11-56-09_depth_data.csv
deleted file mode 100644
index f021fa0..0000000
--- a/data/depth/2022-09-04T11-56-09_depth_data.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-time and date, Voltage of depth sensor (V), Depth (m)
-2022-09-04T11:56:09,0.716,-0.13
-2022-09-04T11:56:12,0.716,-0.13
-2022-09-04T11:56:15,0.716,-0.13
-2022-09-04T11:56:18,0.716,-0.13
-2022-09-04T11:56:21,0.716,-0.13
-2022-09-04T11:56:24,0.716,-0.13
diff --git a/data/gps/2022-08-20T12-23-39_GPS_data.csv b/data/gps/2022-08-20T12-23-39_GPS_data.csv
deleted file mode 100644
index 525378d..0000000
--- a/data/gps/2022-08-20T12-23-39_GPS_data.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-GPStime utc,latitude,longitude,speed,sats in view
-2022-08-20T09:23:40.000Z,60.196451148,24.960462239,0.582,0
-2022-08-20T09:23:41.000Z,60.196446687,24.960462239,0.374,0
-2022-08-20T09:23:42.000Z,60.196437765,24.960462239,0.257,7
-2022-08-20T09:23:43.000Z,60.196441539,24.960486191,0.192,7
-2022-08-20T09:23:44.000Z,60.196441539,24.960486191,0.121,7
-2022-08-20T09:23:45.000Z,60.196437078,24.960486191,0.279,7
-2022-08-20T09:23:46.000Z,60.196439678,24.960493798,0.233,7
-2022-08-20T09:23:47.000Z,60.196439678,24.960493798,0.059,7
-2022-08-20T09:23:48.000Z,60.196439678,24.960493798,0.124,7
-2022-08-20T09:23:49.000Z,60.196446739,24.960501406,0.369,7
diff --git a/scripts/start-all.sh b/scripts/start-all.sh
index 04a5905..905e206 100755
--- a/scripts/start-all.sh
+++ b/scripts/start-all.sh
@@ -5,13 +5,11 @@
 
 # Create output directory
 OUTPUT_DIR=$BASE_DIR_PATH/$(date +"%Y-%m-%d_%H-%M-%S_output")
-
 mkdir -p $OUTPUT_DIR/audio
 
+# Sleep for a little to wait for GPS and sound card to be ready
 sleep 10
 
-# (export OUTPUT_DIR=$OUTPUT_DIR; trap 'kill 0' SIGINT; /home/pi/hydrophonitor/scripts/scripts/start-gps.sh & /home/pi/hydrophonitor/scripts/start-audio.sh & /home/pi/hydrophonitor/scripts/start-pressure-depth.sh)
-
 echo "(export OUTPUT_DIR=$OUTPUT_DIR; /home/pi/hydrophonitor/scripts/start-audio.sh & /home/pi/hydrophonitor/scripts/start-gps.sh)" >> $OUTPUT_DIR/log.txt 2>&1
 
 (export OUTPUT_DIR=$OUTPUT_DIR; /home/pi/hydrophonitor/scripts/start-audio.sh & /home/pi/hydrophonitor/scripts/start-gps.sh) >> $OUTPUT_DIR/log.txt 2>&1
diff --git a/scripts/start-audio.sh b/scripts/start-audio.sh
index 4107bc0..858a3b3 100755
--- a/scripts/start-audio.sh
+++ b/scripts/start-audio.sh
@@ -3,7 +3,7 @@
 # Export the configuration values
 . /home/pi/hydrophonitor/scripts/export-config-values.sh
 
-AUDIO_TARGET_LOCATION="/home/pi/hydrophonitor/audio-logger/target/release"
+AUDIO_TARGET_PATH="/home/pi/hydrophonitor/audio-logger/target/release"
 AUDIO_TARGET_EXECUTABLE="audio"
 
 OPTIONS="rec \
@@ -15,6 +15,6 @@ OPTIONS="rec \
 --buffer-size 1024 \
 alsa"
 
-echo "cd $AUDIO_TARGET_LOCATION && ./$AUDIO_TARGET_EXECUTABLE $OPTIONS"
+echo "cd $AUDIO_TARGET_PATH && ./$AUDIO_TARGET_EXECUTABLE $OPTIONS"
 
-cd $AUDIO_TARGET_LOCATION && ./$AUDIO_TARGET_EXECUTABLE $OPTIONS
+cd $AUDIO_TARGET_PATH && ./$AUDIO_TARGET_EXECUTABLE $OPTIONS
diff --git a/scripts/start-gps.sh b/scripts/start-gps.sh
index e392daf..0afdc86 100755
--- a/scripts/start-gps.sh
+++ b/scripts/start-gps.sh
@@ -3,9 +3,10 @@
 # Export the configuration values
 . /home/pi/hydrophonitor/scripts/export-config-values.sh
 
-GPS_EXECUTABLE_LOCATION="/home/pi/hydrophonitor/gps-logger"
+GPS_EXECUTABLE_PATH="/home/pi/hydrophonitor/gps-logger"
+
 OPTIONS="--output $OUTPUT_DIR --interval $GPS_INTERVAL"
 
-echo "cd $GPS_EXECUTABLE_LOCATION && python record-gps.py $OPTIONS"
+echo "cd $GPS_EXECUTABLE_PATH && python record-gps.py $OPTIONS"
 
-cd $GPS_EXECUTABLE_LOCATION && python record-gps.py $OPTIONS
+cd $GPS_EXECUTABLE_PATH && python record-gps.py $OPTIONS
diff --git a/scripts/start-pressure-depth.sh b/scripts/start-pressure-depth.sh
index ac344c9..c2071b3 100644
--- a/scripts/start-pressure-depth.sh
+++ b/scripts/start-pressure-depth.sh
@@ -3,8 +3,8 @@
 # Export the configuration values
 . /home/pi/hydrophonitor/scripts/export-config-values.sh
 
-DEPTH_EXECUTABLE_LOCATION="/home/pi/hydrophonitor/depth-logger"
+DEPTH_EXECUTABLE_PATH="/home/pi/hydrophonitor/depth-logger"
 
 OPTIONS="--output $OUTPUT_DIR --interval $DEPTH_INTERVAL"
 
-cd $DEPTH_TARGET_LOCATION && python record-depth.py $OPTIONS
+cd $DEPTH_EXECUTABLE_PATH && python record-depth.py $OPTIONS