From 06589e2fc1a6d8c9a4fe93a9cfc4a31f7727c3fa Mon Sep 17 00:00:00 2001
From: Malaurie Bernard <mbernard@kinouby>
Date: Thu, 20 Jul 2023 10:43:05 +0200
Subject: [PATCH] Working on syringe_json wrting
---
syringe.cpp | 10 +---------
syringe.h | 1 -
web.cpp | 7 +++++--
web.h | 2 ++
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/syringe.cpp b/syringe.cpp
index 21e2df5..aad4cef 100644
--- a/syringe.cpp
+++ b/syringe.cpp
@@ -10,10 +10,7 @@ Syringe syringe;
//CONSTRUCTOR
Syringe :: Syringe()
{
- set_name("BD_10mL");
- set_total_volume_mL("BD_10mL", 10);
- set_internal_diameter_mm("BD_10mL", 14.5);
- //set_syringe("BD_10mL", 10, 14.5);
+ set_syringe("BD_10mL", 10, 14.5);
//set_syringe("Terumo_5mL", 5, 10);
//set_syringe("Terumo_2mL", 2, 3);
//set_syringe("FisherBrand_1mL", 1, 0.5);
@@ -24,15 +21,10 @@ Syringe :: Syringe()
//SET METHODS
void Syringe :: set_syringe(String name, float total_volume_mL, float internal_diameter_mm)
{
- syringe_json["name"] = name;
set_total_volume_mL(name, total_volume_mL);
set_internal_diameter_mm(name, internal_diameter_mm);
}
-void Syringe :: set_name( String name)
-{
- syringe_json["name"] = name;
-}
void Syringe :: set_total_volume_mL(String name, float total_volume_mL)
{
diff --git a/syringe.h b/syringe.h
index 50a0299..cd0c862 100644
--- a/syringe.h
+++ b/syringe.h
@@ -32,7 +32,6 @@ class Syringe
//SET METHODS
void set_syringe(String name, float total_volume_mL, float internal_diameter_mm);
- void set_name( String name);
void set_total_volume_mL(String name, float total_volume_mL);
void set_internal_diameter_mm(String name, float internal_diameter_mm);
diff --git a/web.cpp b/web.cpp
index 576ff96..1efa279 100644
--- a/web.cpp
+++ b/web.cpp
@@ -42,7 +42,7 @@ void web_setup ()
//Configurations
//Choice_of_syringe_model
- //ESPUI.addControl(ControlType::Separator, "Seringue 1", "", ControlColor::None, configurations);
+ ESPUI.addControl(ControlType::Separator, "Seringue 1", "", ControlColor::None, configurations);
select_syringe_maj(configurations);
@@ -183,7 +183,7 @@ void volume_exchange_mL_callback (Control* sender, int value, void* param)
{
Serial.printf("val=%s\n", sender->value.c_str());
syringe_filled.set_exchange_volume_mL(atof(sender->value.c_str()));
-
+ syringe_filled.write_Json ();
}
void switch_push_pull_choice_callback (Control* sender, int value, void* param)
@@ -316,6 +316,9 @@ void add_syringe_callback (Control* sender, int value, void* param)
syringe.set_syringe(name_new_syringe_value, total_volume_mL_new_syringe_value.toFloat(), internal_diameter_mm_new_syringe_value.toFloat());
syringe.write_Json();
+
+ select_syringe_maj(configurations);
+
break;
case B_UP:
diff --git a/web.h b/web.h
index f1a18c6..3d0ed34 100644
--- a/web.h
+++ b/web.h
@@ -14,6 +14,8 @@
#define syringe_pump_length_mm 50
+//Create tabs
+uint16_t configurations, new_syringe, features;
//***ABOVE***//
--
GitLab