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

Creating a funtion serial_print to print sender value and id easier

parent fb69ad91
No related branches found
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
Hide whitespace changes
Inline Side-by-side
web.cpp
+ 46
− 77
View file @ 49a3f15c
......@@ -241,10 +241,7 @@ void fast_backward_callback (Control *sender, int type)
break;
}
Serial.println("Fast_backward");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Fast_backward", sender);
}
......@@ -274,11 +271,7 @@ void fast_forward_callback (Control *sender, int type)
break;
}
Serial.println("Fast_forward");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Fast_forward", sender);
}
void slow_backward_callback (Control *sender, int type)
......@@ -305,10 +298,7 @@ void slow_backward_callback (Control *sender, int type)
break;
}
Serial.println("Slow_backward");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Slow_backward", sender);
}
......@@ -336,10 +326,7 @@ void slow_forward_callback (Control *sender, int type)
break;
}
Serial.println("Slow_forward");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Slow_forward", sender);
}
void confirm_initialisation_callback (Control *sender, int type)
......@@ -361,10 +348,7 @@ void confirm_initialisation_callback (Control *sender, int type)
break;
}
Serial.println("confirm_initialisation");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Confirm_initialisation", sender);
}
......@@ -379,10 +363,9 @@ void volume_exchange_mL_callback (Control* sender, int value, void* param)
syringe_filled.set_exchange_volume_mL(atof(sender->value.c_str()));
syringe_filled.write_Json ();
Serial.println("Volume_exchange (sender->value)");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Volume_exchange (sender->value)", sender);
Serial.println("Volume_exchange (json value)");
Serial.println(String("Value: ") + String(syringe_filled.get_exchange_volume_mL()));
Serial.println("");
......@@ -399,10 +382,8 @@ void exchange_throughtput_uL_per_sec_callback (Control* sender, int value, void*
syringe_filled.set_exchange_throughput_uL_per_sec(atof(sender->value.c_str()));
syringe_filled.write_Json ();
Serial.println("Exchange_throughtput (sender->value)");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Exchange_throughtput (sender->value)", sender);
Serial.println("Exchange_throughtput (json value)");
Serial.println(String("Value: ") + String(syringe_filled.get_exchange_throughput_uL_per_sec()));
Serial.println("");
......@@ -438,10 +419,8 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param)
}
syringe_filled.write_Json();
Serial.println("Push_pull_choice (sender->value)");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Push_pull_choice (sender->value)", sender);
Serial.println("Push_pull_choice (json value)");
Serial.println(String("Value: ") + String(syringe_filled.get_push()));
Serial.println("");
......@@ -475,9 +454,7 @@ void start_exchange_callback (Control* sender, int value, void* param)
syringe_filled.start_exchange();
style_syringe_pump_on();
Serial.println("Exchange start");
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("Exchange start", sender);
}
//configurations = Configurations
......@@ -487,10 +464,8 @@ void initial_volume_mL_callback (Control* sender, int value, void* param)
{(void)param; //Avoid the unused Warning
syringe_filled.set_remaining_volume_mL((sender->value).toFloat());
Serial.println("syringe_initial_volume (sender->value)");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("syringe_initial_volume (sender->value)", sender);
Serial.println("syringe_initial_volume (json value)");
Serial.println(String("Value: ") + String(syringe_filled.get_remaining_volume_mL()));
Serial.println("");
......@@ -524,17 +499,14 @@ void choose_syringe_callback (Control* sender, int value, void* param)
case B_UP:
break;
}
serial_print ("choose_syringe", sender);
Serial.println("choose_syringe");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
Serial.println("name_new_syringe (json value)");
Serial.println(String("Value: ") + syringe_filled.get_name_syringe());
Serial.println("");
serial_print ("name_new_syringe (sender->value)", sender);
Serial.println("Volume_total (json value)");
Serial.println(String("Value: ") + String((syringe.get_syringe_database()[syringe_filled.get_name_syringe()]["total_volume_mL"]).as<const char*>()));
Serial.println("");
Serial.println("internal_diameter (json value)");
Serial.println(String("Value: ") + String(syringe.get_syringe_database()[syringe_filled.get_name_syringe()]["internal_diameter"].as<const char*>()));
Serial.println("");
......@@ -549,10 +521,8 @@ void name_new_syringe_callback(Control* sender, int type)
***/
{
name_new_syringe_value = sender->value;
Serial.println("name_new_syringe (sender->value)");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("name_new_syringe (sender->value)", sender);
}
......@@ -564,10 +534,9 @@ void total_volume_mL_new_syringe_callback(Control* sender, int type)
***/
{
total_volume_mL_new_syringe_value = sender->value;
Serial.println("total_volume_new_syringe");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("total_volume_new_syringe", sender);
}
void internal_diameter_mm_new_syringe_callback(Control* sender, int type)
......@@ -578,10 +547,9 @@ void internal_diameter_mm_new_syringe_callback(Control* sender, int type)
***/
{
internal_diameter_mm_new_syringe_value = sender->value,
Serial.println("internal_diameter_new_syringe");
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("internal_diameter_new_syringe", sender);
}
void add_syringe_callback (Control* sender, int value, void* param)
......@@ -606,10 +574,7 @@ void add_syringe_callback (Control* sender, int value, void* param)
break;
}
Serial.println("add_syringe");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("add_syringe", sender);
}
......@@ -626,13 +591,11 @@ void syringe_pump_length_mm_callback(Control* sender, int type)
{
syringe_filled.set_syringe_pump_length_mm(sender->type);
Serial.println("syringe_pump_lenggth (sender->value)");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
serial_print ("syringe_pump_length (sender->value)", sender);
Serial.println("syringe_pump_length (json value)");
Serial.println(String("Value: ") + String(syringe_filled.get_syringe_pump_length_mm()));
Serial.println("");
//Serial.println("syringe_pump_length (json value)");
//Serial.println(String("Value: ") + String(syringe_filled.get_syringe_pump_length_mm()));
//Serial.println("");
}
void clockwise_equals_push_callback(Control* sender, int value)
......@@ -656,10 +619,9 @@ void clockwise_equals_push_callback(Control* sender, int value)
ESPUI.print(clockwise_equals_push_label, "Horaire = Aspiration");
break;
}
Serial.println("clockwise_equals_push (sender->value)");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("clockwise_equals_push (sender->value)", sender);
Serial.println("clockwise_equals_push (json value)");
Serial.println(String("Value: ") + String(syringe_filled.get_clockwise_equals_push()));
Serial.println("");
......@@ -678,10 +640,8 @@ void syringe_selection_callback(Control* sender, int value)
select_value = sender->value;
syringe_filled.set_name_syringe(select_value);
Serial.println("syringe_selection (sender->value)");
Serial.println(String("Value: ") + String(sender->value));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
serial_print ("syringe_selection (sender->value)", sender);
}
......@@ -953,6 +913,15 @@ void number_max_min(int min, int max, uint16_t control)
ESPUI.addControl(Max, "", String(max), ControlColor :: None, control);
}
void serial_print (String name, Control* sender)
{
Serial.println(name);
Serial.println(String("Value: ") + String(sender->type));
Serial.println(String("ID: ") + sender->id);
Serial.println("");
}
//WEB_LOOP//
void web_loop ()
......
web.h
+ 1
− 1
View file @ 49a3f15c
......@@ -135,4 +135,4 @@ void style_exchange_configuration(int style_choice);
//OTHER_METHODS
void select_syringe_maj(uint16_t tab);
void number_max_min(int min, int max, uint16_t control);
void serial_print (String name, Control* sender);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment