diff --git a/web.cpp b/web.cpp index 18e3114a8177bab50dc3c3a6d5e5cbc466d012d3..53b7613ccbb3bec66e3b3616de1ed17117a12640 100644 --- a/web.cpp +++ b/web.cpp @@ -541,11 +541,11 @@ void Web :: choose_syringe_callback (Control* sender, int value) { case B_DOWN: - syringe_volume_mL_value = syringe.get_syringe_database()[select_value]["total_volume_mL"]; + syringe_volume_mL_value = syringe.get_syringe_database()[syringe_filled.get_syringe_name()]["total_volume_mL"]; syringe_volume_mL_string = "Volume total: " + std::to_string(syringe_volume_mL_value) + "mL"; ESPUI.print(syringe_volume_mL, syringe_volume_mL_string.c_str()); - syringe_diameter_mm_value = syringe.get_syringe_database()[select_value]["internal_diameter_mm"]; + syringe_diameter_mm_value = syringe.get_syringe_database()[syringe_filled.get_syringe_name()]["internal_diameter_mm"]; syringe_diameter_mm_string = "internal diameter : " + std::to_string(syringe_diameter_mm_value) + "mm"; ESPUI.print(syringe_diameter_mm, syringe_diameter_mm_string.c_str()); @@ -791,8 +791,7 @@ void Web :: syringe_selection_callback(Control* sender, int value) ***/ { - select_value = sender->value; - syringe_filled.set_name_syringe(select_value); + syringe_filled.set_name_syringe(sender->value); syringe_filled.save_json(); serial_print ("syringe_selection (sender->value)", sender);