Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pousseseringue-arduino
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FabLAAS
PousseSeringue
pousseseringue-arduino
Commits
7780a079
Commit
7780a079
authored
1 year ago
by
Malaurie Bernard
Browse files
Options
Downloads
Patches
Plain Diff
Changing type of syringe id from int to string
parent
9acc060d
No related branches found
No related tags found
1 merge request
!17
Malaurie's work on UI + CLI interface + AccelStepper interface
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
syringe.cpp
+3
-4
3 additions, 4 deletions
syringe.cpp
syringe.h
+2
-3
2 additions, 3 deletions
syringe.h
with
5 additions
and
7 deletions
syringe.cpp
+
3
−
4
View file @
7780a079
...
...
@@ -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
(
in
t
id
){
void
Syringe
::
set_id
(
str
in
g
id
){
SyringeJSON
[
"id"
]
=
id
;
}
...
...
@@ -33,9 +32,9 @@ float Syringe :: get_internal_diameter_mm()
return
SyringeJSON
[
"internal_diameter_mm"
].
as
<
float
>
();
}
in
t
Syringe
::
get_id
()
str
in
g
Syringe
::
get_id
()
{
return
SyringeJSON
[
"id"
].
as
<
float
>
();
return
SyringeJSON
[
"id"
].
as
<
string
>
();
}
...
...
This diff is collapsed.
Click to expand it.
syringe.h
+
2
−
3
View file @
7780a079
...
...
@@ -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
(
in
t
id
);
void
set_id
(
str
in
g
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment