Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ProUI feature utilization / Misc. Fixes #26434

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
73693bb
Fix typo in stm32f4.ini
classicrocker883 Nov 17, 2023
f60abea
Add ProUI feature options
classicrocker883 Nov 17, 2023
3d8088b
fix `SDSORT_GCODE false` warning
classicrocker883 Nov 17, 2023
3a46132
include #ifdef in MarlinConfigPre.h
classicrocker883 Nov 19, 2023
9fe4190
enabled
thinkyhead Nov 20, 2023
d715ff0
Merge branch 'bugfix-2.1.x' into pr/26434
thinkyhead Nov 20, 2023
cc17151
tweak errors
thinkyhead Nov 20, 2023
28b8571
clarify
thinkyhead Nov 20, 2023
7f2c141
Merge branch 'bugfix-2.1.x' into pr/26434
thinkyhead Nov 20, 2023
b707878
Fix warning: narrowing conversion
classicrocker883 Nov 20, 2023
2920b3d
fix file wrappers
thinkyhead Nov 21, 2023
3f2df7e
Merge branch 'bugfix-2.1.x-Nov3' of https://github.com/classicrocker8…
classicrocker883 Nov 21, 2023
8a5faf1
Fix warning: narrowing conversion in JyersUI
classicrocker883 Nov 21, 2023
031eecc
fixes for dwin.cpp
classicrocker883 Nov 21, 2023
6358ade
indent
classicrocker883 Nov 21, 2023
10bea42
add brief and param to Menu Line Spacing
classicrocker883 Nov 21, 2023
ea9c430
update dwin_defines.h
classicrocker883 Nov 21, 2023
e109c3c
undo extraneous changes
thinkyhead Nov 21, 2023
758ebab
rename UBL_Z_OFFSET_MIN/MAX to Z_OFFSET_MIN/MAX
classicrocker883 Nov 21, 2023
6dd992b
Merge branch 'bugfix-2.1.x-Nov3' of https://github.com/classicrocker8…
classicrocker883 Nov 21, 2023
1b41c4b
forgot indent bedlevel_tools.cpp
classicrocker883 Nov 21, 2023
41081cc
unindent
thinkyhead Nov 21, 2023
86819bb
move to dwin_defines
thinkyhead Nov 21, 2023
43ff659
rgb type, some case fix
thinkyhead Nov 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Marlin/src/inc/MarlinConfigPre.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,5 @@
#ifndef __MARLIN_DEPS__
#include HAL_PATH(.., inc/Conditionals_adv.h)
#endif

#include "../lcd/e3v2/proui/dwin_defines.h"
4 changes: 4 additions & 0 deletions Marlin/src/inc/SanityCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -2756,6 +2756,10 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
#error "JD_TUNE_ITEM requires HAS_JUNCTION_DEVIATION."
#elif ENABLED(ADVK_TUNE_ITEM) && DISABLED(LIN_ADVANCE)
#error "ADVK_TUNE_ITEM requires LIN_ADVANCE."
#elif ENABLED(MESH_EDIT_MENU) && !HAS_MESH
#error "MESH_EDIT_MENU requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
#elif (SDSORT_GCODE == false) && ENABLED(MEDIASORT_MENU_ITEM)
#error "MEDIASORT_MENU_ITEM requires SDSORT_GCODE to be defined 'true'."
#endif
#endif

Expand Down
24 changes: 12 additions & 12 deletions Marlin/src/lcd/e3v2/proui/dwin.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@
#include "../../../feature/leds/leds.h"
#endif

#if ANY(BABYSTEPPING, HAS_BED_PROBE)
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#define HAS_ZOFFSET_ITEM 1
#if !HAS_BED_PROBE
#define JUST_BABYSTEP 1
#endif
#endif

namespace GET_LANG(LCD_LANGUAGE) {
#define _MSG_PREHEAT(N) \
LSTR MSG_PREHEAT_##N = _UxGT("Preheat ") PREHEAT_## N ##_LABEL; \
Expand Down Expand Up @@ -141,18 +134,25 @@ typedef struct {
#if ENABLED(BAUD_RATE_GCODE)
bool baud115K = false;
#endif

bool fullManualTramming = false;
bool mediaSort = true;
#if ALL(LCD_BED_TRAMMING, HAS_BED_PROBE)
bool fullManualTramming = false;
#endif
#if ENABLED(MEDIASORT_MENU_ITEM)
bool mediaSort = true;
#endif
bool mediaAutoMount = ENABLED(HAS_SD_EXTENDER);
#if ALL(INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING)
uint8_t zAfterHoming = DEF_Z_AFTER_HOMING;
#endif
#if ALL(LED_CONTROL_MENU, HAS_COLOR_LEDS)
LEDColor ledColor = defColorLeds;
#endif
bool adaptiveStepSmoothing = true;
bool enablePreview = true;
#if ENABLED(ADAPTIVE_STEP_SMOOTHING)
bool adaptiveStepSmoothing = true;
#endif
#if HAS_GCODE_PREVIEW
bool enablePreview = true;
#endif
} hmi_data_t;

extern hmi_data_t hmiData;
Expand Down
33 changes: 33 additions & 0 deletions Marlin/src/lcd/e3v2/proui/dwin_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,36 @@
#define DEF_BEDPIDT TERN(PREHEAT_1_TEMP_BED, PREHEAT_1_TEMP_HOTEND, 60)
#define DEF_PIDCYCLES 5

/**
* ProUI Menu Options
* Choose which feature you would like to Enable or Disable
*/
#if ENABLED(SDCARD_SORT_ALPHA)
#define MEDIASORT_MENU_ITEM
#if ENABLED(MEDIASORT_MENU_ITEM) && (SDSORT_GCODE == false)
// MEDIASORT_MENU_ITEM needs SDSORT_GCODE to be 'true'
#undef SDSORT_GCODE
#define SDSORT_GCODE true
#endif
#endif
#if ENABLED(HAS_FILAMENT_SENSOR)
#define RUNOUT_TUNE_ITEM
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
#define PLR_TUNE_ITEM // Power-loss Recovery option in Tune Menu
#endif
#if ENABLED(HAS_JUNCTION_DEVIATION)
#define JD_TUNE_ITEM // Juntion Deviation item in Tune Menu
#endif
#if ENABLED(LIN_ADVANCE)
#define ADVK_TUNE_ITEM // Linear Advance item in Tune Menu
#endif
#if HAS_MESH
#define MESH_EDIT_MENU // Add a menu to edit mesh points
#endif

#define HAS_GCODE_PREVIEW 1
#define HAS_CUSTOM_COLORS 1 // Change display colors
#define HAS_ESDIAG 1 // View End-stop/Runout switch continuity
#define HAS_LOCKSCREEN 1 // Simple lockscreen
#define HAS_SD_EXTENDER 1 // Enable to support SD card extender cables
2 changes: 1 addition & 1 deletion ini/stm32f4.ini
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ debug_tool = jlink
upload_protocol = jlink

[env:STM32F401RE_creality_stlink]
extends = env:STM32F401RC_creality
extends = env:STM32F401RE_creality
debug_tool = stlink
upload_protocol = stlink

Expand Down