Sync with upstream

2a71bc69 · Franco (nextime) Lanza · d411a5b7 · 2a71bc69 · 2a71bc69 · 2a71bc69
Commit 2a71bc69 authored Jun 02, 2016 by Franco (nextime) Lanza
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Configuration_Store.cpp MK/Configuration_Store.cpp +1 -1

301.h MK/module/boards/301.h +0 -1

33.h MK/module/boards/33.h +0 -1

No files found.
--- a/MK/Configuration_Store.cpp
+++ b/MK/Configuration_Store.cpp
@@ -37,7 +37,7 @@
 */
 #include "base.h"

-#define EEPROM_VERSION "MKV429"
+#define EEPROM_VERSION "MKV428"

 /**
 * MKV428 EEPROM Layout:

--- a/MK/module/boards/301.h
+++ b/MK/module/boards/301.h
@@ -74,7 +74,6 @@
 #define KILL_PIN           -1 // 80 with Smart Controller LCD
 #define SUICIDE_PIN        -1 // PIN that has to be turned on right after start, to keep power flowing.

-
 #if ENABLED(ULTRA_LCD)
  #define KILL_PIN 80
  #if ENABLED(NEWPANEL)

--- a/MK/module/boards/33.h
+++ b/MK/module/boards/33.h
@@ -70,7 +70,6 @@
 #define ORIG_HEATER_BED_PIN     8   // BED
 #define ORIG_TEMP_BED_PIN       14  // ANALOG NUMBERING

-
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
  #define KILL_PIN              41
 #else