diff --git a/web.cpp b/web.cpp index 34939e4245c73f9f5dbed3c88a389cb13aa7e5bf..67644a8d338cdb7e05bd5d6a199aa7c4c7517df9 100644 --- a/web.cpp +++ b/web.cpp @@ -39,6 +39,10 @@ void web_setup () ESPUI.addControl(ControlType::Separator, "", "", ControlColor::None); //Exchange_values_wanted + initial_volume_mL_label =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue : ", "Volume initial contenu dans la seringue : ", ControlColor::None, syringe_volume_mL); + initial_volume_mL = ESPUI.addControl( ControlType::Number, "Volume initial contenu dans la seringue : ", "0", ControlColor::None, syringe_volume_mL, initial_volume_mL_callback, (void*)19); + + volume_exchange_mL_label = ESPUI.addControl(ControlType::Label, "Configuration de l'échange", "Volume à échanger en mL", ControlColor::None); volume_exchange_mL = ESPUI.addControl(ControlType::Number,"Configuration de l'échange", "", ControlColor::None, volume_exchange_mL_label, volume_exchange_mL_callback, (void*)19); @@ -80,8 +84,6 @@ void web_setup () 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_initial_volume_mL_label =ESPUI.addControl( ControlType::Label, "Caractéristiques de la seringue : ", "Volume initial contenu dans la seringue : ", ControlColor::None, syringe_volume_mL); - syringe_initial_volume_mL = ESPUI.addControl( ControlType::Number, "Volume initial contenu dans la seringue : ", "0", ControlColor::None, syringe_volume_mL, syringe_initial_volume_mL_callback, (void*)19); choose_syringe = ESPUI.addControl(ControlType::Button, "Choisir cette seringue", "\u2714", ControlColor::None, syringe_selection, choose_syringe_callback, (void*)19); @@ -356,6 +358,8 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param) ESPUI.print(label_push_pull_choice, "Aspiration"); + style (initial_volume_mL, 1); + style (initial_volume_mL_label, 1); style (volume_exchange_mL_label, 2); style (volume_exchange_mL, 2); style (exchange_throughtput_uL_per_sec_label, 2); @@ -376,7 +380,6 @@ void remaining_volume_mL_callback (Control* sender, int value, void* param) -Action : Linking the display with the current volume remaining. ***/ { - ESPUI.updateSlider(remaining_volume_mL, syringe_filled.get_remaining_volume_mL()); } @@ -400,7 +403,7 @@ void start_exchange_callback (Control* sender, int value, void* param) //configurations = Configurations -void syringe_initial_volume_mL_callback (Control* sender, int value, void* param) +void initial_volume_mL_callback (Control* sender, int value, void* param) { syringe_filled.set_remaining_volume_mL((sender->value).toFloat()); Serial.print("Text: ID: "); @@ -706,7 +709,8 @@ void set_init_style() style (slow_forward, 3); style (slow_backward, 3); - + style (initial_volume_mL, 1); + style (initial_volume_mL_label, 1); style (volume_exchange_mL_label, 1); style (volume_exchange_mL, 1); style (exchange_throughtput_uL_per_sec_label, 1); @@ -737,8 +741,7 @@ void set_init_style() style (total_volume_mL_new_syringe_label, 3); style (add_syringe_label, 3); - style (syringe_initial_volume_mL, 3); - style (syringe_initial_volume_mL_label, 3); + diff --git a/web.h b/web.h index 0795bddb377dba8865b2e44925c3b11aca5ba000..33eb7a0d164533e854ac8aca55a3afda5cfc9792 100644 --- a/web.h +++ b/web.h @@ -33,7 +33,7 @@ uint16_t label_remaining_volume_mL, label_remaining_time_sec; uint16_t remaining_volume_mL, remaining_time_sec; //Configurations -uint16_t syringe_selection, syringe_ref, syringe_brand, syringe_volume_mL, syringe_diameter_mm, syringe_initial_volume_mL_label, syringe_initial_volume_mL, choose_syringe; +uint16_t syringe_selection, syringe_ref, syringe_brand, syringe_volume_mL, syringe_diameter_mm, initial_volume_mL_label, initial_volume_mL, choose_syringe; float syringe_volume_mL_value, syringe_diameter_mm_value; @@ -97,7 +97,7 @@ void start_exchange_callback (Control* sender, int value, void* param); //Configurations void choose_syringe_callback (Control* sender, int value, void* param); -void syringe_initial_volume_mL_callback (Control* sender, int value, void* param); +void initial_volume_mL_callback (Control* sender, int value, void* param); void name_new_syringe_callback(Control* sender, int type); void total_volume_mL_new_syringe_callback(Control* sender, int type);