This commit is contained in:
InsanityAutomation
2019-08-18 14:48:04 -04:00
parent 6d7220e379
commit 2416912aef
2 changed files with 7 additions and 8 deletions
+6 -7
View File
@@ -16,8 +16,8 @@
//#define MachineCR10
//#define MachineCR10S
//#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66
#define MachineCRX
//#define MachineCR10Max
//#define MachineCRX
#define MachineCR10Max
//#define MachineS4
//#define MachineS5
@@ -35,10 +35,9 @@
//#define GraphicLCD //Full graphics LCD for Ender 4, CR-X or CR10SPro
//#define ForceCRXDisplay
#define Force10SProDisplay
#define TM3DTouchscreenUpdates // Enables TM3D Error screens and eeprom screen not found in Creality screen firmware
//#define AddonFilSensor //Adds a filamnt runout sensor to the CR20 or Ender 4
#define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock
#define DualFilSensors //Using dual filament sensors on XMax and YMAX
//#define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock
//#define DualFilSensors //Using dual filament sensors on XMax and YMAX
//#define SKR13 // 32 bit board - assumes 2208 drivers
//#define SKR13_2209
//#define SKR13_UART // Configure SKR board with drivers in UART mode
@@ -100,7 +99,7 @@
*/
//#define ABL_EZABL // TH3D EZABL or Any NO Sensor
//#define ABL_NCSW //Creality ABL or Any NC Sensor
#define ABL_BLTOUCH
//#define ABL_BLTOUCH
//#define CREALITY_ABL_MOUNT //Using creality ABL mount
//#define E3D_DUALFAN_MOUNT // Using HD Modular mount as above with 2 5015 blowers and sensor on the right
@@ -2601,7 +2600,7 @@
#define MINIPANEL
#elif ENABLED(MachineCR20)
#define MKS_MINI_12864
#elif NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, OrigLCD) || ENABLED(GraphicLCD)
#elif NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, OrigLCD) || ENABLED(GraphicLCD)
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
#elif ENABLED(OrigLCD)
#define CR10_STOCKDISPLAY
@@ -1936,7 +1936,7 @@ void onConfigurationStoreWritten(bool success)
void onConfigurationStoreRead(bool success)
{
SERIAL_ECHOLN("==onConfigurationStoreRead==");
#if HAS_MESH && (ENABLED(MachineCR10SPro) || ENABLED(Force10SProDisplay))
#if HAS_MESH && (ANY(MachineCR10SPro, MachineEnder5Plus, MachineCR10Max) || ENABLED(Force10SProDisplay))
if (ExtUI::getMeshValid())
{
bool zig = true;