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
a7b2dc35
Commit
a7b2dc35
authored
1 year ago
by
Malaurie Bernard
Browse files
Options
Downloads
Patches
Plain Diff
Changing every pump syringe by synringe pump (juste the name)
parent
ccaf0928
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
syringefilled.cpp
+2
-2
2 additions, 2 deletions
syringefilled.cpp
syringefilled.h
+2
-2
2 additions, 2 deletions
syringefilled.h
with
4 additions
and
4 deletions
syringefilled.cpp
+
2
−
2
View file @
a7b2dc35
...
@@ -140,11 +140,11 @@ float SyringeFilled :: move()
...
@@ -140,11 +140,11 @@ float SyringeFilled :: move()
if
(
whereStep
()
==
0
)
//If we are putting the syringe for the first time
if
(
whereStep
()
==
0
)
//If we are putting the syringe for the first time
{
{
moveToMm
(
pump_
syringe_length_mm
-
remaining_volume_mm3
/
section_mm2
);
moveToMm
(
syringe_
pump_
length_mm
-
remaining_volume_mm3
/
section_mm2
);
}
}
else
else
{
{
float
initial_position_mm
=
pump_
syringe_length_mm
-
remaining_volume_mm3
/
section_mm2
;
float
initial_position_mm
=
syringe_
pump_
length_mm
-
remaining_volume_mm3
/
section_mm2
;
if
(
get_push
())
//If we want to deliver some liquid
if
(
get_push
())
//If we want to deliver some liquid
{
{
...
...
This diff is collapsed.
Click to expand it.
syringefilled.h
+
2
−
2
View file @
a7b2dc35
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#include
<ArduinoJson.h>
#include
<ArduinoJson.h>
#include
"math.h"
#include
"math.h"
#define
pump_
syringe_length_mm 50
#define syringe_
pump_
length_mm 50
class
SyringeFilled
:
public
Motor
class
SyringeFilled
:
public
Motor
{
{
...
@@ -27,7 +27,7 @@ class SyringeFilled : public Motor
...
@@ -27,7 +27,7 @@ class SyringeFilled : public Motor
//Syringe
//Syringe
Syringe
*
_id_syringe
;
//Not sure how to manage it
Syringe
*
_id_syringe
;
//Not sure how to manage it
//
Pump-
Syringe
//Syringe
_Pump
float
_screw_thread_mm
;
float
_screw_thread_mm
;
bool
_clockwise_equals_forward
;
bool
_clockwise_equals_forward
;
...
...
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