- Offset icon change to show mesh leveling status - Reset extruder position when enter to Move menu - New live end-stop diagnostic page - Editable firmware retracts settings for Tune and filament settings menu - Print Statistics page accessible from the Advanced Settings menu - Reset printer draws the boot image - Adds individual axes homing menu - Adds probe deploy/stow to Probe Settings menu - Updates lock screen - Rebuilds main buttons to support text caption in other languages - Increases probe offset limits to 60 mm - Fix M303 PID variable update - Fix Resume/Pause button update - Fix redraw of print done - Fix very large file name bug - Fix bug in bed manual leveling
63 lines
2.0 KiB
C++
63 lines
2.0 KiB
C++
/**
|
|
* Marlin 3D Printer Firmware
|
|
* Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
*
|
|
* Based on Sprinter and grbl.
|
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
#pragma once
|
|
|
|
/**
|
|
* DWIN UI Enhanced implementation
|
|
* Author: Miguel A. Risco-Castillo
|
|
* Version: 3.8.1
|
|
* Date: 2021/11/06
|
|
*/
|
|
|
|
#include "dwinui.h"
|
|
#include "dwin.h"
|
|
|
|
// Popup windows
|
|
|
|
void Draw_Select_Highlight(const bool sel);
|
|
|
|
inline void Draw_Popup_Bkgd() {
|
|
DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color, 14, 60, 258, 330);
|
|
DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, 14, 60, 258, 330);
|
|
}
|
|
|
|
template<typename T, typename U>
|
|
void DWIN_Draw_Popup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8_t button=0) {
|
|
DWINUI::ClearMenuArea();
|
|
Draw_Popup_Bkgd();
|
|
if (icon) DWINUI::Draw_Icon(icon, 101, 105);
|
|
if (amsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, amsg1);
|
|
if (amsg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, amsg2);
|
|
if (button) DWINUI::Draw_Icon(button, 86, 280);
|
|
}
|
|
|
|
template<typename T, typename U>
|
|
void DWIN_Popup_Confirm(const uint8_t icon, T amsg1, U amsg2) {
|
|
HMI_SaveProcessID(WaitResponse);
|
|
DWIN_Draw_Popup(icon, amsg1, amsg2, ICON_Confirm_E); // Button Confirm
|
|
DWIN_UpdateLCD();
|
|
}
|
|
|
|
void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2);
|
|
|
|
void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2);
|