!changing names of json document so there is no capital letter anymore to respect snake_case

syringe.cpp

@@ -3,7 +3,7 @@
 
 #include "syringe.h"
 
-StaticJsonDocument<200> Syringe :: SyringeJSON;  //200 = RAM allocated to this document
+StaticJsonDocument<200> Syringe :: syringe_json;  //200 = RAM allocated to this document
 
 //CONSTRUCTORS
 Syringe :: Syringe()
@@ -27,7 +27,7 @@ Syringe :: Syringe(String name, string ref, string brand, float total_volume_mL,
 //SET METHODS
 void Syringe :: set_syringe(String name, string ref, string brand, float total_volume_mL, float internal_diameter_mm)
 {
-    SyringeJSON["name"] = name;
+    syringe_json["name"] = name;
     set_ref(name, ref);
     set_brand(name, brand);
     set_total_volume_mL(name, total_volume_mL);
@@ -36,22 +36,22 @@ void Syringe :: set_syringe(String name, string ref, string brand, float total_v
 
 void Syringe :: set_ref(String name, string ref)
 {
-    SyringeJSON[name]["ref"] = ref;
+    syringe_json[name]["ref"] = ref;
 }
 
 void Syringe :: set_brand(String name, string brand)
 {
-    SyringeJSON[name]["brand"] = brand;
+    syringe_json[name]["brand"] = brand;
 }
 
 void Syringe :: set_total_volume_mL(String name, float total_volume_mL)
 {
-    SyringeJSON[name]["total_volume_mL"] = total_volume_mL;
+    syringe_json[name]["total_volume_mL"] = total_volume_mL;
 }
 
 void Syringe :: set_internal_diameter_mm(String name, float internal_diameter_mm)
 {
-    SyringeJSON[name]["internal_diameter_mm"] = internal_diameter_mm;
+    syringe_json[name]["internal_diameter_mm"] = internal_diameter_mm;
 }
 
 
@@ -61,36 +61,36 @@ void Syringe :: set_internal_diameter_mm(String name, float internal_diameter_mm
 //GET METHODS
 string Syringe :: get_ref(String name)
 {
-    return SyringeJSON[name]["ref"].as<string>();
+    return syringe_json[name]["ref"].as<string>();
 }
 
 string Syringe :: get_brand(String name)
 {
-    return SyringeJSON[name]["brand"].as<string>();
+    return syringe_json[name]["brand"].as<string>();
 }
 
 float Syringe :: get_total_volume_mL(String name)
 {
-    return SyringeJSON[name]["total_volume_mL"].as<float>();
+    return syringe_json[name]["total_volume_mL"].as<float>();
 }
 
 float Syringe :: get_internal_diameter_mm(String name)
 {
-    return SyringeJSON[name]["internal_diameter_mm"].as<float>();
+    return syringe_json[name]["internal_diameter_mm"].as<float>();
 }
 const StaticJsonDocument<200>& Syringe :: get_syringe_database()
 {
-    return SyringeJSON;
+    return syringe_json;
 }
 
 
 //CONFIGURATION
 bool Syringe :: check_configuration(String name)
 {
-    if (SyringeJSON[name]["total_volume_mL"] < 0)
+    if (syringe_json[name]["total_volume_mL"] < 0)
     return false;
 
-    else if (SyringeJSON[name]["internal_diameter_mm"] < 0)
+    else if (syringe_json[name]["internal_diameter_mm"] < 0)
     return false;
 
     else
@@ -113,7 +113,7 @@ void Syringe :: write_Json (Stream& output_stream)
 ***/
 
 InterruptLock lock; //useful thanks to its constructor (so a is not visible in the code)
-serializeJson(SyringeJSON, output_stream);
+serializeJson(syringe_json, output_stream);
 
 }
 
@@ -128,7 +128,7 @@ void Syringe :: read_Json (Stream& input_stream)
 ***/
 
 InterruptLock lock; //useful thanks to its constructor (so a is not visible in the code)
-deserializeJson(SyringeJSON, input_stream);
+deserializeJson(syringe_json, input_stream);
 
 }
 

syringe.h

@@ -22,7 +22,7 @@ class Syringe
   float _internal_diameter_mm;
 
   //JSON DOCUMENT
-  static StaticJsonDocument<200> SyringeJSON;  //200 = RAM allocated to this document
+  static StaticJsonDocument<200> syringe_json;  //200 = RAM allocated to this document
 
 
   public :

syringefilled.cpp

 
 #include "syringefilled.h"
 
-StaticJsonDocument<200> SyringeFilled :: SyringeFilledJSON;  //200 = RAM allocated to this document
+StaticJsonDocument<200> SyringeFilled :: syringe_filled_json;  //200 = RAM allocated to this document
 
 
 //CONSTRUCTORS
@@ -22,92 +22,92 @@ SyringeFilled :: SyringeFilled (MotorHardware_t& stepper): Motor(stepper)
 //SET METHODS
 void SyringeFilled :: set_exchange_throughput_uL_per_sec(float exchange_throughput_uL_per_sec)
 {
-    SyringeFilledJSON["exchange_throughput_uL_per_sec"] = exchange_throughput_uL_per_sec;
+    syringe_filled_json["exchange_throughput_uL_per_sec"] = exchange_throughput_uL_per_sec;
 }
 
 void SyringeFilled :: set_exchange_volume_mL(float exchange_volume_mL)
 {
-    SyringeFilledJSON["exchange_volume_mL"] = exchange_volume_mL;
+    syringe_filled_json["exchange_volume_mL"] = exchange_volume_mL;
 }
 
 void SyringeFilled :: set_remaining_volume_mL(float remaining_volume_mL)
 {
-    SyringeFilledJSON["remaining_volume_mL"] = remaining_volume_mL;
+    syringe_filled_json["remaining_volume_mL"] = remaining_volume_mL;
 }
 
 void SyringeFilled :: set_push(bool push)
 {
-    SyringeFilledJSON["push"] = push;
+    syringe_filled_json["push"] = push;
 }
 
 void SyringeFilled :: set_name_syringe(Syringe* name_syringe){
-    SyringeFilledJSON["name_syringe"] = name_syringe;
+    syringe_filled_json["name_syringe"] = name_syringe;
 }
 
 void SyringeFilled :: set_screw_thread_mm(float screw_thread_mm)
 {
-    SyringeFilledJSON["screw_thread_mm"] = screw_thread_mm;
+    syringe_filled_json["screw_thread_mm"] = screw_thread_mm;
 }
 
 void SyringeFilled :: set_clockwise_equals_push(bool clockwise_equals_push)
 {
-    SyringeFilledJSON["clockwise_equals_push"] = clockwise_equals_push;
+    syringe_filled_json["clockwise_equals_push"] = clockwise_equals_push;
 }
 
 void SyringeFilled :: set_emergency(bool emergency)
 {
-    SyringeFilledJSON["emergency"] = emergency;
+    syringe_filled_json["emergency"] = emergency;
 }
 
 
 //GET METHODS
 float SyringeFilled :: get_exchange_throughput_uL_per_sec()
 {
-    return SyringeFilledJSON["exchange_throughput_uL_per_sec"].as<float>();
+    return syringe_filled_json["exchange_throughput_uL_per_sec"].as<float>();
 }
 
 float SyringeFilled :: get_exchange_volume_mL()
 {
-    return SyringeFilledJSON["exchange_volume_mL"].as<float>();
+    return syringe_filled_json["exchange_volume_mL"].as<float>();
 }
 
 float SyringeFilled :: get_remaining_volume_mL()
 {
-    return SyringeFilledJSON["remaining_volume_mL"].as<float>();
+    return syringe_filled_json["remaining_volume_mL"].as<float>();
 }
 
 bool SyringeFilled :: get_push()
 {
-    return SyringeFilledJSON["push"].as<bool>();
+    return syringe_filled_json["push"].as<bool>();
 }
 
 String SyringeFilled :: get_name_syringe()
 {
-    return SyringeFilledJSON["name_syringe"].as<String>();
+    return syringe_filled_json["name_syringe"].as<String>();
 }
 
 float SyringeFilled :: get_screw_thread_mm()
 {
-    return SyringeFilledJSON["screw_thread_mm"].as<float>();
+    return syringe_filled_json["screw_thread_mm"].as<float>();
 }
 
 bool SyringeFilled :: get_clockwise_equals_push()
 {
-    return SyringeFilledJSON["clockwise_equals_push"].as<float>();
+    return syringe_filled_json["clockwise_equals_push"].as<float>();
 }
 
 bool SyringeFilled :: get_emergency()
 {
-    return SyringeFilledJSON["emergency"].as<bool>();
+    return syringe_filled_json["emergency"].as<bool>();
 }
 
 const StaticJsonDocument<200>& SyringeFilled :: get_syringe_filled_data()
 {
-    return SyringeFilledJSON;
+    return syringe_filled_json;
 }
 
 //CONVERSIONS
-    StaticJsonDocument<200> SyringeFilledJSON;  //200 = RAM allocated to this document
+StaticJsonDocument<200> syringe_filled_json;  //200 = RAM allocated to this document
 float SyringeFilled::volume_to_distance(float volume_mL)
 /***
 -Argument : Volume in mL.
@@ -117,7 +117,7 @@ float SyringeFilled::volume_to_distance(float volume_mL)
 {
     float volume_mm3 = 1000*volume_mL; //mL->mm3
 
-    float piston_surface_mm2 = Syringe :: get_syringe_database()[SyringeFilledJSON["name_syringe"]]["internal_diameter"];
+    float piston_surface_mm2 = Syringe :: get_syringe_database()[syringe_filled_json["name_syringe"]]["internal_diameter"];
 
     float distance_mm = volume_mm3/piston_surface_mm2;
 
@@ -131,7 +131,7 @@ float SyringeFilled::distance_to_volume(float distance_mm)
 -Action   : /
 ***/
 {
-    float piston_surface_mm2 = Syringe :: get_syringe_database()[SyringeFilledJSON["name_syringe"]]["internal_diameter"];
+    float piston_surface_mm2 = Syringe :: get_syringe_database()[syringe_filled_json["name_syringe"]]["internal_diameter"];
 
     float volume_mm3 = distance_mm*piston_surface_mm2;
 
@@ -153,7 +153,7 @@ float SyringeFilled :: move()
     float exchange_volume_mm3 = get_exchange_volume_mL()*1000;
 
     //Find the section
-    float radius = Syringe :: get_syringe_database()[SyringeFilledJSON["name_syringe"]]["internal_diameter_mm"];
+    float radius = Syringe :: get_syringe_database()[syringe_filled_json["name_syringe"]]["internal_diameter_mm"];
     float section_mm2 = M_PI*radius*radius;
 
 
@@ -258,7 +258,7 @@ bool SyringeFilled :: check_configuration()
 -Action   : Check if the values are correct.
 ***/
 {
-    if (Syringe :: get_syringe_database()[SyringeFilledJSON["name_syringe"]]["internal_diameter"] <= 0)
+    if (Syringe :: get_syringe_database()[syringe_filled_json["name_syringe"]]["internal_diameter"] <= 0)
         return false;
 
     if (get_exchange_volume_mL() < 0)
@@ -294,8 +294,8 @@ void SyringeFilled :: show_configuration()
                   "#     emergency: %d\n"
                   "#     current position: %g mm\n",
                   get_clockwise_equals_push()? "yes": "no",
-                  Syringe :: get_syringe_database()[SyringeFilledJSON["name_syringe"]]["internal_diameter"],
-                  Syringe :: get_syringe_database()[SyringeFilledJSON["name_syringe"]]["total_volume_mL"],
+                  Syringe :: get_syringe_database()[syringe_filled_json["name_syringe"]]["internal_diameter"],
+                  Syringe :: get_syringe_database()[syringe_filled_json["name_syringe"]]["total_volume_mL"],
                   get_exchange_throughput_uL_per_sec(),
                   volume_to_distance(get_exchange_throughput_uL_per_sec()),
                   get_remaining_volume_mL(),
@@ -315,7 +315,7 @@ void SyringeFilled :: write_Json (Stream& output_stream) //file_name sera le nom
 ***/
 
 InterruptLock lock; //useful thanks to its constructor (so a is not visible in the code)
-serializeJson(SyringeFilledJSON, output_stream);
+serializeJson(syringe_filled_json, output_stream);
   
 }
 
@@ -330,7 +330,7 @@ void SyringeFilled :: read_Json (Stream& input_stream) //file_name sera le nom d
 ***/
 
 InterruptLock lock; //useful thanks to its constructor (so a is not visible in the code)
-deserializeJson(SyringeFilledJSON, input_stream);
+deserializeJson(syringe_filled_json, input_stream);
 
 }
 

syringefilled.h

@@ -39,7 +39,7 @@ class SyringeFilled : public Motor
     bool _emergency;
 
     //JSON DOCUMENT
-    static StaticJsonDocument<200> SyringeFilledJSON;  //200 = RAM allocated to this document
+    static StaticJsonDocument<200> syringe_filled_json;  //200 = RAM allocated to this document
 
 
     public :