Sync with upstream

parent d411a5b7
Pipeline #77 skipped
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
*/ */
#include "base.h" #include "base.h"
#define EEPROM_VERSION "MKV429" #define EEPROM_VERSION "MKV428"
/** /**
* MKV428 EEPROM Layout: * MKV428 EEPROM Layout:
......
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
#define KILL_PIN -1 // 80 with Smart Controller LCD #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. #define SUICIDE_PIN -1 // PIN that has to be turned on right after start, to keep power flowing.
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#define KILL_PIN 80 #define KILL_PIN 80
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
#define ORIG_HEATER_BED_PIN 8 // BED #define ORIG_HEATER_BED_PIN 8 // BED
#define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING #define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
#define KILL_PIN 41 #define KILL_PIN 41
#else #else
......
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