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
6b4b67c2
Commit
6b4b67c2
authored
Jun 03, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into nextime
parents
c31f3841
18664abd
Pipeline
#85
skipped
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
652 additions
and
645 deletions
+652
-645
Configuration_Store.cpp
MK/Configuration_Store.cpp
+1
-0
MK.ino
MK/MK.ino
+2
-1
MK_Main.cpp
MK/module/MK_Main.cpp
+649
-644
No files found.
MK/Configuration_Store.cpp
View file @
6b4b67c2
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
* either sets a Sane Default, or results in No Change to the existing value.
* either sets a Sane Default, or results in No Change to the existing value.
*
*
*/
*/
#include "base.h"
#include "base.h"
#define EEPROM_VERSION "MKV428"
#define EEPROM_VERSION "MKV428"
...
...
MK/MK.ino
View file @
6b4b67c2
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
* "G" Codes
* "G" Codes
*
*
* G0 -> G1 except for laser where G0 is "move without firing"
* 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
* G2 - CW ARC
* G3 - CCW ARC
* G3 - CCW ARC
* G4 - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
* G4 - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
...
@@ -209,6 +209,7 @@
...
@@ -209,6 +209,7 @@
*/
*/
#include "base.h"
#include "base.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h>
#include <Wire.h>
#endif
#endif
...
...
MK/module/MK_Main.cpp
View file @
6b4b67c2
This diff is collapsed.
Click to expand it.
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