From 501d3b84616f2dab72230cb02a8b18552e3218e3 Mon Sep 17 00:00:00 2001
From: Malaurie Bernard <mbernard@kinouby>
Date: Wed, 5 Jul 2023 14:23:07 +0200
Subject: [PATCH] Deletion of setupJsonSyringe(filled) methods because they
are repetitive of setter methods and would be called in the constructor, we
don't need another method to do it.
---
syringe.cpp | 16 ----------------
syringe.h | 1 -
syringefilled.cpp | 17 -----------------
syringefilled.h | 2 --
4 files changed, 36 deletions(-)
diff --git a/syringe.cpp b/syringe.cpp
index ebb9f37..e2e3a56 100644
--- a/syringe.cpp
+++ b/syringe.cpp
@@ -39,22 +39,6 @@ string Syringe :: get_id()
-void Syringe :: setupJsonSyringe( float total_volume_mL, float internal_diameter_mm, int id)
-{
-
- //ADD INITIALISATION VALUES TO THE DOC
- SyringeJSON["total_volume_mL"] = total_volume_mL;
- SyringeJSON["internal_diameter_mm"] = internal_diameter_mm;
- SyringeJSON["id"] = id;
-
-
-}
-
-
-
-
-
-
diff --git a/syringe.h b/syringe.h
index 05bb572..0536ac8 100644
--- a/syringe.h
+++ b/syringe.h
@@ -27,7 +27,6 @@ class Syringe
//JSON DOCUMENT
StaticJsonDocument<200> SyringeJSON; //200 = RAM allocated to this document
- void setupJsonSyringe( float total_volume_mL, float internal_diameter_mm, int id);
};
diff --git a/syringefilled.cpp b/syringefilled.cpp
index aee95ee..17f42b7 100644
--- a/syringefilled.cpp
+++ b/syringefilled.cpp
@@ -89,23 +89,6 @@ 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_push)
-{
-
- //ADD INITIALISATION VALUES TO THE DOC
- SyringeFilledJSON["exchange_throughput_uL_per_sec"] = exchange_throughput_uL_per_sec;
- SyringeFilledJSON["exchange_volume_mL"] = exchange_volume_mL;
- SyringeFilledJSON["remaining_volume_mL"] = remaining_volume_mL;
- SyringeFilledJSON["push"] = push;
- SyringeFilledJSON["id_syringe"] = SyringeJSON["id"];
- SyringeFilledJSON["screw_thread_mm"] = screw_thread_mm;
- SyringeFilledJSON["clockwise_equals_push"] = clockwise_equals_push;
-
-
-
-}
-
-
//CONVERSIONS
float SyringeFilled::volume_to_distance(float volume_mL, Syringe* id_syringe)
diff --git a/syringefilled.h b/syringefilled.h
index 8cbfe8b..4724fd7 100644
--- a/syringefilled.h
+++ b/syringefilled.h
@@ -66,8 +66,6 @@ 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_push);
-
//CONVERSIONS
float volume_to_distance(float volume_mL, Syringe* id_syringe);
--
GitLab