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

-Changing selection addControl of place so we only create one of it that we update

-Initialize internal_diameter_mm_new_syringe_value and
total_volume_mL_new_syringe_value so when we don't change them they
still exist to their initia value (which is 5)
parent c73f2f7d
No related branches found
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
...@@ -45,6 +45,7 @@ void web_setup () ...@@ -45,6 +45,7 @@ void web_setup ()
//Choice_of_syringe_model //Choice_of_syringe_model
ESPUI.addControl(ControlType::Separator, "Seringue 1", "", ControlColor::None, configurations); ESPUI.addControl(ControlType::Separator, "Seringue 1", "", ControlColor::None, configurations);
syringe_selection = ESPUI.addControl(ControlType::Select, "Choix de la seringue :", "", ControlColor::None, configurations, syringe_selection_callback);
select_syringe_maj(configurations); select_syringe_maj(configurations);
//test //test
...@@ -72,8 +73,10 @@ void web_setup () ...@@ -72,8 +73,10 @@ void web_setup ()
name_new_syringe = ESPUI.addControl(ControlType::Text, "Nouvelle seringue", "", ControlColor::None, name_new_syringe_label, name_new_syringe_callback); 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); 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, internal_diameter_mm_new_syringe_callback); internal_diameter_mm_new_syringe = ESPUI.addControl(ControlType::Number, "Diamètre interne de la seringue en mm", "5", ControlColor::None, name_new_syringe_label, internal_diameter_mm_new_syringe_callback);
internal_diameter_mm_new_syringe_value = 5;
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_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, total_volume_mL_new_syringe_callback); total_volume_mL_new_syringe = ESPUI.addControl(ControlType::Number, "Volume total de la seringue en µL", "5", ControlColor::None, name_new_syringe_label, total_volume_mL_new_syringe_callback);
total_volume_mL_new_syringe_value = 5;
add_syringe_label =ESPUI.addControl(ControlType::Label, "Nouvelle seringue", "Ajouter la seringue", ControlColor::None, name_new_syringe_label); 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); add_syringe = ESPUI.addControl(ControlType::Button, "Ajouter la seringue", "Valider", ControlColor::None, name_new_syringe_label, add_syringe_callback, (void*)19);
...@@ -585,9 +588,6 @@ void select_syringe_maj(uint16_t tab) ...@@ -585,9 +588,6 @@ void select_syringe_maj(uint16_t tab)
-Action : Read the syringe_json file so it get/recover all the syringe models registered. -Action : Read the syringe_json file so it get/recover all the syringe models registered.
***/ ***/
{ {
syringe_selection = ESPUI.addControl(ControlType::Select, "Choix de la seringue :", "", ControlColor::None, tab, syringe_selection_callback);
JsonObject root = syringe.get_syringe_database_object(); JsonObject root = syringe.get_syringe_database_object();
for (JsonPair kv : root) for (JsonPair kv : root)
......
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