From 4e79ac657cbc00a705b7bf59b9ab9960500e252a Mon Sep 17 00:00:00 2001 From: Malaurie Bernard <mbernard@kinouby> Date: Mon, 17 Jul 2023 16:48:57 +0200 Subject: [PATCH] Be sure to translate every comment --- web.cpp | 20 +++++++++----------- web.h | 12 ++++-------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/web.cpp b/web.cpp index 041c462..507568e 100644 --- a/web.cpp +++ b/web.cpp @@ -7,7 +7,6 @@ void web_setup () set_theme(1); - //Create tabs uint16_t configurations = ESPUI.addControl(ControlType::Tab, "Configurations", "Configurations"); uint16_t new_syringe = ESPUI.addControl(ControlType::Tab, "Nouvelle Seringue", "Nouvelle seringue"); @@ -32,7 +31,7 @@ void web_setup () initialisation = ESPUI.button("Initialisation", initialisation_callback, ControlColor::None, ""); - //Volume restant + //Remaning_volume 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_mL, remaining_volume_mL_callback, (void*)19); @@ -42,14 +41,15 @@ void web_setup () //Configurations - //Choix de la seringue 1 + //Choice_of_syringe_model //ESPUI.addControl(ControlType::Separator, "Seringue 1", "", ControlColor::None, configurations); select_syringe_maj(configurations); - //tests + //test float diametre = 10; std::string temp = "internal diameter : " + std::to_string(diametre); + //fin test syringe_ref = ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", "Reférence : ? " , ControlColor::None, configurations); syringe_brand =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", "Marque : ? " , ControlColor::None, syringe_ref); syringe_volume_mL =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue 1 : ", "Volume total = ? mL" , ControlColor::None, syringe_ref); @@ -59,7 +59,7 @@ void web_setup () ESPUI.addControl(ControlType::Separator, "", "", ControlColor::None, configurations); - //Deplacement demandé du pousse-seringue + //Volume_exchange_wanted volume_exchange_mL = ESPUI.addControl(ControlType::Number,"Choix du volume à echanger en mL", "", ControlColor::None, configurations, volume_exchange_mL_callback, (void*)19); @@ -68,7 +68,7 @@ void web_setup () ESPUI.updateSwitcher(switch_push_pull_choice, true); //pour mettre a "Delivrer" par défaut au début - //new_syringe : Nouvelle seringue + //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, name_new_syringe_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); @@ -79,15 +79,13 @@ void web_setup () add_syringe = ESPUI.addControl(ControlType::Button, "Ajouter la seringue", "Valider", ControlColor::None, name_new_syringe_label, add_syringe_callback, (void*)19); - //features : Configurations avancées - //Diamètre de la vis + //Features worm_diameter_mm = ESPUI.addControl(ControlType::Number, "Diamètre de la vis sans fin", "5", ControlColor::None, features, number_callback); - //Sens de rotation du moteur clockwise_equals_push_label = ESPUI.addControl(ControlType::Label, "Sens de rotation du moteur", "Horaire = Delivrer", ControlColor::None, features); clockwise_equals_push = ESPUI.addControl(ControlType::Switcher, "Sens de rotation du moteur", "Horaire =", ControlColor::None, clockwise_equals_push_label, clockwise_equals_push_callback); - ESPUI.updateSwitcher(clockwise_equals_push, true); //pour mettre a "Horaire = Delivrer" par défaut au début + ESPUI.updateSwitcher(clockwise_equals_push, true); //set "Horaire = Delivrer" at the beginning - //Lancement + //Begin set_init_style(); ESPUI.begin("ESPUI Control"); } diff --git a/web.h b/web.h index 40340e8..77710b1 100644 --- a/web.h +++ b/web.h @@ -30,26 +30,22 @@ uint16_t volume_exchange_mL, label_push_pull_choice, switch_push_pull_choice; uint16_t label_remaining_volume_mL; -//configurations = Configurations +//Configurations uint16_t syringe_selection, syringe_ref, syringe_brand, syringe_volume_mL, syringe_diameter_mm, choose_syringe; -//new_syringe : Nouvelle seringue +//New_syringe 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; -//features : Configurations avancées +//Features uint16_t worm_diameter_mm, clockwise_equals_push_label, clockwise_equals_push; -//A trier encore - - +//Other String select_value; - char couleur1[30], couleur2[30], couleur3[30], couleur4[30], couleur5[30], couleur6[30], couleur7[30], couleur8[30], couleur9[30], couleur10[30]; - long unsigned last_time = 0; // Couleurs à utiliser -- GitLab