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
5cb62294
Commit
5cb62294
authored
1 year ago
by
Malaurie Bernard
Browse files
Options
Downloads
Patches
Plain Diff
add space in json files
parent
a730dc1b
No related branches found
No related tags found
1 merge request
!17
Malaurie's work on UI + CLI interface + AccelStepper interface
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
syringe.cpp
+1
-1
1 addition, 1 deletion
syringe.cpp
syringe.h
+2
-2
2 additions, 2 deletions
syringe.h
syringefilled.h
+1
-1
1 addition, 1 deletion
syringefilled.h
with
4 additions
and
4 deletions
syringe.cpp
+
1
−
1
View file @
5cb62294
...
...
@@ -51,7 +51,7 @@ float Syringe :: get_internal_diameter_mm(String name)
{
return
syringe_json
[
name
][
"internal_diameter_mm"
].
as
<
float
>
();
}
const
StaticJsonDocument
<
2
00
>&
Syringe
::
get_syringe_database
()
const
StaticJsonDocument
<
4
00
>&
Syringe
::
get_syringe_database
()
{
return
syringe_json
;
}
...
...
This diff is collapsed.
Click to expand it.
syringe.h
+
2
−
2
View file @
5cb62294
...
...
@@ -22,7 +22,7 @@ class Syringe
float
_internal_diameter_mm
;
//JSON DOCUMENT
StaticJsonDocument
<
2
00
>
syringe_json
;
//
2
00 = RAM allocated to this document
StaticJsonDocument
<
4
00
>
syringe_json
;
//
4
00 = RAM allocated to this document
public
:
...
...
@@ -39,7 +39,7 @@ class Syringe
float
get_total_volume_mL
(
String
name
);
float
get_internal_diameter_mm
(
String
name
);
const
StaticJsonDocument
<
2
00
>&
get_syringe_database
();
const
StaticJsonDocument
<
4
00
>&
get_syringe_database
();
const
JsonObject
get_syringe_database_object
();
...
...
This diff is collapsed.
Click to expand it.
syringefilled.h
+
1
−
1
View file @
5cb62294
...
...
@@ -46,7 +46,7 @@ class SyringeFilled : public Motor
bool
_emergency
;
//JSON DOCUMENT
StaticJsonDocument
<
3
00
>
syringe_filled_json
;
//
2
00 = RAM allocated to this document
StaticJsonDocument
<
4
00
>
syringe_filled_json
;
//
4
00 = RAM allocated to this document
public
:
...
...
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