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
06589e2f
Commit
06589e2f
authored
1 year ago
by
Malaurie Bernard
Browse files
Options
Downloads
Patches
Plain Diff
Working on syringe_json wrting
parent
ba41f79e
No related branches found
No related tags found
1 merge request
!17
Malaurie's work on UI + CLI interface + AccelStepper interface
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
syringe.cpp
+1
-9
1 addition, 9 deletions
syringe.cpp
syringe.h
+0
-1
0 additions, 1 deletion
syringe.h
web.cpp
+5
-2
5 additions, 2 deletions
web.cpp
web.h
+2
-0
2 additions, 0 deletions
web.h
with
8 additions
and
12 deletions
syringe.cpp
+
1
−
9
View file @
06589e2f
...
@@ -10,10 +10,7 @@ Syringe syringe;
...
@@ -10,10 +10,7 @@ Syringe syringe;
//CONSTRUCTOR
//CONSTRUCTOR
Syringe
::
Syringe
()
Syringe
::
Syringe
()
{
{
set_name
(
"BD_10mL"
);
set_syringe
(
"BD_10mL"
,
10
,
14.5
);
set_total_volume_mL
(
"BD_10mL"
,
10
);
set_internal_diameter_mm
(
"BD_10mL"
,
14.5
);
//set_syringe("BD_10mL", 10, 14.5);
//set_syringe("Terumo_5mL", 5, 10);
//set_syringe("Terumo_5mL", 5, 10);
//set_syringe("Terumo_2mL", 2, 3);
//set_syringe("Terumo_2mL", 2, 3);
//set_syringe("FisherBrand_1mL", 1, 0.5);
//set_syringe("FisherBrand_1mL", 1, 0.5);
...
@@ -24,15 +21,10 @@ Syringe :: Syringe()
...
@@ -24,15 +21,10 @@ Syringe :: Syringe()
//SET METHODS
//SET METHODS
void
Syringe
::
set_syringe
(
String
name
,
float
total_volume_mL
,
float
internal_diameter_mm
)
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_total_volume_mL
(
name
,
total_volume_mL
);
set_internal_diameter_mm
(
name
,
internal_diameter_mm
);
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
)
void
Syringe
::
set_total_volume_mL
(
String
name
,
float
total_volume_mL
)
{
{
...
...
This diff is collapsed.
Click to expand it.
syringe.h
+
0
−
1
View file @
06589e2f
...
@@ -32,7 +32,6 @@ class Syringe
...
@@ -32,7 +32,6 @@ class Syringe
//SET METHODS
//SET METHODS
void
set_syringe
(
String
name
,
float
total_volume_mL
,
float
internal_diameter_mm
);
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_total_volume_mL
(
String
name
,
float
total_volume_mL
);
void
set_internal_diameter_mm
(
String
name
,
float
internal_diameter_mm
);
void
set_internal_diameter_mm
(
String
name
,
float
internal_diameter_mm
);
...
...
This diff is collapsed.
Click to expand it.
web.cpp
+
5
−
2
View file @
06589e2f
...
@@ -42,7 +42,7 @@ void web_setup ()
...
@@ -42,7 +42,7 @@ void web_setup ()
//Configurations
//Configurations
//Choice_of_syringe_model
//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
);
select_syringe_maj
(
configurations
);
...
@@ -183,7 +183,7 @@ void volume_exchange_mL_callback (Control* sender, int value, void* param)
...
@@ -183,7 +183,7 @@ void volume_exchange_mL_callback (Control* sender, int value, void* param)
{
{
Serial
.
printf
(
"val=%s
\n
"
,
sender
->
value
.
c_str
());
Serial
.
printf
(
"val=%s
\n
"
,
sender
->
value
.
c_str
());
syringe_filled
.
set_exchange_volume_mL
(
atof
(
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
)
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)
...
@@ -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
.
set_syringe
(
name_new_syringe_value
,
total_volume_mL_new_syringe_value
.
toFloat
(),
internal_diameter_mm_new_syringe_value
.
toFloat
());
syringe
.
write_Json
();
syringe
.
write_Json
();
select_syringe_maj
(
configurations
);
break
;
break
;
case
B_UP
:
case
B_UP
:
...
...
This diff is collapsed.
Click to expand it.
web.h
+
2
−
0
View file @
06589e2f
...
@@ -14,6 +14,8 @@
...
@@ -14,6 +14,8 @@
#define syringe_pump_length_mm 50
#define syringe_pump_length_mm 50
//Create tabs
uint16_t
configurations
,
new_syringe
,
features
;
//***ABOVE***//
//***ABOVE***//
...
...
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