diff --git a/syringe.cpp b/syringe.cpp index 21e2df579a70a3f67a53e6616f55cb5179fc0744..aad4cef4fbf3f4773c49af69ca363b889fe37a84 100644 --- a/syringe.cpp +++ b/syringe.cpp @@ -10,10 +10,7 @@ Syringe syringe; //CONSTRUCTOR Syringe :: Syringe() { - set_name("BD_10mL"); - set_total_volume_mL("BD_10mL", 10); - set_internal_diameter_mm("BD_10mL", 14.5); - //set_syringe("BD_10mL", 10, 14.5); + set_syringe("BD_10mL", 10, 14.5); //set_syringe("Terumo_5mL", 5, 10); //set_syringe("Terumo_2mL", 2, 3); //set_syringe("FisherBrand_1mL", 1, 0.5); @@ -24,15 +21,10 @@ Syringe :: Syringe() //SET METHODS void Syringe :: set_syringe(String name, float total_volume_mL, float internal_diameter_mm) { - syringe_json["name"] = name; set_total_volume_mL(name, total_volume_mL); set_internal_diameter_mm(name, internal_diameter_mm); } -void Syringe :: set_name( String name) -{ - syringe_json["name"] = name; -} void Syringe :: set_total_volume_mL(String name, float total_volume_mL) { diff --git a/syringe.h b/syringe.h index 50a0299388eab72dfa6eb4c3f150114f5b0239bc..cd0c8623adc4ede4888f12578c6c11a6988cf462 100644 --- a/syringe.h +++ b/syringe.h @@ -32,7 +32,6 @@ class Syringe //SET METHODS void set_syringe(String name, float total_volume_mL, float internal_diameter_mm); - void set_name( String name); void set_total_volume_mL(String name, float total_volume_mL); void set_internal_diameter_mm(String name, float internal_diameter_mm); diff --git a/web.cpp b/web.cpp index 576ff9636c484afcaf9576b37de47b1e39a2c27a..1efa279099983656621f8b30f60a2865a675c8f5 100644 --- a/web.cpp +++ b/web.cpp @@ -42,7 +42,7 @@ void web_setup () //Configurations //Choice_of_syringe_model - //ESPUI.addControl(ControlType::Separator, "Seringue 1", "", ControlColor::None, configurations); + ESPUI.addControl(ControlType::Separator, "Seringue 1", "", ControlColor::None, configurations); select_syringe_maj(configurations); @@ -183,7 +183,7 @@ void volume_exchange_mL_callback (Control* sender, int value, void* param) { Serial.printf("val=%s\n", sender->value.c_str()); syringe_filled.set_exchange_volume_mL(atof(sender->value.c_str())); - + syringe_filled.write_Json (); } void switch_push_pull_choice_callback (Control* sender, int value, void* param) @@ -316,6 +316,9 @@ void add_syringe_callback (Control* sender, int value, void* param) syringe.set_syringe(name_new_syringe_value, total_volume_mL_new_syringe_value.toFloat(), internal_diameter_mm_new_syringe_value.toFloat()); syringe.write_Json(); + + select_syringe_maj(configurations); + break; case B_UP: diff --git a/web.h b/web.h index f1a18c63b9c653cc4498cc30ad2677e19efbdd2e..3d0ed34037e9fe6f01be2d6c621f54501040e0a5 100644 --- a/web.h +++ b/web.h @@ -14,6 +14,8 @@ #define syringe_pump_length_mm 50 +//Create tabs +uint16_t configurations, new_syringe, features; //***ABOVE***//