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

Code editting (mostly remaining_time -> remaining_duration)

parent 7c063c15
No related branches found
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
......@@ -242,7 +242,7 @@ bool SyringeFilled :: is_running () //return true if the motor is currently run
void SyringeFilled :: start_exchange()
/***
-Argument : / (We're using informations stored in the class itself)
-Argument : / (We're using informations stored in the json file itself)
-Return : /
-Action : Move the syringe filled to deliver or recover the volume expected
***/
......
......@@ -53,7 +53,6 @@ void Web :: web_setup()
ESPUI.setElementStyle(ESPUI.addControl(Label, "", "", None, calibration), small_line_space);
//fast_backward = ESPUI.button("Initialisation", [&](Control* sender, int value){fast_backward_callback(sender, value);}, ControlColor::None, "\u2BC7 \u2BC7");
fast_backward = ESPUI.addControl(ControlType::Button, "Initialisation", "\u2BC7 \u2BC7", ControlColor::None, calibration, [&](Control* sender, int value){fast_backward_callback(sender, value);});
slow_backward = ESPUI.addControl(ControlType::Button, "Initialisation", "\u2BC7", ControlColor::None, calibration, [&](Control* sender, int value){slow_backward_callback(sender, value);});
slow_forward = ESPUI.addControl(ControlType::Button, "Initialisation", "\u2BC8", ControlColor::None, calibration, [&](Control* sender, int value){slow_forward_callback(sender, value);});
......@@ -93,8 +92,8 @@ void Web :: web_setup()
//Remaning_values
label_remaining_volume_mL = ESPUI.label("Caractéristiques de l'échange en cours", ControlColor::None, "Volume restant en mL");
remaining_volume_mL = ESPUI.addControl(ControlType::Slider, "Volume", "0", ControlColor::None, label_remaining_volume_mL, [&](Control* sender, int value){remaining_volume_mL_callback(sender, value);});
label_remaining_time_sec = ESPUI.addControl( ControlType::Label, "Caractéristiques de l'échange en cours", "Temps restant en sec", ControlColor::None, label_remaining_volume_mL);
remaining_time_sec = ESPUI.addControl(ControlType::Slider, "Temps", "0", ControlColor::None, label_remaining_volume_mL, [&](Control* sender, int value){remaining_time_sec_callback(sender, value);});
label_remaining_duration_sec = ESPUI.addControl( ControlType::Label, "Caractéristiques de l'échange en cours", "Temps restant en sec", ControlColor::None, label_remaining_volume_mL);
remaining_duration_sec = ESPUI.addControl(ControlType::Slider, "Temps", "0", ControlColor::None, label_remaining_volume_mL, [&](Control* sender, int value){remaining_duration_sec_callback(sender, value);});
ESPUI.sliderContinuous = true;
......@@ -880,8 +879,8 @@ void Web :: set_initial_style()
style (label_remaining_volume_mL, 3);
style (remaining_volume_mL, 3);
style (label_remaining_time_sec, 3);
style (remaining_time_sec, 3);
style (label_remaining_duration_sec, 3);
style (remaining_duration_sec, 3);
//configurations
......
......@@ -35,8 +35,8 @@ private :
uint16_t volume_exchange_mL_label, volume_exchange_mL, exchange_throughtput_uL_per_min_or_duration_sec_label, exchange_throughtput_uL_per_min_or_duration_sec, throughput_or_duration, label_push_pull_choice, switch_push_pull_choice, start_exchange;
uint16_t label_remaining_volume_mL, label_remaining_time_sec;
uint16_t remaining_volume_mL, remaining_time_sec;
uint16_t label_remaining_volume_mL, label_remaining_duration_sec;
uint16_t remaining_volume_mL, remaining_duration_sec, remaining_duration_sec_value;
//Configurations
uint16_t syringe_selection, syringe_ref, syringe_brand, syringe_volume_mL, syringe_diameter_mm, initial_volume_mL_label, initial_volume_mL, choose_syringe, load_syringe_json;
......@@ -97,7 +97,7 @@ uint16_t get_id_status_limit_switch();
void throughput_or_duration_callback (Control *sender, int type);
void switch_push_pull_choice_callback (Control* sender, int value);
void remaining_volume_mL_callback (Control* sender, int value);
void remaining_time_sec_callback (Control* sender, int value);
void remaining_duration_sec_callback (Control* sender, int value);
void start_exchange_callback (Control* sender, int value);
//Configurations
......
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