Minor debugging and platform changes
This commit is contained in:
InsanityAutomation
+10
-6
@@ -352,6 +352,7 @@
|
||||
#if NONE(ABL_UBL, ABL_BI)
|
||||
#define ABL_BI
|
||||
#endif
|
||||
#define BedDC
|
||||
#endif
|
||||
|
||||
#if ENABLED(OriginalCrealitySquareBoard)
|
||||
@@ -571,11 +572,11 @@
|
||||
#define POWER_LOSS_RECOVERY
|
||||
#endif
|
||||
|
||||
#if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, MachineCR10Max, MachineEnder5Plus, SKRMiniE3V2, Force10SProDisplay, ForceCRXDisplay, MachineCR6, MachineCR6Max) || 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.
|
||||
#if DISABLED(MachineEnder3V2)
|
||||
#if DISABLED(MachineEnder3V2, MachineCR6, MachineCR6Max)
|
||||
#define SHOW_CUSTOM_BOOTSCREEN
|
||||
// Show the bitmap in Marlin/_Statusscreen.h on the status screen.
|
||||
#define CUSTOM_STATUS_SCREEN_IMAGE
|
||||
@@ -1860,7 +1861,7 @@
|
||||
* Use G29 repeatedly, adjusting the Z height at each point with movement commands
|
||||
* or (with LCD_BED_LEVELING) the LCD controller.
|
||||
*/
|
||||
#if DISABLED(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI)
|
||||
#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI, MachineCR6, MachineCR6Max)
|
||||
#define PROBE_MANUALLY
|
||||
#define MANUAL_PROBE_START_Z 0.2
|
||||
#endif
|
||||
@@ -2667,7 +2668,7 @@
|
||||
*/
|
||||
//#define AUTO_BED_LEVELING_3POINT
|
||||
//#define AUTO_BED_LEVELING_LINEAR
|
||||
#if ANY(ABL_EZABL, ABL_BLTOUCH, ABL_NCSW, ABL_TOUCH_MI)
|
||||
#if ANY(ABL_EZABL, ABL_BLTOUCH, ABL_NCSW, ABL_TOUCH_MI, NOZZLE_AS_PROBE)
|
||||
#if ENABLED(ABL_UBL)
|
||||
#define AUTO_BED_LEVELING_UBL
|
||||
#elif ENABLED(ABL_BI)
|
||||
@@ -2910,7 +2911,7 @@
|
||||
// - Move the Z probe (or nozzle) to a defined XY point before Z Homing.
|
||||
// - Prevent Z homing when the Z probe is outside bed area.
|
||||
//
|
||||
#if ANY(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI)
|
||||
#if ANY(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI, NOZZLE_AS_PROBE)
|
||||
#define Z_SAFE_HOMING
|
||||
#endif
|
||||
|
||||
@@ -3836,7 +3837,10 @@
|
||||
// Third-party or vendor-customized controller interfaces.
|
||||
// Sources should be installed in 'src/lcd/extui'.
|
||||
//
|
||||
#if ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max) && (NONE(GraphicLCD, SKRMiniE3V2) || ANY(Force10SProDisplay, ForceCRXDisplay))
|
||||
#if ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max) && (NONE(GraphicLCD, SKRMiniE3V2) || ENABLED(Force10SProDisplay))
|
||||
#ifndef Force10SProDisplay
|
||||
#define Force10SProDisplay
|
||||
#endif
|
||||
#define EXTENSIBLE_UI
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1687,7 +1687,7 @@
|
||||
//
|
||||
// Additional options for DGUS / DWIN displays
|
||||
//
|
||||
#if HAS_DGUS_LCD
|
||||
#if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH)
|
||||
#define LCD_SERIAL_PORT 3
|
||||
#define LCD_BAUDRATE 115200
|
||||
|
||||
@@ -1912,7 +1912,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI)
|
||||
#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI, MachineCR6, MachineCR6Max)
|
||||
#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
|
||||
#else
|
||||
#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
|
||||
|
||||
+17
-13
@@ -36,35 +36,39 @@
|
||||
*/
|
||||
|
||||
#if(ENABLED(MachineMini))
|
||||
#define VerChar1 "M"
|
||||
#define VerChar1 "M"
|
||||
#elif(ENABLED(MachineEnder2))
|
||||
#define VerChar1 "E2"
|
||||
#define VerChar1 "E2"
|
||||
#elif(ENABLED(MachineEnder3))
|
||||
#define VerChar1 "E3"
|
||||
#define VerChar1 "E3"
|
||||
#elif ENABLED(MachineEnder3V2)
|
||||
#define VerChar1 "E3V2"
|
||||
#elif ENABLED(MachineEnder3Max)
|
||||
#define VerChar1 "E3M"
|
||||
#elif(ENABLED(MachineEnder4))
|
||||
#define VerChar1 "E4"
|
||||
#define VerChar1 "E4"
|
||||
#elif(ENABLED(MachineEnder5))
|
||||
#define VerChar1 "E5"
|
||||
#define VerChar1 "E5"
|
||||
#elif(ENABLED(MachineEnder6))
|
||||
#define VerChar1 "E6"
|
||||
#define VerChar1 "E6"
|
||||
#elif(ENABLED(MachineEnder5Plus))
|
||||
#define VerChar1 "E5P"
|
||||
#define VerChar1 "E5P"
|
||||
#elif(ENABLED(MachineCR20))
|
||||
#define VerChar1 "2"
|
||||
#define VerChar1 "2"
|
||||
#elif(ENABLED(MachineCR10Orig))
|
||||
#define VerChar1 "O"
|
||||
#define VerChar1 "O"
|
||||
#elif(ENABLED(MachineCR10Std))
|
||||
#define VerChar1 "S"
|
||||
#define VerChar1 "S"
|
||||
#elif(ENABLED(MachineCRX))
|
||||
#define VerChar1 "X"
|
||||
#define VerChar1 "X"
|
||||
#elif(ENABLED(MachineCR6))
|
||||
#define VerChar1 "CR6"
|
||||
#elif(ENABLED(MachineCR6Max))
|
||||
#define VerChar1 "CR6M"
|
||||
#elif(ENABLED(MachineS4))
|
||||
#define VerChar1 "4"
|
||||
#define VerChar1 "4"
|
||||
#elif(ENABLED(MachineS5) || ENABLED(MachineCR10Max))
|
||||
#define VerChar1 "5"
|
||||
#define VerChar1 "5"
|
||||
#elif ENABLED(MachineCR2020)
|
||||
#define VerChar1 "20"
|
||||
#endif
|
||||
|
||||
@@ -1458,11 +1458,13 @@ void MarlinUI::update() {
|
||||
TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
|
||||
}
|
||||
|
||||
bool MarlinUI::use_click() {
|
||||
#if ENABLED(EXTENSIBLE_UI)
|
||||
bool MarlinUI::use_click() {
|
||||
const bool click = ExtUI::get_isUICanceled();
|
||||
ExtUI::ui_setUICancelOperation(false);
|
||||
return click;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ENABLED(STATUS_MESSAGE_SCROLLING)
|
||||
|
||||
|
||||
+2
-1
@@ -86,7 +86,8 @@ 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>
|
||||
USE_UHS2_USB = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
|
||||
USE_UHS3_USB = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
|
||||
USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
|
||||
|
||||
+64
-42
@@ -398,6 +398,8 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
|
||||
-<src/lcd/extui/malyan>
|
||||
-<src/lcd/extui/mks_ui>
|
||||
-<src/lcd/extui/nextion>
|
||||
-<src/lcd/extui/Creality>
|
||||
-<src/lcd/extui/dgus_creality>
|
||||
-<src/lcd/lcdprint.cpp>
|
||||
-<src/lcd/touch/touch_buttons.cpp>
|
||||
-<src/sd/usb_flashdrive/lib-uhs2> -<src/sd/usb_flashdrive/lib-uhs3>
|
||||
@@ -2580,25 +2582,25 @@ build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DABL_BLTOUCH -DMeshExt
|
||||
|
||||
|
||||
[env:Ender3V2]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3V2
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2
|
||||
|
||||
[env:Ender3V2_BLT]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH
|
||||
|
||||
|
||||
[env:Ender3V2_427]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3V2 -DCreality427
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DCreality427
|
||||
|
||||
[env:Ender3V2_427_BLT]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427
|
||||
|
||||
[env:Ender3V2_SKRT]
|
||||
platform = ${common_LPC.platform}
|
||||
@@ -2614,56 +2616,76 @@ build_flags = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/
|
||||
|
||||
|
||||
[env:Ender3_422]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Pro422
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro422
|
||||
|
||||
[env:Ender3_422_BLT]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Pro422 -DABL_BLTOUCH
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro422 -DABL_BLTOUCH
|
||||
|
||||
[env:Ender3_427]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Pro427
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro427
|
||||
|
||||
[env:Ender3_427_BLT]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Pro427 -DABL_BLTOUCH
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Pro427 -DABL_BLTOUCH
|
||||
|
||||
[env:Ender3Max_422]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Max
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max
|
||||
|
||||
[env:Ender3Max_422_BLT]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Max -DABL_BLTOUCH
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DABL_BLTOUCH
|
||||
|
||||
[env:Ender3Max_427]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Max -DCreality427
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DCreality427
|
||||
|
||||
|
||||
[env:Ender3Max_427_BLT]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH
|
||||
|
||||
[env:Ender6]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder6
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DForce10SProDisplay
|
||||
|
||||
|
||||
[env:Ender6_BLT]
|
||||
platform = ${common_stm32.platform}
|
||||
extends = env:STM32F103RET6_creality
|
||||
build_flags = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder6 -DABL_BLTOUCH
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineEnder6 -DABL_BLTOUCH -DForce10SProDisplay
|
||||
|
||||
[env:CR6_422]
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6 -DCR6_452
|
||||
|
||||
[env:CR6_423]
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6
|
||||
|
||||
[env:CR6Max_422]
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6Max -DCR6_452
|
||||
|
||||
[env:CR6Max_423]
|
||||
platform = ${common_stm32f1.platform}
|
||||
extends = env:STM32F103RET6_creality_maple
|
||||
build_flags = ${env:STM32F103RET6_creality_maple.build_flags} -DMachineCR6Max
|
||||
|
||||
#
|
||||
# ATmega1280
|
||||
|
||||
Reference in New Issue
Block a user