Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
88921c5c
Commit
88921c5c
authored
Feb 14, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Kill Method
parent
5aa9a277
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
Configuration_Basic.h
MK/Configuration_Basic.h
+5
-0
MK_Main.cpp
MK/module/MK_Main.cpp
+4
-2
No files found.
MK/Configuration_Basic.h
View file @
88921c5c
...
...
@@ -42,6 +42,11 @@
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
// Kill Method
// 0 - Disable heaters, wait forever
// 1 - Reset controller. Will not reset separate communication chips!
#define KILL_METHOD 0
// If you want test the firmware uncomment below. Use Serial arduino monitor...
// ONLY BAUDRATE 115200
//#define FIRMWARE_TEST
...
...
MK/module/MK_Main.cpp
View file @
88921c5c
...
...
@@ -8022,12 +8022,14 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
}
void
kill
(
const
char
*
lcd_msg
)
{
#if ENABLED(KILL_METHOD) && KILL_METHOD == 1
HAL
::
resetHardware
();
#else
#if ENABLED(ULTRA_LCD)
lcd_setalertstatuspgm
(
lcd_msg
);
#endif
HAL
::
resetHardware
();
cli
();
// Stop interrupts
disable_all_heaters
();
disable_all_steppers
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment