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

Implementation of distance_to_volume method (and also a bit of code editting.

parent 3a250db9
No related branches found
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
...@@ -124,6 +124,19 @@ float SyringeFilled::volume_to_distance(float volume_mL, Syringe* id_syringe) ...@@ -124,6 +124,19 @@ float SyringeFilled::volume_to_distance(float volume_mL, Syringe* id_syringe)
return distance_mm; return distance_mm;
} }
float SyringeFilled::distance_to_volume(float distance_mm, Syringe* id_syringe)
/***
-Argument : distance in mm.
-Return : The volume associated in mL.
-Action : /
***/
{
float piston_surface_mm2 = id_syringe->get_internal_diameter_mm();
float volume_mm3 = distance_mm*piston_surface_mm2;
return volume_mm3;
}
//MOVEMENTS //MOVEMENTS
......
...@@ -71,6 +71,7 @@ class SyringeFilled : public Motor ...@@ -71,6 +71,7 @@ class SyringeFilled : public Motor
//CONVERSIONS //CONVERSIONS
float volume_to_distance(float volume_mL, Syringe* id_syringe); float volume_to_distance(float volume_mL, Syringe* id_syringe);
float distance_to_volume(float distance_mm, Syringe* id_syringe); //CLI
//MOVEMENTS //MOVEMENTS
float move(); float move();
...@@ -78,13 +79,12 @@ class SyringeFilled : public Motor ...@@ -78,13 +79,12 @@ class SyringeFilled : public Motor
//LIMIT SWITCH //LIMIT SWITCH
void manage_emergency (bool pressed, bool stepperMoving); void manage_emergency (bool pressed, bool stepperMoving);
void run_from_emergency(); //CLI
//METHODS CLI //METHODS CLI
bool check_configuration(); //a implementer bool check_configuration(); //a implementer
void show_configuration(); //a implementer void show_configuration(); //a implementer
float distance_to_volume(float distance, Syringe* id_syringe); //a implementer
void run_from_emergency();
}; };
extern SyringeFilled syringe_filled; extern SyringeFilled syringe_filled;
\ No newline at end of file
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