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

Displays gestion and supression of a few unecessary sting in controls

parent c923875b
Branches
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
Show whitespace changes
Inline Side-by-side
web.cpp
+ 54
− 32
View file @ b11a645e
......@@ -43,6 +43,8 @@ void Web :: web_setup()
status_syringe_pump = ESPUI.label("Etat du pousse-seringue :", ControlColor::None, "A l'arrêt");
ESPUI.setElementStyle(ESPUI.addControl(Label, "", "", None, status_syringe_pump), line_break);
stop_syringe_pump = ESPUI.addControl(ControlType::Button, "Mise en marche", "\u26D4", ControlColor::None, status_syringe_pump, [&](Control* sender, int value){stop_syringe_pump_callback(sender, value);});
//***Syringe-filled***//
......@@ -61,14 +63,13 @@ void Web :: web_setup()
ESPUI.setElementStyle(ESPUI.addControl(Label, "", "", None, calibration), small_line_space);
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);});
fast_forward = ESPUI.addControl(ControlType::Button, "Initialisation", "\u2BC8 \u2BC8", ControlColor::None, calibration, [&](Control* sender, int value){fast_forward_callback(sender, value);});
slow_backward = ESPUI.addControl(ControlType::Button, "", "\u2BC7", ControlColor::None, calibration, [&](Control* sender, int value){slow_backward_callback(sender, value);});
slow_forward = ESPUI.addControl(ControlType::Button, "", "\u2BC8", ControlColor::None, calibration, [&](Control* sender, int value){slow_forward_callback(sender, value);});
fast_forward = ESPUI.addControl(ControlType::Button, "", "\u2BC8 \u2BC8", ControlColor::None, calibration, [&](Control* sender, int value){fast_forward_callback(sender, value);});
ESPUI.setElementStyle(ESPUI.addControl(Label, "", "", None, calibration), small_line_space);
//confirm_initialisation = ESPUI.button("Valider l'initialisation", [&](Control* sender, int value){confirm_initialisation_callback(sender, value);}, ControlColor::None, "\u2714");
confirm_initialisation = ESPUI.addControl(ControlType::Button, "Initialisation", "\u2714", ControlColor::None, calibration, [&](Control* sender, int value){confirm_initialisation_callback(sender, value);});
confirm_initialisation = ESPUI.addControl(ControlType::Button, "", "\u2714", ControlColor::None, calibration, [&](Control* sender, int value){confirm_initialisation_callback(sender, value);});
......@@ -79,35 +80,41 @@ void Web :: web_setup()
initial_volume_mL = ESPUI.addControl( ControlType::Number, "Volume initial contenu dans la seringue : ", "0", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){initial_volume_mL_callback(sender, value);});
number_max_min(0, 500, initial_volume_mL);
volume_exchange_mL_label = ESPUI.addControl(ControlType::Label, "Configuration de l'échange", "Volume à échanger en mL", ControlColor::None, initial_volume_mL_label);
volume_exchange_mL = ESPUI.addControl(ControlType::Number,"Configuration de l'échange", "0", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){volume_exchange_mL_callback(sender, value);});
volume_exchange_mL_label = ESPUI.addControl(ControlType::Label, "", "Volume à échanger en mL", ControlColor::None, initial_volume_mL_label);
volume_exchange_mL = ESPUI.addControl(ControlType::Number,"", "0", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){volume_exchange_mL_callback(sender, value);});
number_max_min(0, 500, volume_exchange_mL);
exchange_throughtput_uL_per_min_or_duration_sec_label = ESPUI.addControl(ControlType::Label, "Configuration de l'échange", "Débit de l'échange en uL/min", ControlColor::None, initial_volume_mL_label);
exchange_throughtput_uL_per_min_or_duration_sec_label = ESPUI.addControl(ControlType::Label, "", "Débit de l'échange en uL/min", ControlColor::None, initial_volume_mL_label);
throughput_or_duration = ESPUI.addControl(ControlType::Button, "Configuration de l'échange", "\u21C6", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){throughput_or_duration_callback(sender, value);});
throughput_or_duration = ESPUI.addControl(ControlType::Button, "", "\u21C6", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){throughput_or_duration_callback(sender, value);});
exchange_throughtput_uL_per_min_or_duration_sec = ESPUI.addControl(ControlType::Number,"Configuration de l'échange", "0", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){exchange_throughtput_uL_per_min_or_duration_sec_callback(sender, value);});
exchange_throughtput_uL_per_min_or_duration_sec = ESPUI.addControl(ControlType::Number,"", "0", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){exchange_throughtput_uL_per_min_or_duration_sec_callback(sender, value);});
number_max_min(0, 500, exchange_throughtput_uL_per_min_or_duration_sec);
label_push_pull_choice = ESPUI.addControl(ControlType::Label, "Injection ou Aspiration", "Injection", ControlColor::None, initial_volume_mL_label);
switch_push_pull_choice = ESPUI.addControl(ControlType::Switcher, "Injection ou Aspiration", "Injection", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){switch_push_pull_choice_callback(sender, value);});
switch_push_pull_choice = ESPUI.addControl(ControlType::Switcher, "", "Injection", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){switch_push_pull_choice_callback(sender, value);});
ESPUI.updateSwitcher(switch_push_pull_choice, true); //pour mettre a "Injection" par défaut au début
ESPUI.setElementStyle(ESPUI.addControl(Label, "", "", None, initial_volume_mL_label), line_break);
start_exchange = ESPUI.addControl(ControlType::Button, "Start exchange", "\xF0\x9F\x8F\x81", ControlColor::None, initial_volume_mL_label, [&](Control* sender, int value){start_exchange_callback(sender, value);});
//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_duration_sec = ESPUI.addControl( ControlType::Label, "Caractéristiques de l'échange en cours", "Temps restant en sec", ControlColor::None, label_remaining_volume_mL);
ESPUI.setElementStyle(ESPUI.addControl(Label, "", "", None, label_remaining_volume_mL), line_break);
label_remaining_duration_sec = ESPUI.addControl( ControlType::Label, "", "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;
PM("Avant la création du contenu de configurations");
//Configurations
//Choice_of_syringe_model
syringe_selection = ESPUI.addControl(ControlType::Select, "Choix de la seringue :", "", ControlColor::None, configurations, [&](Control* sender, int value){syringe_selection_callback(sender, value);});
......@@ -119,11 +126,12 @@ void Web :: web_setup()
syringe_diameter_mm_value = 5;
syringe_diameter_mm_string = "internal diameter : " + std::to_string(syringe_diameter_mm_value) + "mm";
syringe_diameter_mm =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue : ", syringe_diameter_mm_string.c_str(), ControlColor::None, syringe_volume_mL);
syringe_diameter_mm =ESPUI.addControl( ControlType::Label, "", syringe_diameter_mm_string.c_str(), ControlColor::None, syringe_volume_mL);
load_syringe_json = ESPUI.addControl(ControlType::Button, "Charger les seringues", "\u21BA", ControlColor::None, syringe_selection, [&](Control* sender, int value){load_syringe_json_callback(sender, value);});
choose_syringe = ESPUI.addControl(ControlType::Button, "Choisir cette seringue", "\u2714", ControlColor::None, syringe_selection, [&](Control* sender, int value){choose_syringe_callback(sender, value);});
load_syringe_json = ESPUI.addControl(ControlType::Button, "Charger les seringues", "\u2714", ControlColor::None, configurations, [&](Control* sender, int value){load_syringe_json_callback(sender, value);});
ESPUI.addControl(ControlType::Separator, "", "", ControlColor::None, configurations);
......@@ -131,36 +139,50 @@ void Web :: web_setup()
PM("Avant la création du contenu de new_syringe");
//New_syringe
name_new_syringe_label = ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Nom de la seringue :", ControlColor::None, new_syringe);
name_new_syringe = ESPUI.addControl(ControlType::Text, "Nouvelle seringue", "", ControlColor::None, name_new_syringe_label, [&](Control* sender, int value){name_new_syringe_callback(sender, value);});
internal_diameter_mm_new_syringe_label =ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Diamètre interne de la seringue en mm :", ControlColor::None, name_new_syringe_label);
name_new_syringe = ESPUI.addControl(ControlType::Text, "", "", ControlColor::None, name_new_syringe_label, [&](Control* sender, int value){name_new_syringe_callback(sender, value);});
internal_diameter_mm_new_syringe_label =ESPUI.addControl(ControlType::Label, "", "Diamètre interne de la seringue en mm :", ControlColor::None, name_new_syringe_label);
internal_diameter_mm_new_syringe = ESPUI.addControl(ControlType::Number, "Diamètre interne de la seringue en mm", "5", ControlColor::None, name_new_syringe_label, [&](Control* sender, int value){internal_diameter_mm_new_syringe_callback(sender, value);});
internal_diameter_mm_new_syringe_value = 5;
number_max_min(0, 500, internal_diameter_mm_new_syringe);
total_volume_mL_new_syringe_label =ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Volume total de la seringue en mL :", ControlColor::None, name_new_syringe_label);
total_volume_mL_new_syringe = ESPUI.addControl(ControlType::Number, "Volume total de la seringue en mL", "5", ControlColor::None, name_new_syringe_label, [&](Control* sender, int value){total_volume_mL_new_syringe_callback(sender, value);});
total_volume_mL_new_syringe_label = ESPUI.addControl(ControlType::Label, "", "Volume total de la seringue en mL :", ControlColor::None, name_new_syringe_label);
total_volume_mL_new_syringe = ESPUI.addControl(ControlType::Number, "", "5", ControlColor::None, name_new_syringe_label, [&](Control* sender, int value){total_volume_mL_new_syringe_callback(sender, value);});
total_volume_mL_new_syringe_value = 5;
number_max_min(0, 500, total_volume_mL_new_syringe);
ESPUI.addControl(ControlType::Separator, "Je suis là", "", ControlColor::None, name_new_syringe_label);
ESPUI.setElementStyle(ESPUI.addControl(Label, "", "", None, name_new_syringe_label), line_break);
save_syringe = ESPUI.addControl(ControlType::Button, "Sauvegarder la seringue", "\u2714", ControlColor::None, name_new_syringe_label, [&](Control* sender, int value){save_syringe_callback(sender, value);});
save_syringe = ESPUI.addControl(ControlType::Button, "Sauvegarder la seringue", "\u2714", ControlColor::None, new_syringe, [&](Control* sender, int value){save_syringe_callback(sender, value);});
PM("Avant la création du contenu des features");
//Features
syringe_pump_length_mm_value = ESPUI.addControl(ControlType::Number, "Longueur totale du pousse-seringue", "50", ControlColor::None, features, [&](Control* sender, int value){syringe_pump_length_mm_callback(sender, value);});
lead_screw_pitch_mm = ESPUI.addControl(ControlType::Number, "Avance par tour", "0.7", ControlColor::None, features, [&](Control* sender, int value){lead_screw_pitch_mm_callback(sender, value);});
clockwise_equals_forward_label = ESPUI.addControl(ControlType::Label, "Sens de rotation du moteur", "Horaire = Injection", ControlColor::None, features);
clockwise_equals_forward = ESPUI.addControl(ControlType::Switcher, "Sens de rotation du moteur", "Horaire =", ControlColor::None, clockwise_equals_forward_label, [&](Control* sender, int value){clockwise_equals_forward_callback(sender, value);});
//Basics
clockwise_equals_forward_label = ESPUI.addControl(ControlType::Label, "Caractéristiques de bases", "Sens de rotation du moteur : Horaire = Injection", ControlColor::None, features);
clockwise_equals_forward = ESPUI.addControl(ControlType::Switcher, "", "Sens de rotation du moteur : Horaire =", ControlColor::None, clockwise_equals_forward_label, [&](Control* sender, int value){clockwise_equals_forward_callback(sender, value);});
ESPUI.updateSwitcher(clockwise_equals_forward, true); //set "Horaire = Injection" at the beginning
microstep_configuration = ESPUI.addControl(ControlType::Number, "Configuration Hardware des microsteps", "16", ControlColor::None, features, [&](Control* sender, int value){microstep_configuration_callback(sender, value);});
motor_release_label = ESPUI.addControl(ControlType::Label, "", "Relachement du moteur : Off", ControlColor::None, clockwise_equals_forward_label);
motor_release = ESPUI.addControl(ControlType::Switcher, "", "", ControlColor::None, clockwise_equals_forward_label, [&](Control* sender, int value){motor_release_callback(sender, value);});
syringe_pump_length_label = ESPUI.addControl(ControlType::Label, "", "Longueur totale du pousse-seringue en mm", ControlColor::None, clockwise_equals_forward_label);
syringe_pump_length_mm_value = ESPUI.addControl(ControlType::Number, "", "50", ControlColor::None, clockwise_equals_forward_label, [&](Control* sender, int value){syringe_pump_length_mm_callback(sender, value);});
lead_screw_pitch_label = ESPUI.addControl(ControlType::Label, "", "Avance par tour en mm", ControlColor::None, clockwise_equals_forward_label);
lead_screw_pitch_mm = ESPUI.addControl(ControlType::Number, "", "0.7", ControlColor::None, clockwise_equals_forward_label, [&](Control* sender, int value){lead_screw_pitch_mm_callback(sender, value);});
//Advanced
motor_steps_label = ESPUI.addControl(ControlType::Label, "Caractéristiques avancées", "Caractéristique du moteur (nombre de pas possibles ?)", ControlColor::None, features);
motor_steps = ESPUI.addControl(ControlType::Number,"", "2000", ControlColor::None, motor_steps_label, [&](Control* sender, int value){motor_steps_callback(sender, value);});
microstep_configuration_label = ESPUI.addControl(ControlType::Label, "", "Configuration Hardware des microsteps", ControlColor::None, motor_steps_label);
microstep_configuration = ESPUI.addControl(ControlType::Number, "", "16", ControlColor::None, motor_steps_label, [&](Control* sender, int value){microstep_configuration_callback(sender, value);});
motor_steps = ESPUI.addControl(ControlType::Number, "Caractéristique du moteur (nombre de pas possibles ?)", "2000", ControlColor::None, features,[&](Control* sender, int value){motor_steps_callback(sender, value);});
PM("Après toutes les features");
motor_release_label = ESPUI.addControl(ControlType::Label, "Relachement du moteur", "Off", ControlColor::None, features);
motor_release = ESPUI.addControl(ControlType::Switcher, "Relachement du moteur", "", ControlColor::None, motor_release_label, [&](Control* sender, int value){motor_release_callback(sender, value);});
//Begin
set_initial_style();
......
......
web.h
+ 3
− 4
View file @ b11a645e
......@@ -60,11 +60,10 @@ float exchange = 0;
String name_new_syringe_value, total_volume_mL_new_syringe_value, internal_diameter_mm_new_syringe_value;
//Features
uint16_t syringe_pump_length_mm_value;
uint16_t lead_screw_pitch_mm, clockwise_equals_forward_label, clockwise_equals_forward, microstep_configuration, motor_steps, motor_release, motor_release_label;
uint16_t syringe_pump_length_mm_value, syringe_pump_length_label;
uint16_t lead_screw_pitch_mm, lead_screw_pitch_label, clockwise_equals_forward_label, clockwise_equals_forward, microstep_configuration, microstep_configuration_label, motor_steps, motor_steps_label, motor_release, motor_release_label;
//
char couleur1[30], couleur2[30], couleur3[30], couleur4[30], couleur5[30], couleur6[30], couleur7[30], couleur8[30], couleur9[30], couleur10[30];
//Webloop
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment