Changing the name of clockwise_equals_forward to clockwise_equals_push.

syringefilled.cpp

@@ -36,7 +36,7 @@ void SyringeFilled :: set_screw_thread_mm(float screw_thread_mm)
     SyringeFilledJSON["screw_thread_mm"] = screw_thread_mm;
 }
 
-void SyringeFilled :: set_clockwise_equals_forward(bool clockwise_equals_forward)
+void SyringeFilled :: set_clockwise_equals_push(bool clockwise_equals_push)
 {
     SyringeFilledJSON["clockwise_equals_push"] = clockwise_equals_push;
 }
@@ -78,9 +78,9 @@ float SyringeFilled :: get_screw_thread_mm()
     return SyringeFilledJSON["screw_thread_mm"].as<float>();
 }
 
-bool SyringeFilled :: get_clockwise_equals_forward()
+bool SyringeFilled :: get_clockwise_equals_push()
 {
-    return SyringeFilledJSON["clockwise_equals_forward"].as<float>();
+    return SyringeFilledJSON["clockwise_equals_push"].as<float>();
 }
 
 bool SyringeFilled :: get_emergency()
@@ -89,7 +89,7 @@ bool SyringeFilled :: get_emergency()
 }
 
 
-void SyringeFilled :: setupJsonSyringeFilled(float exchange_throughput_uL_per_sec, float exchange_volume_mL, float remaining_volume_mL, bool push, Syringe* id_syringe,  float screw_thread_mm, bool clockwise_equals_forward)
+void SyringeFilled :: setupJsonSyringeFilled(float exchange_throughput_uL_per_sec, float exchange_volume_mL, float remaining_volume_mL, bool push, Syringe* id_syringe,  float screw_thread_mm, bool clockwise_equals_push)
 {
     
     //ADD INITIALISATION VALUES TO THE DOC
@@ -99,7 +99,7 @@ void SyringeFilled :: setupJsonSyringeFilled(float exchange_throughput_uL_per_se
     SyringeFilledJSON["push"] = push;
     SyringeFilledJSON["id_syringe"] = SyringeJSON["id"];
     SyringeFilledJSON["screw_thread_mm"] = screw_thread_mm;
-    SyringeFilledJSON["clockwise_equals_forward"] = clockwise_equals_forward;
+    SyringeFilledJSON["clockwise_equals_push"] = clockwise_equals_push;
 
 
 

syringefilled.h

@@ -29,8 +29,7 @@ class SyringeFilled : public Motor
 
     //Syringe_Pump
     float _screw_thread_mm;
-    bool _clockwise_equals_forward;
-
+    bool _clockwise_equals_push;
 
     //Limit_Switch
     bool _emergency;
@@ -67,7 +66,7 @@ class SyringeFilled : public Motor
     //JSON DOCUMENT
     StaticJsonDocument<200> SyringeFilledJSON;  //200 = RAM allocated to this document
 
-    void setupJsonSyringeFilled(float exchange_throughput_uL_per_sec, float exchange_volume_mL, float remaining_volume_mL, bool push, Syringe* id_syringe, float screw_thread_mm, bool clockwise_equals_forward);
+    void setupJsonSyringeFilled(float exchange_throughput_uL_per_sec, float exchange_volume_mL, float remaining_volume_mL, bool push, Syringe* id_syringe, float screw_thread_mm, bool clockwise_equals_push);
 
 
     //CONVERSIONS
@@ -75,10 +74,18 @@ class SyringeFilled : public Motor
 
     //MOVEMENTS
     float move();
+    float go_to_zero(); //a implementer
 
     //LIMIT SWITCH
     void manage_emergency (bool pressed, bool stepperMoving);
 
+    //METHODS CLI
+    bool check_configuration(); //a implementer
+    void show_configuration(); //a implementer
+    float distance_to_volume(float distance, Syringe* id_syringe); //a implementer
+    //set_emergency ?  emergency() ? =ajouter un membre emergency
+    //runfromEmergency ?
+
 };
 
-//extern SyringeFilled syringefilled;
\ No newline at end of file
+extern SyringeFilled syringe_filled;
\ No newline at end of file