From eb2a077eb7e0a3a11d0c0347150093b5e70e6479 Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Sun, 3 May 2026 10:37:30 -0700 Subject: [PATCH 1/5] Update ValveCalibration widget UI --- src/Extensions/ValveUi.bonsai | 1080 +++++++++++++++++++++++++-------- 1 file changed, 825 insertions(+), 255 deletions(-) diff --git a/src/Extensions/ValveUi.bonsai b/src/Extensions/ValveUi.bonsai index eca3dd8..9d5ef66 100644 --- a/src/Extensions/ValveUi.bonsai +++ b/src/Extensions/ValveUi.bonsai @@ -2,8 +2,8 @@ @@ -12,243 +12,373 @@ ValveGui - - true - true - true - true - false - - - - - - RunCalibration - true - true - RunCalibration - - - RunCalibration - - - - - - - false - - - - - 1 - - - - ValveFlushState - - - - - - - - - Source1 - - - - - - - - - - - Close Valves - - - - - - - - Source1 - - - - - - - - - - - Open Valves - - - - - - - - - - - - FlushValves - true - true - Open Valves - false - - - ValveFlushState - - - - - - ExperimentState - - - - - - - - - ValveCalibration - true - true - 2 - 2 - - - - - - - - - - - RunCalibration - - - - 1 - - - - - - + + - - LoopValve + + Calibrate - - - false - - - 1 - + + IsRightTriggerCalibration - - isRightValve + + IsCalibrationRunning - isRightValve - - - + IsRightTriggerCalibration - - - PT0.5S - + + + false + - - + + IsCalibrationRunning - - 100 - + - double(it) + it.Item2? (Item1 ? "Calibrating Right valve..." : "Calibrating Left valve..."): "Ready to calibrate..." + + + + + + + + CalibrateDialog + true + true + Ready to calibrate... + + + + true + true + false + false + false + + + + true + true + 2 + 1 + + + + + + + IsCalibrationRunning - - + + + + + - - SetIsRightValveMs + + RunCalibrationLeft + true + true + ◀ Calibrate Left - - Item1 + + + + + Source1 + + + + false + + + + IsRightTriggerCalibration + + + + + + + + + - - GiveRewardRight + + + IsCalibrationRunning - - + + + + + + + + RunCalibrationRight + true + true + Calibrate Right ▶ + + + + + + Source1 + + + + true + + + + IsRightTriggerCalibration + + + + + + + + + + + + + true + true + 2 + 1 + + + + + + + CalibrateWidget + true + true + 1 + 2 + + + + Percent + 0.5 + + + Percent + 0.5 + + + + + + + IsRightTriggerCalibration - - 200 + + 1 + + + + + + LoopValve + + + + Source1 + + + + 1 + + + + isRightValve + + + + true + + + + + 1 + + + + IsCalibrationRunning + + + isRightValve + + + + + + + 100 + + + + double(it) + + + + + + SetIsRightValveMs + + + isRightValve + + + + + + + PT0.05S + PT0.25S + + + + + + + Item1 + + + GiveRewardRight + + + + + + + 200 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + false + - - Index + + IsCalibrationRunning + + + - - - - - - + + + + + - - + + - - - + + + + + + + + + + + + + + + + + + + + + - - - - - ValveFlushState + + + true + true + Calibration - + + Flush - - Source1 + + + false + + + + + 1 + + + + IsFlushingValveLeft + + + @@ -264,119 +394,559 @@ - - 0 - 2 + + ◀ Close Left + + + + + + Source1 + + + + + + + + - - PT0.1S + + ◀ Flush Left - + - - Item1 + + + + - - - 0 - + + FlushLeft + true + true + ◀ Flush Left + false + + + IsFlushingValveLeft + + + + + false + - - 500 + + 1 + + IsFlushingValveLeft + + + IsFlushingValveRight + - + - - SetIsRightValveMs + + + + + + + + + Source1 + + + + + + + - - PT0.02S + + ◀ Close Both ▶ - - Item1 + + + + + + Source1 + + + + + + + - - GiveRewardRight + + + ◀ Flush Both ▶ + - - PT0.5S + + + + + + + + + FlushBoth + true + true + ◀ Flush Both ▶ + false + + + Both!!! + + + + Source1 + + + IsFlushingValveLeft + + + IsFlushingValveRight + + + + + + + + + + + + + + false + + + + + 1 + + + + IsFlushingValveRight + + + + + + + + + Source1 + + + + + + + + + + + Close Right ▶ + + + + + + Source1 + + + + + + + + - - 300 + + Flush Right ▶ - + + + + + + + + + FlushRight + true + true + Flush Right ▶ + false + + + IsFlushingValveRight + + + + true + true + 3 + 1 + + + + + IsFlushingValveLeft + + + Flush + + + + Source1 + + + + + + + Source1 + + + + + + + + + + + PT0.1S + + + + + + + + false + + + + + 500 + + + + + + + SetIsRightValveMs + + + + PT0.02S + + + + Item1 + + + GiveRewardRight + + + + PT0.5S + + + + + 300 + + + + + + + + false + + + + IsFlushingValveLeft + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IsFlushingValveRight + + + Flush + + + + Source1 + + + + + + + Source1 + + + + + + + + + + + PT0.1S + + + + + + + + true + + + + + 500 + + + + + + + SetIsRightValveMs + + + + PT0.02S + + + + Item1 + + + GiveRewardRight + + + + PT0.5S + + + + + 300 + + + + + + + + false + + + + IsFlushingValveRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + true + true + Flushing + + + + ExperimentState + + + + + + + + + ValveCalibration + true + true + 1 + 2 + + + + Percent + 3 + + + Percent + 1.6 + + + + + + - + - + - - - - + + + - - + + - - - - - - - - - - - - - - - - From 21b8d798c120545c4cb8ffb793b1c5e4f72afc4e Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 13 May 2026 16:13:47 -0700 Subject: [PATCH 2/5] Close sequence if incoming value is False --- src/Extensions/ValveUi.bonsai | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Extensions/ValveUi.bonsai b/src/Extensions/ValveUi.bonsai index 9d5ef66..453396d 100644 --- a/src/Extensions/ValveUi.bonsai +++ b/src/Extensions/ValveUi.bonsai @@ -699,6 +699,11 @@ + + + 1 + + @@ -720,6 +725,7 @@ + @@ -809,6 +815,11 @@ + + + 1 + + @@ -830,6 +841,7 @@ + From 5ba88e022803d4699b78386097003f53718848d6 Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 13 May 2026 16:17:31 -0700 Subject: [PATCH 3/5] Add button to cancel calibration routine --- src/Extensions/ValveUi.bonsai | 73 ++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/src/Extensions/ValveUi.bonsai b/src/Extensions/ValveUi.bonsai index 453396d..289922e 100644 --- a/src/Extensions/ValveUi.bonsai +++ b/src/Extensions/ValveUi.bonsai @@ -55,11 +55,31 @@ CalibrateDialog - true + false true Ready to calibrate... + + Cancel Calibration + true + true + Cancel Calibration + + + CancelCalibration + + + + true + true + 1 + 2 + + + + + true true @@ -275,8 +295,14 @@ 200 + + CancelCalibration + - + + + + @@ -297,11 +323,16 @@ - - + + + + + + + false @@ -324,32 +355,38 @@ - + - - - - + + + + - + - - + + - - + + - + - - + + + - + + + + + + From e3b24fcc3cb6c2d8a762701e3bb0a29dc223ff9e Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 13 May 2026 16:22:42 -0700 Subject: [PATCH 4/5] Calibrate flush to 5mL --- src/Extensions/ValveUi.bonsai | 118 ++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 14 deletions(-) diff --git a/src/Extensions/ValveUi.bonsai b/src/Extensions/ValveUi.bonsai index 289922e..b39ba0f 100644 --- a/src/Extensions/ValveUi.bonsai +++ b/src/Extensions/ValveUi.bonsai @@ -717,6 +717,42 @@ PT0.5S + + + 5000 + + + + RigSchema + + + Calibration.WaterValveLeft + + + + + + RewardToTime + ((Item1 * 0.001) - Item2.Offset) / Item2.Slope + + + ToMilliseconds + + + + + 1000 + + + + DivideByEachOpen + Math.Ceiling(it / 500) + + + + + + 300 @@ -746,7 +782,7 @@ - + @@ -756,13 +792,22 @@ - - + + - - - - + + + + + + + + + + + + + @@ -833,6 +878,42 @@ PT0.5S + + + 5000 + + + + RigSchema + + + Calibration.WaterValveRight + + + + + + RewardToTime + ((Item1 * 0.001) - Item2.Offset) / Item2.Slope + + + ToMilliseconds + + + + + 1000 + + + + DivideByEachOpen + Math.Ceiling(it / 500) + + + + + + 300 @@ -862,7 +943,7 @@ - + @@ -872,13 +953,22 @@ - - + + - - - - + + + + + + + + + + + + + From f3e24dbf7143fbe01326e1e1d9d7298a1ef0ad0e Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Wed, 13 May 2026 16:25:15 -0700 Subject: [PATCH 5/5] Propagate visualizer --- src/Extensions/ValveUi.bonsai | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Extensions/ValveUi.bonsai b/src/Extensions/ValveUi.bonsai index b39ba0f..e4cc8a0 100644 --- a/src/Extensions/ValveUi.bonsai +++ b/src/Extensions/ValveUi.bonsai @@ -1068,9 +1068,7 @@ - - - +