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
e65a0a9b
Commit
e65a0a9b
authored
Jun 02, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/dev'
parents
b63319ad
bde64a97
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
Configuration_Store.cpp
MK/Configuration_Store.cpp
+1
-0
MK.ino
MK/MK.ino
+2
-1
MK_Main.cpp
MK/module/MK_Main.cpp
+1
-0
No files found.
MK/Configuration_Store.cpp
View file @
e65a0a9b
...
...
@@ -35,6 +35,7 @@
* either sets a Sane Default, or results in No Change to the existing value.
*
*/
#include "base.h"
#define EEPROM_VERSION "MKV428"
...
...
MK/MK.ino
View file @
e65a0a9b
...
...
@@ -35,7 +35,7 @@
* "G" Codes
*
* G0 -> G1 except for laser where G0 is "move without firing"
* G1 - Coordinated Movement X Y Z E, for laser move by firing
* G1 - Coordinated Movement X Y Z E
F(feedrate) P(Purge)
, for laser move by firing
* G2 - CW ARC
* G3 - CCW ARC
* G4 - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
...
...
@@ -209,6 +209,7 @@
*/
#include "base.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h>
#endif
...
...
MK/module/MK_Main.cpp
View file @
e65a0a9b
...
...
@@ -5626,6 +5626,7 @@ inline void gcode_M81() {
laser_peripherals_off
();
#endif
#endif
delay_ms
(
1000
);
// Wait 1 second before switching off
#if HAS(SUICIDE)
...
...
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