From b1d746f881f52dab294085ded5699d7a4fe2a190 Mon Sep 17 00:00:00 2001
From: Malaurie Bernard <mbernard@kinouby>
Date: Wed, 12 Jul 2023 17:31:08 +0200
Subject: [PATCH] Fixing Json writing problems
---
syringe.cpp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/syringe.cpp b/syringe.cpp
index 5f0ff8d..ee288d6 100644
--- a/syringe.cpp
+++ b/syringe.cpp
@@ -10,10 +10,10 @@ Syringe syringe;
//CONSTRUCTOR
Syringe :: Syringe()
{
- //set_syringe("BD_10mL", "300912","BD", 10, 14.5);
+ set_syringe("BD_10mL", "300912","BD", 10, 14.5);
set_syringe("Terumo_5mL", "0197","Terumo", 5, 10);
- syringe_json["BD_10mL"] = 10;
- syringe_json["nom"] = "bidule";
+ set_syringe("Terumo_2mL", "0197", "Terumo", 2, 3);
+ set_syringe("FisherBrand_1mL", "1234", "FisherBrand", 1, 0.5);
}
@@ -21,7 +21,6 @@ Syringe :: Syringe()
//SET METHODS
void Syringe :: set_syringe(String name, String ref, String brand, float total_volume_mL, float internal_diameter_mm)
{
- syringe_json["name"] = name;
set_ref(name, ref);
set_brand(name, brand);
set_total_volume_mL(name, total_volume_mL);
@@ -109,9 +108,9 @@ void Syringe :: write_Json ()
-Action : Save the Json structure in a file (convert it to text)
***/
{
-//InterruptLock lock; //useful thanks to its constructor (so a is not visible in the code)
-//File f = filesystem->open("syringe_json", "w"); //Creation du fichier
-serializeJson(syringe_json, Serial); //remettre f a la plce de json
+InterruptLock lock; //useful thanks to its constructor (so a is not visible in the code)
+File f = filesystem->open("syringe_json", "w"); //Creation du fichier
+serializeJson(syringe_json, f); //remettre f a la plce de json
}
--
GitLab