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

Working on syringe_json wrting

parent ba41f79e
No related branches found
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
...@@ -10,10 +10,7 @@ Syringe syringe; ...@@ -10,10 +10,7 @@ Syringe syringe;
//CONSTRUCTOR //CONSTRUCTOR
Syringe :: Syringe() Syringe :: Syringe()
{ {
set_name("BD_10mL"); set_syringe("BD_10mL", 10, 14.5);
set_total_volume_mL("BD_10mL", 10);
set_internal_diameter_mm("BD_10mL", 14.5);
//set_syringe("BD_10mL", 10, 14.5);
//set_syringe("Terumo_5mL", 5, 10); //set_syringe("Terumo_5mL", 5, 10);
//set_syringe("Terumo_2mL", 2, 3); //set_syringe("Terumo_2mL", 2, 3);
//set_syringe("FisherBrand_1mL", 1, 0.5); //set_syringe("FisherBrand_1mL", 1, 0.5);
...@@ -24,15 +21,10 @@ Syringe :: Syringe() ...@@ -24,15 +21,10 @@ Syringe :: Syringe()
//SET METHODS //SET METHODS
void Syringe :: set_syringe(String name, float total_volume_mL, float internal_diameter_mm) 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_total_volume_mL(name, total_volume_mL);
set_internal_diameter_mm(name, internal_diameter_mm); 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) void Syringe :: set_total_volume_mL(String name, float total_volume_mL)
{ {
......
...@@ -32,7 +32,6 @@ class Syringe ...@@ -32,7 +32,6 @@ class Syringe
//SET METHODS //SET METHODS
void set_syringe(String name, float total_volume_mL, float internal_diameter_mm); 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_total_volume_mL(String name, float total_volume_mL);
void set_internal_diameter_mm(String name, float internal_diameter_mm); void set_internal_diameter_mm(String name, float internal_diameter_mm);
......
...@@ -42,7 +42,7 @@ void web_setup () ...@@ -42,7 +42,7 @@ void web_setup ()
//Configurations //Configurations
//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);
select_syringe_maj(configurations); select_syringe_maj(configurations);
...@@ -183,7 +183,7 @@ void volume_exchange_mL_callback (Control* sender, int value, void* param) ...@@ -183,7 +183,7 @@ void volume_exchange_mL_callback (Control* sender, int value, void* param)
{ {
Serial.printf("val=%s\n", sender->value.c_str()); Serial.printf("val=%s\n", sender->value.c_str());
syringe_filled.set_exchange_volume_mL(atof(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) 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) ...@@ -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.set_syringe(name_new_syringe_value, total_volume_mL_new_syringe_value.toFloat(), internal_diameter_mm_new_syringe_value.toFloat());
syringe.write_Json(); syringe.write_Json();
select_syringe_maj(configurations);
break; break;
case B_UP: case B_UP:
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#define syringe_pump_length_mm 50 #define syringe_pump_length_mm 50
//Create tabs
uint16_t configurations, new_syringe, features;
//***ABOVE***// //***ABOVE***//
......
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