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
30b738dc
Commit
30b738dc
authored
1 year ago
by
Malaurie Bernard
Browse files
Options
Downloads
Patches
Plain Diff
code editting
parent
dd8de32e
No related branches found
No related tags found
1 merge request
!17
Malaurie's work on UI + CLI interface + AccelStepper interface
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
web.cpp
+1
-3
1 addition, 3 deletions
web.cpp
with
1 addition
and
3 deletions
web.cpp
+
1
−
3
View file @
30b738dc
...
@@ -527,12 +527,10 @@ void Web :: choose_syringe_callback (Control* sender, int value)
...
@@ -527,12 +527,10 @@ void Web :: choose_syringe_callback (Control* sender, int value)
{
{
case
B_DOWN
:
case
B_DOWN
:
//syringe_volume_mL_value = 2; //Mettre la valeur associé au nom choisit du select
syringe_volume_mL_value
=
syringe
.
get_syringe_database
()[
select_value
][
"total_volume_mL"
];
syringe_volume_mL_value
=
syringe
.
get_syringe_database
()[
select_value
][
"total_volume_mL"
];
syringe_volume_mL_string
=
"Volume total: "
+
std
::
to_string
(
syringe_volume_mL_value
)
+
"mL"
;
syringe_volume_mL_string
=
"Volume total: "
+
std
::
to_string
(
syringe_volume_mL_value
)
+
"mL"
;
ESPUI
.
print
(
syringe_volume_mL
,
syringe_volume_mL_string
.
c_str
());
ESPUI
.
print
(
syringe_volume_mL
,
syringe_volume_mL_string
.
c_str
());
//syringe_diameter_mm_value = 1; //Mettre la valeur associé au nom choisit du select
syringe_diameter_mm_value
=
syringe
.
get_syringe_database
()[
select_value
][
"internal_diameter_mm"
];
syringe_diameter_mm_value
=
syringe
.
get_syringe_database
()[
select_value
][
"internal_diameter_mm"
];
syringe_diameter_mm_string
=
"internal diameter : "
+
std
::
to_string
(
syringe_diameter_mm_value
)
+
"mm"
;
syringe_diameter_mm_string
=
"internal diameter : "
+
std
::
to_string
(
syringe_diameter_mm_value
)
+
"mm"
;
ESPUI
.
print
(
syringe_diameter_mm
,
syringe_diameter_mm_string
.
c_str
());
ESPUI
.
print
(
syringe_diameter_mm
,
syringe_diameter_mm_string
.
c_str
());
...
@@ -544,7 +542,7 @@ void Web :: choose_syringe_callback (Control* sender, int value)
...
@@ -544,7 +542,7 @@ void Web :: choose_syringe_callback (Control* sender, int value)
}
}
serial_print
(
"choose_syringe"
,
sender
);
serial_print
(
"choose_syringe"
,
sender
);
serial_print
(
"name_
new_
syringe (sender->value)"
,
sender
);
serial_print
(
"name_syringe
_chosen
(sender->value)"
,
sender
);
Serial
.
println
(
"Volume_total (json value)"
);
Serial
.
println
(
"Volume_total (json value)"
);
Serial
.
println
(
String
(
"Value: "
)
+
String
((
syringe
.
get_syringe_database
()[
syringe_filled
.
get_name_syringe
()][
"total_volume_mL"
]).
as
<
const
char
*>
()));
Serial
.
println
(
String
(
"Value: "
)
+
String
((
syringe
.
get_syringe_database
()[
syringe_filled
.
get_name_syringe
()][
"total_volume_mL"
]).
as
<
const
char
*>
()));
...
...
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