3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-30 21:00:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

update dwin_defines.h and ProUI tests

Browse source
This commit is contained in:
Andrew 2025-08-29 22:31:55 -04:00
parent dcb219ad96
commit 368e1aee6a
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Marlin/src/lcd/e3v2/proui/dwin_defines.h
View file

@ -33,9 +33,9 @@
#include <stddef.h>
#include "../../../core/types.h"
//#define TJC_DISPLAY // Enable for TJC display
//#define DACAI_DISPLAY // Enable for DACAI display
//#define TITLE_CENTERED // Center Menu Title Text
//#define TJC_DISPLAY // Enable for TJC display
//#define DACAI_DISPLAY // Enable for DACAI display
//#define TITLE_CENTERED // Center Menu Title Text
#if HAS_MESH
#define USE_GRID_MESHVIEWER 1
@ -208,17 +208,17 @@ typedef struct {
uint16_t colorCoordinate;
// Temperatures
#if HAS_PID_HEATING
#if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
int16_t pidCycles = DEF_PIDCYCLES;
#if ENABLED(PIDTEMP)
celsius_t hotendPIDT = DEF_HOTENDPIDT;
#endif
#if ENABLED(PIDTEMPBED)
celsius_t bedPIDT = DEF_BEDPIDT;
#endif
#if ENABLED(PIDTEMPCHAMBER)
celsius_t chamberPIDT = DEF_CHAMBERPIDT;
#endif
#endif
#if ENABLED(PIDTEMP)
celsius_t hotendPIDT = DEF_HOTENDPIDT;
#endif
#if ENABLED(PIDTEMPBED)
celsius_t bedPIDT = DEF_BEDPIDT;
#endif
#if ENABLED(PIDTEMPCHAMBER)
celsius_t chamberPIDT = DEF_CHAMBERPIDT;
#endif
#if ENABLED(PREVENT_COLD_EXTRUSION)
celsius_t extMinT = EXTRUDE_MINTEMP;

16
buildroot/tests/STM32F103RE_creality
View file

@ -26,15 +26,13 @@ opt_enable DWIN_MARLINUI_LANDSCAPE LCD_ENDSTOP_TEST AUTO_BED_LEVELING_UBL BLTOUC
exec_test $1 $2 "Ender-3 V2 - MarlinUI (Games, UBL+BLTOUCH, MPCTEMP, LCD_ENDSTOP_TEST)" "$3"
use_example_configs "Creality/Ender-3 S1/STM32F1"
opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CANCEL_OBJECTS FWRETRACT EVENT_GCODE_SD_ABORT
opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU PID_AUTOTUNE_MENU PID_EDIT_MENU \
SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT STATUS_MESSAGE_SCROLLING \
SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \
BLTOUCH Z_SAFE_HOMING AUTO_BED_LEVELING_UBL MESH_EDIT_MENU LCD_BED_TRAMMING LIN_ADVANCE \
LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE \
CASE_LIGHT_ENABLE CASE_LIGHT_MENU CASE_LIGHT_NO_BRIGHTNESS NONLINEAR_EXTRUSION
opt_set PREHEAT_3_LABEL '"CUSTOM"' PREHEAT_3_TEMP_HOTEND 240 PREHEAT_3_TEMP_BED 60 PREHEAT_3_FAN_SPEED 128 BOOTSCREEN_TIMEOUT 1100 CASE_LIGHT_PIN 4
exec_test $1 $2 "Ender-3 S1 - ProUI (PIDTEMP)" "$3"
opt_disable DWIN_CREALITY_LCD AUTO_BED_LEVELING_BILINEAR CANCEL_OBJECTS FWRETRACT EVENT_GCODE_SD_ABORT
opt_enable DWIN_LCD_PROUI PID_AUTOTUNE_MENU PID_EDIT_MENU STATUS_MESSAGE_SCROLLING PRINTCOUNTER \
AUTO_BED_LEVELING_UBL LCD_BED_TRAMMING LIN_ADVANCE \
LIMITED_MAX_FR_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE \
CASE_LIGHT_ENABLE CASE_LIGHT_NO_BRIGHTNESS CASE_LIGHT_MENU NONLINEAR_EXTRUSION
opt_set BOOTSCREEN_TIMEOUT 1100 CASE_LIGHT_PIN 4 SDSORT_GCODE true
exec_test $1 $2 "Ender-3 S1 - ProUI (UBL, PIDTEMP)" "$3"
restore_configs
opt_set MOTHERBOARD BOARD_CREALITY_V452 SERIAL_PORT 1