jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

definerename

Browse Source
This commit is contained in:
InsanityAutomation
2021-06-14 23:46:40 -04:00
parent 8adb58c266
commit bf8074c108
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+10 -10
View File
@@ -127,7 +127,7 @@
// Touchscreen options - only 32 bit boards have the open serial ports to use with graphics displays above
//#define ForceCRXDisplay
//#define Force10SProDisplay
//#define FORCE10SPRODISPLAY
//#define AddonFilSensor //Adds a filament runout sensor to the CR20 or Ender 4
//#define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock
@@ -474,7 +474,7 @@
#if ANY(MachineCRXPro, MachineEnder5Plus, MachineCR10SPro, MachineCR10Max, MachineEnder6)
#if NONE(GraphicLCD, OrigLCD)
#if ANY(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI)
#define Force10SProDisplay
#define FORCE10SPRODISPLAY
#else
#define ForceCRXDisplay
#endif
@@ -573,7 +573,7 @@
#define POWER_LOSS_RECOVERY
#endif
#if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, MachineCR10Max, MachineEnder5Plus, SKRMiniE3V2, Force10SProDisplay, ForceCRXDisplay) || ENABLED(GraphicLCD)
#if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, MachineCR10Max, MachineEnder5Plus, SKRMiniE3V2, FORCE10SPRODISPLAY, ForceCRXDisplay) || ENABLED(GraphicLCD)
#define SHOW_BOOTSCREEN
// Show the bitmap in Marlin/_Bootscreen.h on startup.
@@ -606,7 +606,7 @@
* :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRE3Turbo) && (NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder3V2) || (ENABLED(GraphicLCD) && NONE(Force10SProDisplay, ForceCRXDisplay)))
#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRE3Turbo) && (NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder3V2) || (ENABLED(GraphicLCD) && NONE(FORCE10SPRODISPLAY, ForceCRXDisplay)))
#define SERIAL_PORT_2 0
#elif ENABLED(SKRMiniE3V2)
#define SERIAL_PORT_2 2
@@ -1487,7 +1487,7 @@
#define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
#define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
#if NONE(ABL_EZABL, ABL_BLTOUCH, MachineCR2020)
#if NONE(ABL_EZABL, MachineCR2020)
#define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
#else
@@ -2837,7 +2837,7 @@
* Add a bed leveling sub-menu for ABL or MBL.
* Include a guided procedure if manual probing is enabled.
*/
#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI, SKRMiniE3V2, MachineEnder3V2, Force10SProDisplay, ForceCRXDisplay, MachineCR6, MachineCR6Max) && (DISABLED(MachineCRX) || ENABLED(GraphicLCD))
#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI, SKRMiniE3V2, MachineEnder3V2, FORCE10SPRODISPLAY, ForceCRXDisplay, MachineCR6, MachineCR6Max) && (DISABLED(MachineCRX) || ENABLED(GraphicLCD))
#define LCD_BED_LEVELING
#endif
@@ -3508,7 +3508,7 @@
#define DWIN_CREALITY_LCD
#elif ANY(OrigLCD, MachineCR10Orig, MachineEnder3Pro422, MachineEnder3Pro427, MachineEnder3Max, SKRMiniE3V2, SKRE3Turbo) && DISABLED(GraphicLCD)
#define CR10_STOCKDISPLAY
#elif NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, OrigLCD, MachineCR10Orig, SKRMiniE3V2, Force10SProDisplay, ForceCRXDisplay, MachineCR6, MachineCR6Max) || ENABLED(GraphicLCD)
#elif NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, OrigLCD, MachineCR10Orig, SKRMiniE3V2, FORCE10SPRODISPLAY, ForceCRXDisplay, MachineCR6, MachineCR6Max) || ENABLED(GraphicLCD)
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
#endif
//
@@ -3840,9 +3840,9 @@
// Third-party or vendor-customized controller interfaces.
// Sources should be installed in 'src/lcd/extui'.
//
#if ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder6) && (NONE(GraphicLCD, SKRMiniE3V2) || ENABLED(Force10SProDisplay))
#ifndef Force10SProDisplay
#define Force10SProDisplay
#if ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder6) && (NONE(GraphicLCD, SKRMiniE3V2) || ENABLED(FORCE10SPRODISPLAY))
#ifndef FORCE10SPRODISPLAY
#define FORCE10SPRODISPLAY
#endif
#define EXTENSIBLE_UI
#endif
Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
+1 -1
View File
@@ -2135,7 +2135,7 @@ void onConfigurationStoreWritten(bool success)
void onConfigurationStoreRead(bool success)
{
SERIAL_ECHOLNPGM_P(PSTR("==onConfigurationStoreRead=="));
#if HAS_MESH && (ANY(MachineCR10SPro, MachineEnder5Plus, MachineCR10Max) || ENABLED(Force10SProDisplay))
#if HAS_MESH && (ANY(MachineCR10SPro, MachineEnder5Plus, MachineCR10Max) || ENABLED(FORCE10SPRODISPLAY))
if (ExtUI::getMeshValid())
{
uint8_t abl_probe_index = 0;
Marlin/src/lcd/extui/Creality/Creality_DWIN.h
+1 -1
View File
@@ -143,7 +143,7 @@ namespace ExtUI {
#define DisplayStandbyBrightness 0x1144
#define DisplayStandbyEnableIndicator 0x1146
//#if ANY(MachineCR10SPro, MachineEnder5Plus, MachineCR10Max) || ENABLED(Force10SProDisplay)
//#if ANY(MachineCR10SPro, MachineEnder5Plus, MachineCR10Max) || ENABLED(FORCE10SPRODISPLAY)
// #define StatusMessageString 0x3000
//#else
// #define StatusMessageString 0x20E8
ini/features.ini
+1 -1
View File
@@ -86,7 +86,7 @@ EXTUI_EXAMPLE = src_filter=+<src/lcd/extui/example>
TOUCH_UI_FTDI_EVE = src_filter=+<src/lcd/extui/ftdi_eve_touch_ui>
MALYAN_LCD = src_filter=+<src/lcd/extui/malyan>
NEXTION_TFT = src_filter=+<src/lcd/extui/nextion>
EXTENSIBLE_UI = src_filter=+<src/lcd/extui/Creality>
FORCE10SPRODISPLAY = src_filter=+<src/lcd/extui/Creality>
DGUS_LCD_UI_CREALITY_TOUCH = src_filter=+<src/lcd/extui/dgus_creality> +<src/lcd/extui/dgus_creality_lcd.cpp>
USE_UHS2_USB = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
USE_UHS3_USB = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
platformio.ini
+14 -14
View File
@@ -761,25 +761,25 @@ build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DForce10SProDisplay
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DFORCE10SPRODISPLAY
[env:CRX_BLT_UBL_NoFil]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DForce10SProDisplay
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DFORCE10SPRODISPLAY
[env:CRX_BLT_BIL_Fil]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DForce10SProDisplay -DFilSensors
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DFilSensors
[env:CRX_BLT_UBL_Fil]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DForce10SProDisplay -DFilSensors
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DFORCE10SPRODISPLAY -DFilSensors
[env:CRX_NoFil]
platform = atmelavr
@@ -1381,25 +1381,25 @@ build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DForce10SProDisplay -DHotendMosquito
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DHotendMosquito
[env:CRX_BLT_UBLNoFilMC]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DForce10SProDisplay -DHotendMosquito
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DFORCE10SPRODISPLAY -DHotendMosquito
[env:CRX_BLT_BIL_Fil_MC]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DForce10SProDisplay -DFilSensors -DHotendMosquito
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DFilSensors -DHotendMosquito
[env:CRX_BLT_UBL_Fil_MC]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DForce10SProDisplay -DFilSensors -DHotendMosquito
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DFORCE10SPRODISPLAY -DFilSensors -DHotendMosquito
[env:CRX_NoFil_MC]
platform = atmelavr
@@ -1801,25 +1801,25 @@ build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DForce10SProDisplay -DHotendMosquito -DHotendE3D
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DHotendMosquito -DHotendE3D
[env:CRX_BLTUBLNoFilME]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DForce10SProDisplay -DHotendMosquito -DHotendE3D
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DFORCE10SPRODISPLAY -DHotendMosquito -DHotendE3D
[env:CRX_BLT_BIL_Fil_ME]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DForce10SProDisplay -DFilSensors -DHotendMosquito -DHotendE3D
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DFilSensors -DHotendMosquito -DHotendE3D
[env:CRX_BLT_UBL_Fil_ME]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DForce10SProDisplay -DFilSensors -DHotendMosquito -DHotendE3D
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DABL_BLTOUCH -DABL_UBL -DFORCE10SPRODISPLAY -DFilSensors -DHotendMosquito -DHotendE3D
[env:CRX_NoFil_ME]
platform = atmelavr
@@ -2660,13 +2660,13 @@ build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnde
[env:Ender6]
platform = ${common_stm32f1.platform}
extends = env:STM32F103RET6_creality_maple
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DForce10SProDisplay
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DFORCE10SPRODISPLAY
[env:Ender6_BLT]
platform = ${common_stm32f1.platform}
extends = env:STM32F103RET6_creality_maple
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DABL_BLTOUCH -DForce10SProDisplay
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DABL_BLTOUCH -DFORCE10SPRODISPLAY
[env:CR6_452]
platform = ${common_stm32f1.platform}