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
f93c9f33
Commit
f93c9f33
authored
1 year ago
by
Malaurie Bernard
Browse files
Options
Downloads
Patches
Plain Diff
Fixing the method stop() in motor so the motor can stop without keep on turning
parent
64ac0700
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
motor.cpp
+3
-1
3 additions, 1 deletion
motor.cpp
web.cpp
+1
-1
1 addition, 1 deletion
web.cpp
with
4 additions
and
2 deletions
motor.cpp
+
3
−
1
View file @
f93c9f33
...
...
@@ -133,6 +133,8 @@ void Motor :: stop ()
{
#if !CORE_MOCK
cli
();
stepper
.
setAcceleration
(
1e20
);
stepper
.
moveTo
(
stepper
.
currentPosition
());
stepper
.
stop
();
sei
();
#endif
...
...
@@ -148,7 +150,7 @@ void Motor :: stay_here ()
#if !CORE_MOCK
cli
();
stepper
.
setAcceleration
(
1e20
);
stepper
.
moveTo
(
stepper
.
currentPosition
());
// change target to here
stepper
.
moveTo
(
stepper
.
currentPosition
());
// change target to here
set_accel_mm_per_sec_per_sec
(
_acceleration_mm_per_sec_per_sec
);
sei
();
#endif
...
...
This diff is collapsed.
Click to expand it.
web.cpp
+
1
−
1
View file @
f93c9f33
...
...
@@ -383,7 +383,7 @@ void switch_status_callback1(Control* sender, int value, void* param)
ESPUI
.
print
(
status_label_id1
,
"A l'arrêt"
);
ESPUI
.
setPanelStyle
(
status_label_id1
,
couleurs
[
2
]);
ESPUI
.
setElementStyle
(
status_label_id1
,
couleurs
[
3
]);
syringe_filled
.
st
ay_here
();
syringe_filled
.
st
op
();
break
;
}
...
...
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