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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
13e185d3
Commit
13e185d3
authored
Feb 11, 2012
by
Erik van der Zalm
Browse files
Options
Downloads
Patches
Plain Diff
removed unused HEATING_EARLY_FINISH_DEG_OFFSET
Simplified stepper inactive time
parent
b58eae76
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/Configuration_adv.h
+1
-5
1 addition, 5 deletions
Marlin/Configuration_adv.h
Marlin/Marlin.pde
+8
-11
8 additions, 11 deletions
Marlin/Marlin.pde
with
9 additions
and
16 deletions
Marlin/Configuration_adv.h
+
1
−
5
View file @
13e185d3
...
...
@@ -25,9 +25,6 @@
// if CooldownNoWait is defined M109 will not wait for the cooldown to finish
#define CooldownNoWait true
// Heating is finished if a temperature close to this degree shift is reached
#define HEATING_EARLY_FINISH_DEG_OFFSET 1 //Degree
//Do not wait for M109 to finish when printing from SD card
//#define STOP_HEATING_WAIT_WHEN_SD_PRINTING
...
...
@@ -85,7 +82,6 @@
//default stepper release if idle
#define DEFAULT_STEPPER_DEACTIVE_TIME 60
#define DEFAULT_STEPPER_DEACTIVE_COMMAND "M84 X Y E" //z stays powered
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINTRAVELFEEDRATE 0.0
...
...
@@ -112,7 +108,7 @@
#define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers?
#define SD_FINISHED_RELEASECOMMAND "M84 X Y E" // no z because of layer shift.
#define SD_FINISHED_RELEASECOMMAND "M84 X Y
Z
E" // no z because of layer shift.
// The hardware watchdog should halt the Microcontroller, in case the firmware gets stuck somewhere. However:
// the Watchdog is not working well, so please only enable this for testing
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/Marlin.pde
+
8
−
11
View file @
13e185d3
...
...
@@ -165,7 +165,6 @@ const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42
static
unsigned
long
previous_millis_cmd
=
0
;
static
unsigned
long
max_inactive_time
=
0
;
static
unsigned
long
stepper_inactive_time
=
DEFAULT_STEPPER_DEACTIVE_TIME
*
1000l
;
static
unsigned
long
last_stepperdisabled_time
=
30
*
1000
;
//first release check after 30 seconds
static
unsigned
long
starttime
=
0
;
static
unsigned
long
stoptime
=
0
;
...
...
@@ -1296,16 +1295,15 @@ void manage_inactivity(byte debug)
if
(
(
millis
()
-
previous_millis_cmd
)
>
max_inactive_time
)
if
(
max_inactive_time
)
kill
();
if
(
stepper_inactive_time
)
if
(
(
millis
()
-
last_stepperdisabled_time
)
>
stepper_inactive_time
)
if
(
stepper_inactive_time
)
{
if
(
(
millis
()
-
previous_millis_cmd
)
>
stepper_inactive_time
)
{
if
(
previous_millis_cmd
>
last_stepperdisabled_time
)
last_stepperdisabled_time
=
previous_millis_cmd
;
else
{
if
(
(
X_ENABLE_ON
&&
(
READ
(
X_ENABLE_PIN
)
!=
0
))
||
(
!
X_ENABLE_ON
&&
READ
(
X_ENABLE_PIN
)
==
0
)
)
enquecommand
(
DEFAULT_STEPPER_DEACTIVE_COMMAND
);
last_stepperdisabled_time
=
millis
();
disable_x
();
disable_y
();
disable_z
();
disable_e0
();
disable_e1
();
disable_e2
();
}
}
#ifdef EXTRUDER_RUNOUT_PREVENT
...
...
@@ -1323,7 +1321,6 @@ void manage_inactivity(byte debug)
destination
[
E_AXIS
]
=
oldedes
;
plan_set_e_position
(
oldepos
);
previous_millis_cmd
=
millis
();
//enquecommand(DEFAULT_STEPPER_DEACTIVE_COMMAND);
st_synchronize
();
WRITE
(
E0_ENABLE_PIN
,
oldstatus
);
}
...
...
...
...
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