Skip to content

Commit

Permalink
remove dodging from stirring, small updateS
Browse files Browse the repository at this point in the history
  • Loading branch information
CamDavidsonPilon committed Nov 27, 2024
1 parent c3e1505 commit b4117c8
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/custopize.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: |
mkdir -p build
cd build
wget https://downloads.raspberrypi.com/raspios_lite_armhf/images/raspios_lite_armhf-2024-10-28/2024-10-22-raspios-bookworm-armhf-lite.img.xz -q -O input.img.xz
wget https://downloads.raspberrypi.com/raspios_lite_armhf/images/raspios_lite_armhf-2024-11-19/2024-11-19-raspios-bookworm-armhf-lite.img.xz -q -O input.img.xz
unxz -f input.img.xz
- name: "📝 Prepare release"
run: |
Expand Down
2 changes: 1 addition & 1 deletion workspace/scripts/06-install-pioreactor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ if [ "$LEADER" == "1" ]; then
sudo apt-get install sshpass
sudo -u $USERNAME cp /files/pioreactor/config.example.ini $PIO_DIR/config.ini

sudo -U $USERNAME mkdir -p $PIO_DIR/exportable_datasets
sudo -u $USERNAME mkdir -p $PIO_DIR/exportable_datasets
sudo -u $USERNAME cp /files/pioreactor/exportable_datasets/*.yaml $PIO_DIR/exportable_datasets/


Expand Down
7 changes: 6 additions & 1 deletion workspace/scripts/files/bash/install_pioreactor_plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function download_and_check_if_leader_only {


if [ -n "$source" ]; then
sudo pip3 install --force-reinstall --no-index "$source"
sudo pip3 install --force-reinstall "$source"
else
if download_and_check_if_leader_only $clean_plugin_name_with_dashes; then
if [ "$am_i_leader" = true ]; then
Expand Down Expand Up @@ -95,6 +95,11 @@ if [ "$am_i_leader" = true ]; then
rsync -a "$install_folder/ui/contrib/" /home/pioreactor/.pioreactor/plugins/ui/contrib/
fi

# merge datasets contribs
if [ -d "$install_folder/exportable_datasets/" ]; then
rsync -a "$install_folder/exportable_datasets/" /home/pioreactor/.pioreactor/plugins/exportable_datasets/
fi

# broadcast to cluster, don't crap out if we can't sync to a worker.
pios sync-configs --shared || :
fi
Expand Down
4 changes: 3 additions & 1 deletion workspace/scripts/files/bash/uninstall_pioreactor_plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ fi


if [ "$leader_hostname" == "$(hostname)" ]; then
# delete yamls from pioreactorui
# delete yamls from ui
(cd "$install_folder"/ui/contrib/ && find ./ -type f) | awk '{print "/home/pioreactor/.pioreactor/plugins/ui/contrib/"$1}' | xargs rm
# delete yamls from datasets
(cd "$install_folder"/exportable_datasets/ && find ./ -type f) | awk '{print "/home/pioreactor/.pioreactor/plugins/exportable_datasetss/"$1}' | xargs rm

# TODO: remove sections from config.ini
# this is complicated because sometimes we edit sections, instead of adding full sections. Ex: we edit [PWM] in relay plugin.
Expand Down
9 changes: 4 additions & 5 deletions workspace/scripts/files/pioreactor/config.example.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ initial_duty_cycle=30
pwm_hz=200
use_rpm=1
duration_between_updates_seconds=23
post_delay_duration=0.25
pre_delay_duration=2.0
enable_dodging_od=False


[od_reading.config]
# how many optical density measurements should be published per second? Recommended maximum is 1.
Expand Down Expand Up @@ -90,14 +88,15 @@ console_log_level=DEBUG
# See docs: https://docs.pioreactor.com/user-guide/create-cluster
leader_hostname=

# something like: leadername.local or an IPv4 address
# something like: leadername.local or a static IPv4 address
leader_address=

[cluster.addresses]
# You can add (static) IPv4 addresses here for other Pioreactors in the cluster. This will bypass mDNS. Example:
# You can add static IPv4 addresses here for other Pioreactors in the cluster. This will bypass mDNS. Example:
# pio01_address=10.42.0.1
# pio02_address=10.42.0.3
# The leader's address is automatically added.
# If addresses aren't present, mDNS will be used -> query for <hostname>.local on the network.


[mqtt]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dataset_name: pioreactor_unit_activity_data
default_order_by: timestamp
description: This dataset includes most of your experiment data, including the time
series of OD metrics, temperature, stirring rates, LED updates, and dosings.
series of OD metrics, temperature, stirring rates, LED updates, and dosings. See also "Pioreactor unit activity data roll-up" for a rolled-up version of this dataset.
display_name: Pioreactor unit activity data (recommended)
has_experiment: true
has_unit: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ table: pioreactor_unit_activity_data_rollup
timestamp_columns:
- timestamp
description: This dataset is a rolled-up version of Pioreactor unit activity data (above) aggregated to the minute level. This is useful for reducing the size of the exported dataset.
display_name: Pioreactor unit activity data roll-up (recommended)
display_name: Pioreactor unit activity data roll-up
always_partition_by_unit: true

0 comments on commit b4117c8

Please sign in to comment.