diff --git a/web.cpp b/web.cpp index f28f17eb9a059c5d28a6b257b89066e5a5bd645f..56eb4ce5478302c7772d9daac74d828ee0e13768 100644 --- a/web.cpp +++ b/web.cpp @@ -33,9 +33,9 @@ void web_setup () //Volume restant - label_remaining_volume = ESPUI.label("Volume restant en mL", ControlColor::None, "Volume restant en mL"); + label_remaining_volume_mL = ESPUI.label("Volume restant en mL", ControlColor::None, "Volume restant en mL"); - ESPUI.addControl(ControlType::Slider, "Distance", "0", ControlColor::None, label_remaining_volume, remaining_volume_callback, (void*)19); + ESPUI.addControl(ControlType::Slider, "Distance", "0", ControlColor::None, label_remaining_volume_mL, remaining_volume_mL_callback, (void*)19); ESPUI.sliderContinuous = true; @@ -47,40 +47,41 @@ void web_setup () select_syringe_maj(tab1); + //tests float diametre = 10; std::string temp = "internal diameter : " + std::to_string(diametre); syringe_ref = ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", "Reférence : ? " , ControlColor::None, tab1); syringe_brand =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", "Marque : ? " , ControlColor::None, syringe_ref); - syringe_volume =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", "Volume total = ? mL" , ControlColor::None, syringe_ref); - syringe_diameter =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", temp.c_str(), ControlColor::None, syringe_ref); + syringe_volume_mL =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", "Volume total = ? mL" , ControlColor::None, syringe_ref); + syringe_diameter_mm =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", temp.c_str(), ControlColor::None, syringe_ref); choose_syringe = ESPUI.addControl(ControlType::Button, "Choisir cette seringue", "Utiliser cette seringue", ControlColor::None, syringe_selection, choose_syringe_callback, (void*)19); ESPUI.addControl(ControlType::Separator, "", "", ControlColor::None, tab1); //Deplacement demandé du pousse-seringue - volume_exchange = ESPUI.addControl(ControlType::Number,"Choix du volume à echanger en mL", "", ControlColor::None, tab1, volume_exchange_callback, (void*)19); + volume_exchange_mL = ESPUI.addControl(ControlType::Number,"Choix du volume à echanger en mL", "", ControlColor::None, tab1, volume_exchange_mL_callback, (void*)19); - label_push_pull_choice = ESPUI.addControl(ControlType::Label, "Delivrer ou recupérer", "Délivrer", ControlColor::None, volume_exchange); - switch_push_pull_choice = ESPUI.addControl(ControlType::Switcher, "Delivrer ou recupérer", "Délivrer", ControlColor::None, volume_exchange, switch_push_pull_choice_callback, (void*)19); + label_push_pull_choice = ESPUI.addControl(ControlType::Label, "Delivrer ou recupérer", "Délivrer", ControlColor::None, volume_exchange_mL); + switch_push_pull_choice = ESPUI.addControl(ControlType::Switcher, "Delivrer ou recupérer", "Délivrer", ControlColor::None, volume_exchange_mL, switch_push_pull_choice_callback, (void*)19); ESPUI.updateSwitcher(switch_push_pull_choice, true); //pour mettre a "Delivrer" par défaut au début //TAB3 : Nouvelle seringue name_new_syringe_label = ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Nom de la seringue :", ControlColor::None, tab3); name_new_syringe = ESPUI.addControl(ControlType::Text, "Nouvelle seringue", "", ControlColor::None, name_new_syringe_label, name_new_syringe_callback); - internal_diameter_new_syringe_label =ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Diamètre interne de la seringue en mm :", ControlColor::None, name_new_syringe_label); - internal_diameter_new_syringe = ESPUI.addControl(ControlType::Number, "Diamètre interne de la seringue en mm", "5", ControlColor::None, name_new_syringe_label, number_callback); - total_volume_new_syringe_label =ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Volume total de la seringue en µL :", ControlColor::None, name_new_syringe_label); - total_volume_new_syringe = ESPUI.addControl(ControlType::Number, "Volume total de la seringue en µL", "5", ControlColor::None, name_new_syringe_label, number_callback); + 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); + internal_diameter_mm_new_syringe = ESPUI.addControl(ControlType::Number, "Diamètre interne de la seringue en mm", "5", ControlColor::None, name_new_syringe_label, number_callback); + total_volume_mL_new_syringe_label =ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Volume total de la seringue en µL :", ControlColor::None, name_new_syringe_label); + total_volume_mL_new_syringe = ESPUI.addControl(ControlType::Number, "Volume total de la seringue en µL", "5", ControlColor::None, name_new_syringe_label, number_callback); add_syringe_label =ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Ajouter la seringue", ControlColor::None, name_new_syringe_label); add_syringe = ESPUI.addControl(ControlType::Button, "Ajouter la seringue", "Valider", ControlColor::None, name_new_syringe_label, add_syringe_callback, (void*)19); //TAB4 : Configurations avancées //Diamètre de la vis - worm_diameter = ESPUI.addControl(ControlType::Number, "Diamètre de la vis sans fin", "5", ControlColor::None, tab4, number_callback); + worm_diameter_mm = ESPUI.addControl(ControlType::Number, "Diamètre de la vis sans fin", "5", ControlColor::None, tab4, number_callback); //Sens de rotation du moteur clockwise_equals_push_label = ESPUI.addControl(ControlType::Label, "Sens de rotation du moteur", "Horaire = Delivrer", ControlColor::None, tab4); clockwise_equals_push = ESPUI.addControl(ControlType::Switcher, "Sens de rotation du moteur", "Horaire =", ControlColor::None, clockwise_equals_push_label, clockwise_equals_push_callback); @@ -177,7 +178,7 @@ void initialisation_callback (Control *sender, int type) style (activation_syringe_pump, 1); } } -void volume_exchange_callback (Control* sender, int value, void* param) +void volume_exchange_mL_callback (Control* sender, int value, void* param) /*** -Argument : Pointer to the controller calling the function, integer according to the controller type. -Return : / @@ -204,7 +205,7 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param) case S_ACTIVE: ESPUI.print(label_push_pull_choice, "Délivrer"); - style (volume_exchange, 1); + style (volume_exchange_mL, 1); style (label_push_pull_choice, 1); style (switch_push_pull_choice, 1); @@ -213,7 +214,7 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param) case S_INACTIVE: ESPUI.print(label_push_pull_choice, "Recupérer"); - style (volume_exchange, 2); + style (volume_exchange_mL, 2); style (label_push_pull_choice, 2); style (switch_push_pull_choice, 2); break; @@ -223,7 +224,7 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param) Serial.println(sender->id); } -void remaining_volume_callback (Control* sender, int value, void* param) +void remaining_volume_mL_callback (Control* sender, int value, void* param) /*** -Argument : Pointer to the controller calling the function, integer according to the controller type. -Return : / @@ -476,33 +477,33 @@ void set_init_style() style (initialisation, 2); - style (volume_exchange, 3); + style (volume_exchange_mL, 3); style (label_push_pull_choice, 3); style (switch_push_pull_choice, 3); - style (label_remaining_volume, 3); + style (label_remaining_volume_mL, 3); //TAB1 = Configurations style (syringe_ref, 3); style (syringe_brand, 3); - style (syringe_volume, 3); - style (syringe_diameter, 3); + style (syringe_volume_mL, 3); + style (syringe_diameter_mm, 3); style (choose_syringe, 3); style (name_new_syringe, 3); - style (internal_diameter_new_syringe, 3); - style (total_volume_new_syringe, 3); + style (internal_diameter_mm_new_syringe, 3); + style (total_volume_mL_new_syringe, 3); style (add_syringe, 3); style (name_new_syringe_label, 3); - style (internal_diameter_new_syringe_label, 3); - style (total_volume_new_syringe_label, 3); + style (internal_diameter_mm_new_syringe_label, 3); + style (total_volume_mL_new_syringe_label, 3); style (add_syringe_label, 3); //TAB4 : Configurations avancées - style (worm_diameter, 3); + style (worm_diameter_mm, 3); style (clockwise_equals_push_label, 3); style (clockwise_equals_push, 3); diff --git a/web.h b/web.h index 70360bb2c621670a151b8f4cf80de6b7efec2489..2cbec90d21371453026c20afdb43eca0e4953207 100644 --- a/web.h +++ b/web.h @@ -25,20 +25,20 @@ uint16_t syringe_filled_placement; uint16_t initialisation; -uint16_t volume_exchange, label_push_pull_choice, switch_push_pull_choice; +uint16_t volume_exchange_mL, label_push_pull_choice, switch_push_pull_choice; -uint16_t label_remaining_volume; +uint16_t label_remaining_volume_mL; //TAB1 = Configurations -uint16_t syringe_selection, syringe_ref, syringe_brand, syringe_volume, syringe_diameter, choose_syringe; +uint16_t syringe_selection, syringe_ref, syringe_brand, syringe_volume_mL, syringe_diameter_mm, choose_syringe; //TAB3 : Nouvelle seringue -uint16_t name_new_syringe, name_new_syringe_label, internal_diameter_new_syringe, internal_diameter_new_syringe_label, total_volume_new_syringe, total_volume_new_syringe_label, add_syringe, add_syringe_label; +uint16_t name_new_syringe, name_new_syringe_label, internal_diameter_mm_new_syringe, internal_diameter_mm_new_syringe_label, total_volume_mL_new_syringe, total_volume_mL_new_syringe_label, add_syringe, add_syringe_label; //TAB4 : Configurations avancées -uint16_t worm_diameter, clockwise_equals_push_label, clockwise_equals_push; +uint16_t worm_diameter_mm, clockwise_equals_push_label, clockwise_equals_push; //A trier encore @@ -81,9 +81,9 @@ void number_callback(Control* sender, int type); void activation_syringe_pump_callback (Control* sender, int value, void* param); void syringe_filled_placement_callback (Control* sender, int value, void* param); void initialisation_callback(Control* sender, int type); -void volume_exchange_callback (Control* sender, int value, void* param); +void volume_exchange_mL_callback (Control* sender, int value, void* param); void switch_push_pull_choice_callback (Control* sender, int value, void* param); -void remaining_volume_callback (Control* sender, int value, void* param); +void remaining_volume_mL_callback (Control* sender, int value, void* param); //TAB1 = Configurations void choose_syringe_callback (Control* sender, int value, void* param);