Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
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
Service Desk
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
Jonas Leder
marlin-anet-a8
Commits
5d0deba9
Commit
5d0deba9
authored
5 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Longer default power-up delay
See MarlinFirmware/Configurations#78
parent
78fe411c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/Configuration.h
+1
-1
1 addition, 1 deletion
Marlin/Configuration.h
Marlin/src/feature/power.cpp
+3
-5
3 additions, 5 deletions
Marlin/src/feature/power.cpp
Marlin/src/gcode/control/M80_M81.cpp
+4
-5
4 additions, 5 deletions
Marlin/src/gcode/control/M80_M81.cpp
with
8 additions
and
11 deletions
Marlin/Configuration.h
+
1
−
1
View file @
5d0deba9
...
...
@@ -326,7 +326,7 @@
#define PSU_ACTIVE_HIGH false // Set 'false' for ATX, 'true' for X-Box
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
//#define PSU_POWERUP_DELAY
10
0 // (ms) Delay for the PSU to warm up to full power
//#define PSU_POWERUP_DELAY
25
0 // (ms) Delay for the PSU to warm up to full power
//#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
#if ENABLED(AUTO_POWER_CONTROL)
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/feature/power.cpp
+
3
−
5
View file @
5d0deba9
...
...
@@ -107,11 +107,9 @@ void Power::power_on() {
lastPowerOn
=
millis
();
if
(
!
powersupply_on
)
{
PSU_PIN_ON
();
#if HAS_TRINAMIC_CONFIG
delay
(
PSU_POWERUP_DELAY
);
// Wait for power to settle
restore_stepper_drivers
();
#endif
delay
(
PSU_POWERUP_DELAY
);
restore_stepper_drivers
();
TERN_
(
HAS_TRINAMIC_CONFIG
,
delay
(
PSU_POWERUP_DELAY
));
}
}
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/control/M80_M81.cpp
+
4
−
5
View file @
5d0deba9
...
...
@@ -72,16 +72,15 @@
#endif
#if DISABLED(AUTO_POWER_CONTROL)
delay
(
PSU_POWERUP_DELAY
);
// Wait for power to settle
delay
(
PSU_POWERUP_DELAY
);
restore_stepper_drivers
();
TERN_
(
HAS_TRINAMIC_CONFIG
,
delay
(
PSU_POWERUP_DELAY
));
#endif
#if HAS_LCD_MENU
ui
.
reset_status
();
#endif
TERN_
(
HAS_LCD_MENU
,
ui
.
reset_status
());
}
#endif //
ENABLED(
PSU_CONTROL
)
#endif // PSU_CONTROL
/**
* M81: Turn off Power, including Power Supply, if there is one.
...
...
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