Skip to content
Snippets Groups Projects
Commit 22fb08c2 authored by Malaurie Bernard's avatar Malaurie Bernard
Browse files

Add a limit switch status indication and using syringe_pump_off istaed of...

Add a limit switch status indication and using syringe_pump_off istaed of syringige_filled.move so the visual change a the same time
parent 6b9fe666
No related branches found
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
...@@ -151,7 +151,7 @@ void Motor :: move_to_mm (float mm) ...@@ -151,7 +151,7 @@ void Motor :: move_to_mm (float mm)
Serial.printf("# moving to %g mm / %g steps\n", Serial.printf("# moving to %g mm / %g steps\n",
mm, mm,
mm_to_step(mm)); mm_to_step(mm));
move_step(mm_to_step(mm)); move_to_step(mm_to_step(mm));
} }
......
...@@ -27,6 +27,8 @@ void web_setup () ...@@ -27,6 +27,8 @@ void web_setup ()
ESPUI.addControl(ControlType::Separator, "", "", ControlColor::None); ESPUI.addControl(ControlType::Separator, "", "", ControlColor::None);
//***Limit-switch***//
status_limit_switch = ESPUI.label("Etat du capteur de fin de course:", ControlColor::None, "Off");
//***Initialisation***// //***Initialisation***//
calibration = ESPUI.button("Callibration", calibration_callback, ControlColor::None, "\u21E4"); calibration = ESPUI.button("Callibration", calibration_callback, ControlColor::None, "\u21E4");
...@@ -221,7 +223,7 @@ void fast_backward_callback (Control *sender, int type) ...@@ -221,7 +223,7 @@ void fast_backward_callback (Control *sender, int type)
case B_UP: case B_UP:
syringe_filled.stop(); syringe_pump_off();
break; break;
} }
...@@ -254,7 +256,7 @@ void fast_forward_callback (Control *sender, int type) ...@@ -254,7 +256,7 @@ void fast_forward_callback (Control *sender, int type)
case B_UP: case B_UP:
syringe_filled.stop(); syringe_pump_off();
break; break;
} }
...@@ -285,7 +287,7 @@ void slow_backward_callback (Control *sender, int type) ...@@ -285,7 +287,7 @@ void slow_backward_callback (Control *sender, int type)
case B_UP: case B_UP:
syringe_filled.stop(); syringe_pump_off();
break; break;
} }
...@@ -316,7 +318,7 @@ void slow_forward_callback (Control *sender, int type) ...@@ -316,7 +318,7 @@ void slow_forward_callback (Control *sender, int type)
case B_UP: case B_UP:
syringe_filled.stop(); syringe_pump_off();
break; break;
} }
...@@ -791,6 +793,10 @@ void set_init_style() ...@@ -791,6 +793,10 @@ void set_init_style()
style (status_syringe_filled, 2); style (status_syringe_filled, 2);
style (syringe_filled_placement, 2); style (syringe_filled_placement, 2);
style (status_limit_switch, 1);
style (calibration, 1); style (calibration, 1);
style (fast_forward, 3); style (fast_forward, 3);
style (fast_backward, 3); style (fast_backward, 3);
......
...@@ -24,6 +24,8 @@ uint16_t stop_syringe_pump; ...@@ -24,6 +24,8 @@ uint16_t stop_syringe_pump;
int status_syringe_filled; int status_syringe_filled;
uint16_t syringe_filled_placement; uint16_t syringe_filled_placement;
int status_limit_switch;
uint16_t calibration, fast_backward, fast_forward, slow_backward, slow_forward; uint16_t calibration, fast_backward, fast_forward, slow_backward, slow_forward;
uint16_t volume_exchange_mL_label, volume_exchange_mL, exchange_throughtput_uL_per_sec_label, exchange_throughtput_uL_per_sec, label_push_pull_choice, switch_push_pull_choice, start_exchange; uint16_t volume_exchange_mL_label, volume_exchange_mL, exchange_throughtput_uL_per_sec_label, exchange_throughtput_uL_per_sec, label_push_pull_choice, switch_push_pull_choice, start_exchange;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment