Skip to content

M
MarlinKimbra
Commit 18664abd authored by Stefy Lanza (nextime / spora )'s avatar Stefy Lanza (nextime / spora )
Browse files
Options

Merge branch 'dev'

parents 5e21bf70 fd791097
Pipeline #84 skipped
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 652 additions and 645 deletions
MK/Configuration_Store.cpp
View file @ 18664abd
...@@ -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 "MKV429" #define EEPROM_VERSION "MKV429"
......
MK/MK.ino
View file @ 18664abd
...@@ -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 @ 18664abd
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment