From 13519d90e40e43b9aa2a7075b29ab6c37f2a4a24 Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Mon, 26 Feb 2024 14:34:41 -0800 Subject: [PATCH 1/4] Add default config file for v2.6 hardware --- .../default-configs/v2.6.config.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 software/node-red-dashboard/default-configs/v2.6.config.json diff --git a/software/node-red-dashboard/default-configs/v2.6.config.json b/software/node-red-dashboard/default-configs/v2.6.config.json new file mode 100644 index 000000000..109472ec6 --- /dev/null +++ b/software/node-red-dashboard/default-configs/v2.6.config.json @@ -0,0 +1,20 @@ +{ + "sample_project": "Project's name", + "sample_id": 1, + "sample_ship": "Vessel name", + "sample_operator": "Operator's name", + "sample_sampling_gear": "net", + "sample_gear_net_opening": 40, + "acq_id": 1, + "acq_instrument": "PlanktoScope v2.6", + "acq_celltype": 300, + "acq_minimum_mesh": 10, + "acq_maximum_mesh": 200, + "acq_volume": 1, + "object_depth_min": 1, + "object_depth_max": 2, + "process_id": 1, + "nb_frame": 100, + "sleep_before": 0.5, + "imaging_pump_volume": 0.01 +} From 909b8026c8030dca8349288061945cf13afac6af Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Mon, 26 Feb 2024 14:35:06 -0800 Subject: [PATCH 2/4] Bump pallet-standard --- software/distro/setup/base-os/forklift/install.sh | 2 +- .../setup/planktoscope-app-env/python-backend/install.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/software/distro/setup/base-os/forklift/install.sh b/software/distro/setup/base-os/forklift/install.sh index aa22b0c4d..dbe467d37 100755 --- a/software/distro/setup/base-os/forklift/install.sh +++ b/software/distro/setup/base-os/forklift/install.sh @@ -6,7 +6,7 @@ config_files_root=$(dirname $(realpath $BASH_SOURCE)) forklift_version="0.5.0" pallet_path="github.com/PlanktoScope/pallet-standard" -pallet_version="v2024.0.0-alpha.0" +pallet_version="29288ca" curl -L "https://github.com/PlanktoScope/forklift/releases/download/v$forklift_version/forklift_${forklift_version}_linux_arm.tar.gz" \ | sudo tar -C /usr/bin -xz forklift diff --git a/software/distro/setup/planktoscope-app-env/python-backend/install.sh b/software/distro/setup/planktoscope-app-env/python-backend/install.sh index cf7ab3b57..1d0ca21ac 100755 --- a/software/distro/setup/planktoscope-app-env/python-backend/install.sh +++ b/software/distro/setup/planktoscope-app-env/python-backend/install.sh @@ -62,6 +62,6 @@ cp -r "$repo_root/$directory" $HOME/PlanktoScope/$directory # Set up the segmenter # TODO: give forklift some way to make these directories ahead-of-time! -mkdir -p $HOME/device-backend-logs/processing/segmenter -mkdir -p $HOME/data/img -mkdir -p $HOME/data/export +# mkdir -p $HOME/device-backend-logs/processing/segmenter +# mkdir -p $HOME/data/img +# mkdir -p $HOME/data/export From 39ea1ddd995c7bc1fb33fb532d304178874dd2e7 Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Mon, 26 Feb 2024 19:49:25 -0800 Subject: [PATCH 3/4] Bump pallet-standard and forklift --- software/distro/setup/base-os/forklift/install.sh | 4 ++-- .../setup/planktoscope-app-env/python-backend/install.sh | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/software/distro/setup/base-os/forklift/install.sh b/software/distro/setup/base-os/forklift/install.sh index dbe467d37..27d794d00 100755 --- a/software/distro/setup/base-os/forklift/install.sh +++ b/software/distro/setup/base-os/forklift/install.sh @@ -4,9 +4,9 @@ # distribution config_files_root=$(dirname $(realpath $BASH_SOURCE)) -forklift_version="0.5.0" +forklift_version="0.5.3" pallet_path="github.com/PlanktoScope/pallet-standard" -pallet_version="29288ca" +pallet_version="b1dd05d" curl -L "https://github.com/PlanktoScope/forklift/releases/download/v$forklift_version/forklift_${forklift_version}_linux_arm.tar.gz" \ | sudo tar -C /usr/bin -xz forklift diff --git a/software/distro/setup/planktoscope-app-env/python-backend/install.sh b/software/distro/setup/planktoscope-app-env/python-backend/install.sh index 1d0ca21ac..723b07dc5 100755 --- a/software/distro/setup/planktoscope-app-env/python-backend/install.sh +++ b/software/distro/setup/planktoscope-app-env/python-backend/install.sh @@ -59,9 +59,3 @@ cp "$HOME/device-backend/default-configs/$hardware_type-latest.hardware.json" \ mkdir -p $HOME/PlanktoScope/scripts directory="scripts/raspimjpeg" cp -r "$repo_root/$directory" $HOME/PlanktoScope/$directory - -# Set up the segmenter -# TODO: give forklift some way to make these directories ahead-of-time! -# mkdir -p $HOME/device-backend-logs/processing/segmenter -# mkdir -p $HOME/data/img -# mkdir -p $HOME/data/export From 7287bfebbea31d68c2d0b8a8de3fbdfb08b3004f Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Mon, 26 Feb 2024 19:56:05 -0800 Subject: [PATCH 4/4] Update `CHANGELOG.md` --- software/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/software/CHANGELOG.md b/software/CHANGELOG.md index f82a38797..571ff8007 100644 --- a/software/CHANGELOG.md +++ b/software/CHANGELOG.md @@ -9,6 +9,10 @@ All dates in this file are given in the [UTC time zone](https://en.wikipedia.org ## Unreleased +### Fixed + +- (Application: backend) The segmenter should no longer have file permissions errors when trying to read or write files in directories created by Docker or by the Python hardware controller. + ## v2024.0.0-alpha.0 - 2024-02-06 ### Added