Skip to content
Snippets Groups Projects
Commit 7780a079 authored by Malaurie Bernard's avatar Malaurie Bernard
Browse files

Changing type of syringe id from int to string

parent 9acc060d
No related branches found
No related tags found
1 merge request!17Malaurie's work on UI + CLI interface + AccelStepper interface
......@@ -4,7 +4,6 @@
#include "syringe.h"
//SET METHODS
void Syringe :: set_total_volume_mL(float total_volume_mL)
{
......@@ -16,7 +15,7 @@ void Syringe :: set_internal_diameter_mm(float internal_diameter_mm)
SyringeJSON["internal_diameter_mm"] = internal_diameter_mm;
}
void Syringe :: set_id(int id){
void Syringe :: set_id(string id){
SyringeJSON["id"] = id;
}
......@@ -33,9 +32,9 @@ float Syringe :: get_internal_diameter_mm()
return SyringeJSON["internal_diameter_mm"].as<float>();
}
int Syringe :: get_id()
string Syringe :: get_id()
{
return SyringeJSON["id"].as<float>();
return SyringeJSON["id"].as<string>();
}
......
......@@ -18,13 +18,12 @@ class Syringe
//SET METHODS
void set_total_volume_mL(float total_volume_mL);
void set_internal_diameter_mm(float internal_diameter_mm);
void set_id(int id);
void set_id(string id);
//GET METHODS
float get_total_volume_mL();
float get_internal_diameter_mm();
int get_id();
string get_id();
//JSON DOCUMENT
StaticJsonDocument<200> SyringeJSON; //200 = RAM allocated to this document
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment