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.

Sign up for GitHub

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

Remove whitespace, ProUI fixes #26308

Merged
merged 16 commits into from
Nov 22, 2023
Merged

Remove whitespace, ProUI fixes #26308

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
90e6fcd
remove whitespace
classicrocker883 Sep 26, 2023
d1789f0
fix popup icons, center in frame
classicrocker883 Sep 26, 2023
ab0a8a2
add park_pos when print abort
classicrocker883 Sep 26, 2023
452c4ba
Update dwin.cpp PrintAbort
classicrocker883 Sep 29, 2023
923c181
removed `queue.inject(EVENT_GCODE_SD_ABORT);`
classicrocker883 Sep 29, 2023
10db3d5
switch to ifndef
classicrocker883 Sep 29, 2023
12d7caa
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Oct 4, 2023
84b45ad
Merge branch 'bugfix-2.1.x' into pr/26308
thinkyhead Oct 6, 2023
39820c1
clean up, adjust test
thinkyhead Oct 6, 2023
2ba9957
Use G27 to park
thinkyhead Oct 6, 2023
89dfb05
typo
thinkyhead Oct 8, 2023
0f0d296
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Oct 9, 2023
afa38cc
Merge branch 'bugfix-2.1.x-fix' of https://github.com/classicrocker88…
classicrocker883 Oct 9, 2023
90f82c0
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Oct 20, 2023
c0b68d0
fix backlight/sound encoder interfere
classicrocker883 Oct 20, 2023
37b93d1
Merge branch 'bugfix-2.1.x' into pr/26308
thinkyhead Nov 22, 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
21 changes: 7 additions & 14 deletions Marlin/src/lcd/e3v2/proui/dwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1716,23 +1716,16 @@ void dwinPrintFinished() {
// Print was aborted
void dwinPrintAborted() {
#ifndef EVENT_GCODE_SD_ABORT
#if ENABLED(NOZZLE_PARK_FEATURE)
const xyz_pos_t park_point = NOZZLE_PARK_POINT;
#endif
if (all_axes_homed()) {
const int16_t zpos = current_position.z + TERN(NOZZLE_PARK_FEATURE,
NOZZLE_PARK_Z_RAISE_MIN, Z_POST_CLEARANCE);
_MIN(zpos, Z_MAX_POS);
const int16_t ypos = TERN(NOZZLE_PARK_FEATURE, park_pos.y, Y_MAX_POS);
MString<25> cmd;
cmd.setf(cmd, F("G0Z%i\nG0F2000Y%i"), zpos, ypos);
queue.inject(&cmd);
queue.inject(
#if ENABLED(NOZZLE_PARK_FEATURE)
F("G27")
#else
TS(F("G0Z"), float(_MIN(current_position.z + (Z_POST_CLEARANCE), Z_MAX_POS)), F("\nG0F2000Y"), Y_MAX_POS);
#endif
);
}
#endif
#ifdef SD_FINISHED_RELEASECOMMAND
queue.inject(SD_FINISHED_RELEASECOMMAND);
#endif

hostui.notify("Print Aborted");
dwinPrintFinished();
}
Expand Down
11 changes: 5 additions & 6 deletions Marlin/src/lcd/e3v2/proui/dwin_popup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,15 @@ inline void drawPopupBkgd() {

template<typename T, typename U>
void dwinDrawPopup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8_t button=0) {
uint8_t xpos = 81;
uint8_t ypos = 90;
xy_uint8_t pos;
switch (icon) {
case 17 ... 24: xpos = 96; break; // Icon#:17-24; W: 80px|H:100px
case 78 ... 81: xpos = 100; ypos = 107; break; // Icon#:78-81; W: 73px|H: 66px
default: xpos = 81; ypos = 90; break; // Icon#:1-8,90-91; W:110px|H:100px
default: pos.set(81, 90); break; // Icon 1 - 8, 90 - 91; (110 x 100)
case 17 ... 24: pos.set(96, 90); break; // Icon 17 - 24; ( 80 x 100)
case 78 ... 81: pos.set(100, 107); break; // Icon 78 - 81; ( 73 x 66)
}
DWINUI::clearMainArea();
drawPopupBkgd();
if (icon) DWINUI::drawIcon(icon, xpos, ypos);
if (icon) DWINUI::drawIcon(icon, pos.x, pos.y);
if (amsg1) DWINUI::drawCenteredString(hmiData.colorPopupTxt, 210, amsg1);
if (amsg2) DWINUI::drawCenteredString(hmiData.colorPopupTxt, 240, amsg2);
if (button) DWINUI::drawButton(button, 86, 280);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ uint8_t USB::ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bReque
* rcode 0 if no errors. rcode 01-0f is relayed from dispatchPkt(). Rcode f0 means RCVDAVIRQ error, fe = USB xfer timeout
*/
uint8_t USB::inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t *data, uint8_t bInterval /*= 0*/) {
EpInfo *pep=nullptr;
EpInfo *pep = nullptr;
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
uint16_t nak_limit = 0;

uint8_t rcode = SetAddress(addr, ep, &pep, &nak_limit);
Expand Down
2 changes: 1 addition & 1 deletion buildroot/tests/STM32F103RE_creality
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ opt_enable DWIN_MARLINUI_LANDSCAPE LCD_ENDSTOP_TEST AUTO_BED_LEVELING_UBL BLTOUC
exec_test $1 $2 "Ender-3 v2 - MarlinUI (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
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 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 \
Expand Down