2020-07-30 01:43:19 -05:00
|
|
|
/**
|
|
|
|
* Marlin 3D Printer Firmware
|
|
|
|
* Copyright (c) 2020 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/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "../../inc/MarlinConfigPre.h"
|
|
|
|
|
|
|
|
#if HAS_UI_320x240
|
|
|
|
|
2021-01-25 01:44:39 -06:00
|
|
|
#include "ui_common.h"
|
2020-07-30 01:43:19 -05:00
|
|
|
|
2020-10-16 19:36:25 -05:00
|
|
|
#include "../marlinui.h"
|
2020-07-30 01:43:19 -05:00
|
|
|
#include "../menu/menu.h"
|
|
|
|
#include "../../libs/numtostr.h"
|
|
|
|
|
|
|
|
#include "../../sd/cardreader.h"
|
|
|
|
#include "../../module/temperature.h"
|
|
|
|
#include "../../module/printcounter.h"
|
|
|
|
#include "../../module/planner.h"
|
|
|
|
#include "../../module/motion.h"
|
|
|
|
|
|
|
|
#if DISABLED(LCD_PROGRESS_BAR) && BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
|
|
|
|
#include "../../feature/filwidth.h"
|
|
|
|
#include "../../gcode/parser.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
#include "../../feature/bedlevel/bedlevel.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void MarlinUI::tft_idle() {
|
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
|
|
|
if (draw_menu_navigation) {
|
|
|
|
add_control(48, 206, PAGE_UP, imgPageUp, encoderTopLine > 0);
|
|
|
|
add_control(240, 206, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
|
|
|
|
add_control(144, 206, BACK, imgBack);
|
|
|
|
draw_menu_navigation = false;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
tft.queue.async();
|
|
|
|
TERN_(TOUCH_SCREEN, touch.idle());
|
|
|
|
}
|
|
|
|
|
|
|
|
#if ENABLED(SHOW_BOOTSCREEN)
|
2021-04-24 01:29:30 -05:00
|
|
|
|
2020-07-30 01:43:19 -05:00
|
|
|
void MarlinUI::show_bootscreen() {
|
|
|
|
tft.queue.reset();
|
|
|
|
|
|
|
|
tft.canvas(0, 0, TFT_WIDTH, TFT_HEIGHT);
|
2020-12-27 21:10:53 -06:00
|
|
|
#if ENABLED(BOOT_MARLIN_LOGO_SMALL)
|
|
|
|
#define BOOT_LOGO_W 195 // MarlinLogo195x59x16
|
|
|
|
#define BOOT_LOGO_H 59
|
|
|
|
#define SITE_URL_Y (TFT_HEIGHT - 46)
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
#else
|
2021-01-25 01:44:39 -06:00
|
|
|
#define BOOT_LOGO_W TFT_WIDTH // MarlinLogo320x240x16
|
|
|
|
#define BOOT_LOGO_H TFT_HEIGHT
|
2020-12-27 21:10:53 -06:00
|
|
|
#define SITE_URL_Y (TFT_HEIGHT - 52)
|
|
|
|
#endif
|
|
|
|
tft.add_image((TFT_WIDTH - BOOT_LOGO_W) / 2, (TFT_HEIGHT - BOOT_LOGO_H) / 2, imgBootScreen);
|
2020-07-30 01:43:19 -05:00
|
|
|
#ifdef WEBSITE_URL
|
2020-12-27 21:10:53 -06:00
|
|
|
tft_string.set(WEBSITE_URL);
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), SITE_URL_Y, COLOR_WEBSITE_URL, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
tft.queue.sync();
|
2021-04-24 01:29:30 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void MarlinUI::bootscreen_completion(const millis_t sofar) {
|
|
|
|
if ((BOOTSCREEN_TIMEOUT) > sofar) safe_delay((BOOTSCREEN_TIMEOUT) - sofar);
|
2020-07-30 01:43:19 -05:00
|
|
|
clear_lcd();
|
|
|
|
}
|
2021-04-24 01:29:30 -05:00
|
|
|
|
2020-12-11 18:21:56 -06:00
|
|
|
#endif
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
void MarlinUI::draw_kill_screen() {
|
|
|
|
tft.queue.reset();
|
|
|
|
tft.fill(0, 0, TFT_WIDTH, TFT_HEIGHT, COLOR_KILL_SCREEN_BG);
|
|
|
|
|
|
|
|
tft.canvas(0, 60, TFT_WIDTH, 20);
|
|
|
|
tft.set_background(COLOR_KILL_SCREEN_BG);
|
|
|
|
tft_string.set(status_message);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_KILL_SCREEN_TEXT, tft_string);
|
|
|
|
|
|
|
|
tft.canvas(0, 120, TFT_WIDTH, 20);
|
|
|
|
tft.set_background(COLOR_KILL_SCREEN_BG);
|
|
|
|
tft_string.set(GET_TEXT(MSG_HALTED));
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_KILL_SCREEN_TEXT, tft_string);
|
|
|
|
|
|
|
|
tft.canvas(0, 160, TFT_WIDTH, 20);
|
|
|
|
tft.set_background(COLOR_KILL_SCREEN_BG);
|
|
|
|
tft_string.set(GET_TEXT(MSG_PLEASE_RESET));
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_KILL_SCREEN_TEXT, tft_string);
|
|
|
|
|
|
|
|
tft.queue.sync();
|
|
|
|
}
|
|
|
|
|
|
|
|
void draw_heater_status(uint16_t x, uint16_t y, const int8_t Heater) {
|
|
|
|
MarlinImage image = imgHotEnd;
|
|
|
|
uint16_t Color;
|
2021-03-24 04:11:43 -05:00
|
|
|
celsius_t currentTemperature, targetTemperature;
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
if (Heater >= 0) { // HotEnd
|
2021-04-23 20:19:23 -05:00
|
|
|
currentTemperature = thermalManager.wholeDegHotend(Heater);
|
2020-07-30 01:43:19 -05:00
|
|
|
targetTemperature = thermalManager.degTargetHotend(Heater);
|
|
|
|
}
|
2021-01-25 01:44:39 -06:00
|
|
|
#if HAS_HEATED_BED
|
|
|
|
else if (Heater == H_BED) {
|
2021-04-23 20:19:23 -05:00
|
|
|
currentTemperature = thermalManager.wholeDegBed();
|
2021-01-25 01:44:39 -06:00
|
|
|
targetTemperature = thermalManager.degTargetBed();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if HAS_TEMP_CHAMBER
|
|
|
|
else if (Heater == H_CHAMBER) {
|
2021-04-23 20:19:23 -05:00
|
|
|
currentTemperature = thermalManager.wholeDegChamber();
|
2021-01-25 01:44:39 -06:00
|
|
|
#if HAS_HEATED_CHAMBER
|
|
|
|
targetTemperature = thermalManager.degTargetChamber();
|
|
|
|
#else
|
|
|
|
targetTemperature = ABSOLUTE_ZERO;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|
2021-03-06 14:13:28 -06:00
|
|
|
#if HAS_TEMP_COOLER
|
|
|
|
else if (Heater == H_COOLER) {
|
2021-04-23 20:19:23 -05:00
|
|
|
currentTemperature = thermalManager.wholeDegCooler();
|
2021-03-06 14:13:28 -06:00
|
|
|
targetTemperature = TERN(HAS_COOLER, thermalManager.degTargetCooler(), ABSOLUTE_ZERO);
|
|
|
|
}
|
|
|
|
#endif
|
2020-07-30 01:43:19 -05:00
|
|
|
else return;
|
|
|
|
|
|
|
|
TERN_(TOUCH_SCREEN, if (targetTemperature >= 0) touch.add_control(HEATER, x, y, 64, 100, Heater));
|
|
|
|
tft.canvas(x, y, 64, 100);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
|
|
|
|
Color = currentTemperature < 0 ? COLOR_INACTIVE : COLOR_COLD;
|
|
|
|
|
|
|
|
if (Heater >= 0) { // HotEnd
|
|
|
|
if (currentTemperature >= 50) Color = COLOR_HOTEND;
|
|
|
|
}
|
|
|
|
#if HAS_HEATED_BED
|
2021-01-25 01:44:39 -06:00
|
|
|
else if (Heater == H_BED) {
|
|
|
|
if (currentTemperature >= 50) Color = COLOR_HEATED_BED;
|
|
|
|
image = targetTemperature > 0 ? imgBedHeated : imgBed;
|
|
|
|
}
|
|
|
|
#endif
|
2020-07-30 01:43:19 -05:00
|
|
|
#if HAS_TEMP_CHAMBER
|
2021-01-25 01:44:39 -06:00
|
|
|
else if (Heater == H_CHAMBER) {
|
|
|
|
if (currentTemperature >= 50) Color = COLOR_CHAMBER;
|
|
|
|
image = targetTemperature > 0 ? imgChamberHeated : imgChamber;
|
|
|
|
}
|
|
|
|
#endif
|
2021-03-06 14:13:28 -06:00
|
|
|
#if HAS_TEMP_COOLER
|
|
|
|
else if (Heater == H_COOLER) {
|
|
|
|
if (currentTemperature <= 26) Color = COLOR_COLD;
|
|
|
|
if (currentTemperature > 26) Color = COLOR_RED;
|
|
|
|
image = targetTemperature > 26 ? imgCoolerHot : imgCooler;
|
|
|
|
}
|
|
|
|
#endif
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
tft.add_image(0, 18, image, Color);
|
|
|
|
|
2021-03-24 04:11:43 -05:00
|
|
|
tft_string.set((uint8_t *)i16tostr3rj(currentTemperature));
|
2020-07-30 01:43:19 -05:00
|
|
|
tft_string.add(LCD_STR_DEGREE);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(64) + 2, 72, Color, tft_string);
|
|
|
|
|
|
|
|
if (targetTemperature >= 0) {
|
2021-03-24 04:11:43 -05:00
|
|
|
tft_string.set((uint8_t *)i16tostr3rj(targetTemperature));
|
2020-07-30 01:43:19 -05:00
|
|
|
tft_string.add(LCD_STR_DEGREE);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(64) + 2, 8, Color, tft_string);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void draw_fan_status(uint16_t x, uint16_t y, const bool blink) {
|
|
|
|
TERN_(TOUCH_SCREEN, touch.add_control(FAN, x, y, 64, 100));
|
|
|
|
tft.canvas(x, y, 64, 100);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
|
|
|
|
uint8_t fanSpeed = thermalManager.fan_speed[0];
|
|
|
|
MarlinImage image;
|
|
|
|
|
|
|
|
if (fanSpeed >= 127)
|
|
|
|
image = blink ? imgFanFast1 : imgFanFast0;
|
|
|
|
else if (fanSpeed > 0)
|
|
|
|
image = blink ? imgFanSlow1 : imgFanSlow0;
|
|
|
|
else
|
|
|
|
image = imgFanIdle;
|
|
|
|
|
|
|
|
tft.add_image(0, 10, image, COLOR_FAN);
|
|
|
|
|
|
|
|
tft_string.set((uint8_t *)ui8tostr4pctrj(thermalManager.fan_speed[0]));
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(64) + 6, 72, COLOR_FAN, tft_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MarlinUI::draw_status_screen() {
|
|
|
|
const bool blink = get_blink();
|
|
|
|
|
|
|
|
TERN_(TOUCH_SCREEN, touch.clear());
|
|
|
|
|
|
|
|
// heaters and fan
|
2021-01-25 01:44:39 -06:00
|
|
|
uint16_t i, x, y = TFT_STATUS_TOP_Y;
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
for (i = 0 ; i < ITEMS_COUNT; i++) {
|
|
|
|
x = (320 / ITEMS_COUNT - 64) / 2 + (320 * i / ITEMS_COUNT);
|
|
|
|
switch (i) {
|
|
|
|
#ifdef ITEM_E0
|
|
|
|
case ITEM_E0: draw_heater_status(x, y, H_E0); break;
|
|
|
|
#endif
|
|
|
|
#ifdef ITEM_E1
|
|
|
|
case ITEM_E1: draw_heater_status(x, y, H_E1); break;
|
|
|
|
#endif
|
|
|
|
#ifdef ITEM_E2
|
|
|
|
case ITEM_E2: draw_heater_status(x, y, H_E2); break;
|
|
|
|
#endif
|
|
|
|
#ifdef ITEM_BED
|
|
|
|
case ITEM_BED: draw_heater_status(x, y, H_BED); break;
|
|
|
|
#endif
|
|
|
|
#ifdef ITEM_CHAMBER
|
|
|
|
case ITEM_CHAMBER: draw_heater_status(x, y, H_CHAMBER); break;
|
|
|
|
#endif
|
2021-04-28 04:08:21 -05:00
|
|
|
#ifdef ITEM_COOLER
|
|
|
|
case ITEM_COOLER: draw_heater_status(x, y, H_COOLER); break;
|
|
|
|
#endif
|
2020-07-30 01:43:19 -05:00
|
|
|
#ifdef ITEM_FAN
|
|
|
|
case ITEM_FAN: draw_fan_status(x, y, blink); break;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// coordinates
|
|
|
|
tft.canvas(4, 103, 312, 24);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft.add_rectangle(0, 0, 312, 24, COLOR_AXIS_HOMED);
|
|
|
|
|
|
|
|
tft.add_text( 10, 3, COLOR_AXIS_HOMED , "X");
|
|
|
|
tft.add_text(127, 3, COLOR_AXIS_HOMED , "Y");
|
|
|
|
tft.add_text(219, 3, COLOR_AXIS_HOMED , "Z");
|
|
|
|
|
2020-11-29 19:06:40 -06:00
|
|
|
bool not_homed = axis_should_home(X_AXIS);
|
|
|
|
tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
|
|
|
|
tft.add_text( 68 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
2020-11-29 19:06:40 -06:00
|
|
|
not_homed = axis_should_home(Y_AXIS);
|
|
|
|
tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
|
|
|
|
tft.add_text(185 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
2020-11-29 19:06:40 -06:00
|
|
|
not_homed = axis_should_home(Z_AXIS);
|
|
|
|
uint16_t offset = 25;
|
|
|
|
if (blink && not_homed)
|
2020-07-30 01:43:19 -05:00
|
|
|
tft_string.set("?");
|
|
|
|
else {
|
|
|
|
const float z = LOGICAL_Z_POSITION(current_position.z);
|
|
|
|
tft_string.set(ftostr52sp((int16_t)z));
|
|
|
|
tft_string.rtrim();
|
2020-11-29 19:06:40 -06:00
|
|
|
offset += tft_string.width();
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
tft_string.set(ftostr52sp(z));
|
2020-11-29 19:06:40 -06:00
|
|
|
offset -= tft_string.width();
|
2020-07-30 01:43:19 -05:00
|
|
|
}
|
2020-11-29 19:06:40 -06:00
|
|
|
tft.add_text(301 - tft_string.width() - offset, 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
|
2021-04-28 04:08:21 -05:00
|
|
|
TERN_(TOUCH_SCREEN, touch.add_control(MOVE_AXIS, 0, 103, 312, 24));
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
// feed rate
|
|
|
|
tft.canvas(70, 136, 80, 32);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
2020-11-29 19:06:40 -06:00
|
|
|
uint16_t color = feedrate_percentage == 100 ? COLOR_RATE_100 : COLOR_RATE_ALTERED;
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.add_image(0, 0, imgFeedRate, color);
|
|
|
|
tft_string.set(i16tostr3rj(feedrate_percentage));
|
|
|
|
tft_string.add('%');
|
|
|
|
tft.add_text(32, 6, color , tft_string);
|
|
|
|
TERN_(TOUCH_SCREEN, touch.add_control(FEEDRATE, 70, 136, 80, 32));
|
|
|
|
|
|
|
|
// flow rate
|
|
|
|
tft.canvas(170, 136, 80, 32);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
color = planner.flow_percentage[0] == 100 ? COLOR_RATE_100 : COLOR_RATE_ALTERED;
|
|
|
|
tft.add_image(0, 0, imgFlowRate, color);
|
|
|
|
tft_string.set(i16tostr3rj(planner.flow_percentage[active_extruder]));
|
|
|
|
tft_string.add('%');
|
|
|
|
tft.add_text(32, 6, color , tft_string);
|
|
|
|
TERN_(TOUCH_SCREEN, touch.add_control(FLOWRATE, 170, 136, 80, 32, active_extruder));
|
|
|
|
|
|
|
|
// print duration
|
|
|
|
char buffer[14];
|
|
|
|
duration_t elapsed = print_job_timer.duration();
|
|
|
|
elapsed.toDigital(buffer);
|
|
|
|
|
|
|
|
tft.canvas(96, 176, 128, 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(buffer);
|
|
|
|
tft.add_text(tft_string.center(128), 0, COLOR_PRINT_TIME, tft_string);
|
|
|
|
|
|
|
|
// progress bar
|
|
|
|
const uint8_t progress = ui.get_progress_percent();
|
|
|
|
tft.canvas(4, 198, 312, 9);
|
|
|
|
tft.set_background(COLOR_PROGRESS_BG);
|
|
|
|
tft.add_rectangle(0, 0, 312, 9, COLOR_PROGRESS_FRAME);
|
|
|
|
if (progress)
|
|
|
|
tft.add_bar(1, 1, (310 * progress) / 100, 7, COLOR_PROGRESS_BAR);
|
|
|
|
|
|
|
|
// status message
|
|
|
|
tft.canvas(0, 216, 320, 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(status_message);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_STATUS_MESSAGE, tft_string);
|
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
|
|
|
add_control(256, 130, menu_main, imgSettings);
|
2020-11-03 17:21:15 -06:00
|
|
|
TERN_(SDSUPPORT, add_control(0, 130, menu_media, imgSD, !printingIsActive(), COLOR_CONTROL_ENABLED, card.isMounted() && printingIsActive() ? COLOR_BUSY : COLOR_CONTROL_DISABLED));
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
// Low-level draw_edit_screen can be used to draw an edit screen from anyplace
|
2021-03-29 20:36:37 -05:00
|
|
|
void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
|
2020-07-30 01:43:19 -05:00
|
|
|
ui.encoder_direction_normal();
|
|
|
|
TERN_(TOUCH_SCREEN, touch.clear());
|
|
|
|
|
|
|
|
uint16_t line = 1;
|
|
|
|
|
|
|
|
menu_line(line++);
|
|
|
|
tft_string.set(pstr, itemIndex, itemString);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
|
|
|
|
|
|
|
TERN_(AUTO_BED_LEVELING_UBL, if (ui.external_control) line++); // ftostr52() will overwrite *value so *value has to be displayed first
|
|
|
|
|
|
|
|
menu_line(line);
|
|
|
|
tft_string.set(value);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
if (ui.external_control) {
|
|
|
|
menu_line(line - 1);
|
|
|
|
|
|
|
|
tft_string.set(X_LBL);
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.add_text(TFT_WIDTH / 2 - 120, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft_string.set(ftostr52(LOGICAL_X_POSITION(current_position.x)));
|
|
|
|
tft_string.trim();
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.add_text(TFT_WIDTH / 2 - 16 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
tft_string.set(Y_LBL);
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.add_text(TFT_WIDTH / 2 + 16, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft_string.set(ftostr52(LOGICAL_X_POSITION(current_position.y)));
|
|
|
|
tft_string.trim();
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.add_text(TFT_WIDTH / 2 + 120 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
extern screenFunc_t _manual_move_func_ptr;
|
|
|
|
if (ui.currentScreen != _manual_move_func_ptr && !ui.external_control) {
|
|
|
|
|
2020-12-22 06:51:29 -06:00
|
|
|
#define SLIDER_LENGTH 224
|
2020-07-30 01:43:19 -05:00
|
|
|
#define SLIDER_Y_POSITION 140
|
|
|
|
|
2020-12-22 06:51:29 -06:00
|
|
|
tft.canvas((TFT_WIDTH - SLIDER_LENGTH) / 2, SLIDER_Y_POSITION, SLIDER_LENGTH, 16);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
|
2020-12-22 06:51:29 -06:00
|
|
|
int16_t position = (SLIDER_LENGTH - 2) * ui.encoderPosition / maxEditValue;
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.add_bar(0, 7, 1, 2, ui.encoderPosition == 0 ? COLOR_SLIDER_INACTIVE : COLOR_SLIDER);
|
|
|
|
tft.add_bar(1, 6, position, 4, COLOR_SLIDER);
|
2020-12-22 06:51:29 -06:00
|
|
|
tft.add_bar(position + 1, 6, SLIDER_LENGTH - 2 - position, 4, COLOR_SLIDER_INACTIVE);
|
|
|
|
tft.add_bar(SLIDER_LENGTH - 1, 7, 1, 2, int32_t(ui.encoderPosition) == maxEditValue ? COLOR_SLIDER : COLOR_SLIDER_INACTIVE);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
2020-12-22 06:51:29 -06:00
|
|
|
tft.add_image((SLIDER_LENGTH - 8) * ui.encoderPosition / maxEditValue, 0, imgSlider, COLOR_SLIDER);
|
|
|
|
touch.add_control(SLIDER, (TFT_WIDTH - SLIDER_LENGTH) / 2, SLIDER_Y_POSITION - 8, SLIDER_LENGTH, 32, maxEditValue);
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2020-12-27 23:11:36 -06:00
|
|
|
tft.draw_edit_screen_buttons();
|
|
|
|
}
|
|
|
|
|
|
|
|
void TFT::draw_edit_screen_buttons() {
|
2020-07-30 01:43:19 -05:00
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
2021-04-28 04:08:21 -05:00
|
|
|
add_control(32, TFT_HEIGHT - 64, DECREASE, imgDecrease);
|
|
|
|
add_control(224, TFT_HEIGHT - 64, INCREASE, imgIncrease);
|
|
|
|
add_control(128, TFT_HEIGHT - 64, CLICK, imgConfirm);
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
// The Select Screen presents a prompt and two "buttons"
|
|
|
|
void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
|
|
|
|
uint16_t line = 1;
|
|
|
|
|
2020-10-24 17:13:10 -05:00
|
|
|
if (!string) line++;
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
menu_line(line++);
|
|
|
|
tft_string.set(pref);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
|
|
|
|
|
|
|
if (string) {
|
|
|
|
menu_line(line++);
|
|
|
|
tft_string.set(string);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (suff) {
|
|
|
|
menu_line(line);
|
|
|
|
tft_string.set(suff);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
|
|
|
}
|
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
2021-04-28 04:08:21 -05:00
|
|
|
add_control(48, TFT_HEIGHT - 64, CANCEL, imgCancel, true, yesno ? HALF(COLOR_CONTROL_CANCEL) : COLOR_CONTROL_CANCEL);
|
|
|
|
add_control(208, TFT_HEIGHT - 64, CONFIRM, imgConfirm, true, yesno ? COLOR_CONTROL_CONFIRM : HALF(COLOR_CONTROL_CONFIRM));
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
2021-01-25 01:44:39 -06:00
|
|
|
|
2020-07-30 01:43:19 -05:00
|
|
|
void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
|
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
|
|
|
touch.clear();
|
|
|
|
draw_menu_navigation = false;
|
2021-04-28 04:08:21 -05:00
|
|
|
touch.add_control(RESUME_CONTINUE , 0, 0, TFT_WIDTH, TFT_HEIGHT);
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
menu_line(row);
|
|
|
|
tft_string.set(GET_TEXT(MSG_FILAMENT_CHANGE_NOZZLE));
|
|
|
|
tft_string.add('E');
|
|
|
|
tft_string.add((char)('1' + extruder));
|
|
|
|
tft_string.add(' ');
|
2021-04-23 20:19:23 -05:00
|
|
|
tft_string.add(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
|
2020-07-30 01:43:19 -05:00
|
|
|
tft_string.add(LCD_STR_DEGREE);
|
|
|
|
tft_string.add(" / ");
|
|
|
|
tft_string.add(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
|
|
|
|
tft_string.add(LCD_STR_DEGREE);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
|
|
|
}
|
2021-01-25 01:44:39 -06:00
|
|
|
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif // ADVANCED_PAUSE_FEATURE
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
#define GRID_OFFSET_X 8
|
|
|
|
#define GRID_OFFSET_Y 8
|
|
|
|
#define GRID_WIDTH 144
|
|
|
|
#define GRID_HEIGHT 144
|
|
|
|
#define CONTROL_OFFSET 8
|
|
|
|
|
|
|
|
void MarlinUI::ubl_plot(const uint8_t x_plot, const uint8_t y_plot) {
|
|
|
|
|
|
|
|
tft.canvas(GRID_OFFSET_X, GRID_OFFSET_Y, GRID_WIDTH, GRID_HEIGHT);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft.add_rectangle(0, 0, GRID_WIDTH, GRID_HEIGHT, COLOR_WHITE);
|
|
|
|
|
2021-04-01 19:12:00 -05:00
|
|
|
for (uint16_t x = 0; x < (GRID_MAX_POINTS_X); x++)
|
|
|
|
for (uint16_t y = 0; y < (GRID_MAX_POINTS_Y); y++)
|
2020-07-30 01:43:19 -05:00
|
|
|
if (position_is_reachable({ ubl.mesh_index_to_xpos(x), ubl.mesh_index_to_ypos(y) }))
|
2021-04-01 19:12:00 -05:00
|
|
|
tft.add_bar(1 + (x * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2, GRID_HEIGHT - 3 - ((y * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 2, 2, COLOR_UBL);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
2021-04-01 19:12:00 -05:00
|
|
|
tft.add_rectangle((x_plot * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2 - 1, GRID_HEIGHT - 5 - ((y_plot * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 6, 6, COLOR_UBL);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
|
|
|
|
lpos = pos.asLogical();
|
|
|
|
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.canvas(216, GRID_OFFSET_Y + (GRID_HEIGHT - MENU_ITEM_HEIGHT) / 2 - MENU_ITEM_HEIGHT, 96, MENU_ITEM_HEIGHT);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(X_LBL);
|
|
|
|
tft.add_text(0, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
|
|
|
tft_string.set(ftostr52(lpos.x));
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(96 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
|
|
|
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.canvas(216, GRID_OFFSET_Y + (GRID_HEIGHT - MENU_ITEM_HEIGHT) / 2, 96, MENU_ITEM_HEIGHT);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(Y_LBL);
|
|
|
|
tft.add_text(0, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
|
|
|
tft_string.set(ftostr52(lpos.y));
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(96 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
|
|
|
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.canvas(216, GRID_OFFSET_Y + (GRID_HEIGHT - MENU_ITEM_HEIGHT) / 2 + MENU_ITEM_HEIGHT, 96, MENU_ITEM_HEIGHT);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(Z_LBL);
|
|
|
|
tft.add_text(0, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
|
2021-04-16 02:43:59 -05:00
|
|
|
tft_string.set(isnan(ubl.z_values[x_plot][y_plot]) ? "-----" : ftostr43sign(ubl.z_values[x_plot][y_plot]));
|
2020-07-30 01:43:19 -05:00
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(96 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
|
|
|
|
2021-01-25 01:44:39 -06:00
|
|
|
constexpr uint8_t w = (TFT_WIDTH) / 10;
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.canvas(GRID_OFFSET_X + (GRID_WIDTH - w) / 2, GRID_OFFSET_Y + GRID_HEIGHT + CONTROL_OFFSET - 1, w, MENU_ITEM_HEIGHT);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(ui8tostr3rj(x_plot));
|
|
|
|
tft_string.trim();
|
2021-01-25 01:44:39 -06:00
|
|
|
tft.add_text(tft_string.center(w), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
2021-04-28 04:08:21 -05:00
|
|
|
tft.canvas(GRID_OFFSET_X + GRID_WIDTH + CONTROL_OFFSET, GRID_OFFSET_Y + (GRID_HEIGHT - 27) / 2, w, MENU_ITEM_HEIGHT);
|
2020-07-30 01:43:19 -05:00
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(ui8tostr3rj(y_plot));
|
|
|
|
tft_string.trim();
|
2021-01-25 01:44:39 -06:00
|
|
|
tft.add_text(tft_string.center(w), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
|
2020-07-30 01:43:19 -05:00
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
|
|
|
touch.clear();
|
|
|
|
draw_menu_navigation = false;
|
2021-04-01 19:12:00 -05:00
|
|
|
add_control(GRID_OFFSET_X + GRID_WIDTH + CONTROL_OFFSET, GRID_OFFSET_Y + CONTROL_OFFSET, UBL, (ENCODER_STEPS_PER_MENU_ITEM) * (GRID_MAX_POINTS_X), imgUp);
|
|
|
|
add_control(GRID_OFFSET_X + GRID_WIDTH + CONTROL_OFFSET, GRID_OFFSET_Y + GRID_HEIGHT - CONTROL_OFFSET - 32, UBL, -(ENCODER_STEPS_PER_MENU_ITEM) * (GRID_MAX_POINTS_X), imgDown);
|
|
|
|
add_control(GRID_OFFSET_X + CONTROL_OFFSET, GRID_OFFSET_Y + GRID_HEIGHT + CONTROL_OFFSET, UBL, -(ENCODER_STEPS_PER_MENU_ITEM), imgLeft);
|
2020-07-30 01:43:19 -05:00
|
|
|
add_control(GRID_OFFSET_X + GRID_WIDTH - CONTROL_OFFSET - 32, GRID_OFFSET_Y + GRID_HEIGHT + CONTROL_OFFSET, UBL, ENCODER_STEPS_PER_MENU_ITEM, imgRight);
|
|
|
|
add_control(224, GRID_OFFSET_Y + GRID_HEIGHT + CONTROL_OFFSET, CLICK, imgLeveling);
|
|
|
|
add_control(144, 206, BACK, imgBack);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
|
|
|
|
2021-04-28 04:08:21 -05:00
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
|
|
#include "../../feature/babystep.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAS_BED_PROBE
|
|
|
|
#include "../../module/probe.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define Z_SELECTION_Z 1
|
|
|
|
#define Z_SELECTION_Z_PROBE -1
|
|
|
|
|
|
|
|
struct MotionAxisState {
|
|
|
|
xy_int_t xValuePos, yValuePos, zValuePos, eValuePos, stepValuePos, zTypePos, eNamePos;
|
|
|
|
float currentStepSize = 10.0;
|
|
|
|
int z_selection = Z_SELECTION_Z;
|
|
|
|
uint8_t e_selection = 0;
|
|
|
|
bool blocked = false;
|
|
|
|
char message[32];
|
|
|
|
};
|
|
|
|
|
|
|
|
MotionAxisState motionAxisState;
|
|
|
|
|
|
|
|
#define E_BTN_COLOR COLOR_YELLOW
|
|
|
|
#define X_BTN_COLOR COLOR_CORAL_RED
|
|
|
|
#define Y_BTN_COLOR COLOR_VIVID_GREEN
|
|
|
|
#define Z_BTN_COLOR COLOR_LIGHT_BLUE
|
|
|
|
|
|
|
|
#define BTN_WIDTH 48
|
|
|
|
#define BTN_HEIGHT 39
|
|
|
|
#define X_MARGIN 15
|
|
|
|
#define Y_MARGIN 11
|
|
|
|
|
|
|
|
static void quick_feedback() {
|
|
|
|
#if HAS_CHIRP
|
|
|
|
ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
|
|
|
|
#if BOTH(HAS_LCD_MENU, USE_BEEPER)
|
|
|
|
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
|
|
|
|
#elif HAS_LCD_MENU
|
|
|
|
delay(10);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#define CUR_STEP_VALUE_WIDTH 38
|
|
|
|
static void drawCurStepValue() {
|
|
|
|
tft_string.set((uint8_t *)ftostr52sp(motionAxisState.currentStepSize));
|
|
|
|
tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft.add_text(CUR_STEP_VALUE_WIDTH - tft_string.width(), 0, COLOR_AXIS_HOMED, tft_string);
|
|
|
|
tft.queue.sync();
|
|
|
|
tft_string.set("mm");
|
|
|
|
tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y + 20, CUR_STEP_VALUE_WIDTH, 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft.add_text(CUR_STEP_VALUE_WIDTH - tft_string.width(), 0, COLOR_AXIS_HOMED, tft_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drawCurZSelection() {
|
|
|
|
tft_string.set("Z");
|
|
|
|
tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y, tft_string.width(), 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft.add_text(0, 0, Z_BTN_COLOR, tft_string);
|
|
|
|
tft.queue.sync();
|
|
|
|
tft_string.set("Offset");
|
|
|
|
tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y + 34, tft_string.width(), 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
if (motionAxisState.z_selection == Z_SELECTION_Z_PROBE) {
|
|
|
|
tft.add_text(0, 0, Z_BTN_COLOR, tft_string);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drawCurESelection() {
|
|
|
|
tft.canvas(motionAxisState.eNamePos.x, motionAxisState.eNamePos.y, BTN_WIDTH, BTN_HEIGHT);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set("E");
|
|
|
|
tft.add_text(0, 0, E_BTN_COLOR , tft_string);
|
|
|
|
tft.add_text(tft_string.width(), 0, E_BTN_COLOR, ui8tostr3rj(motionAxisState.e_selection));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drawMessage(const char *msg) {
|
|
|
|
tft.canvas(X_MARGIN, TFT_HEIGHT - Y_MARGIN - 29, (TFT_WIDTH / 2) - (BTN_WIDTH / 2) - X_MARGIN, 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft.add_text(0, 0, COLOR_YELLOW, msg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drawAxisValue(const AxisEnum axis) {
|
|
|
|
const float value = (
|
|
|
|
TERN_(HAS_BED_PROBE, axis == Z_AXIS && motionAxisState.z_selection == Z_SELECTION_Z_PROBE ? probe.offset.z :)
|
|
|
|
ui.manual_move.axis_value(axis)
|
|
|
|
);
|
|
|
|
xy_int_t pos;
|
|
|
|
uint16_t color;
|
|
|
|
switch (axis) {
|
|
|
|
case X_AXIS: pos = motionAxisState.xValuePos; color = X_BTN_COLOR; break;
|
|
|
|
case Y_AXIS: pos = motionAxisState.yValuePos; color = Y_BTN_COLOR; break;
|
|
|
|
case Z_AXIS: pos = motionAxisState.zValuePos; color = Z_BTN_COLOR; break;
|
|
|
|
case E_AXIS: pos = motionAxisState.eValuePos; color = E_BTN_COLOR; break;
|
|
|
|
default: return;
|
|
|
|
}
|
|
|
|
tft.canvas(pos.x, pos.y, BTN_WIDTH + X_MARGIN, 20);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft_string.set(ftostr52sp(value));
|
|
|
|
tft.add_text(0, 0, color, tft_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void moveAxis(const AxisEnum axis, const int8_t direction) {
|
|
|
|
quick_feedback();
|
|
|
|
|
|
|
|
if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
|
|
|
|
drawMessage("Too cold");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const float diff = motionAxisState.currentStepSize * direction;
|
|
|
|
|
|
|
|
if (axis == Z_AXIS && motionAxisState.z_selection == Z_SELECTION_Z_PROBE) {
|
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
|
|
const int16_t babystep_increment = direction * BABYSTEP_SIZE_Z;
|
|
|
|
const bool do_probe = DISABLED(BABYSTEP_HOTEND_Z_OFFSET) || active_extruder == 0;
|
|
|
|
const float bsDiff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
|
|
|
|
new_probe_offset = probe.offset.z + bsDiff,
|
|
|
|
new_offs = TERN(BABYSTEP_HOTEND_Z_OFFSET
|
|
|
|
, do_probe ? new_probe_offset : hotend_offset[active_extruder].z - bsDiff
|
|
|
|
, new_probe_offset
|
|
|
|
);
|
|
|
|
if (WITHIN(new_offs, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) {
|
|
|
|
babystep.add_steps(Z_AXIS, babystep_increment);
|
|
|
|
if (do_probe)
|
|
|
|
probe.offset.z = new_offs;
|
|
|
|
else
|
|
|
|
TERN(BABYSTEP_HOTEND_Z_OFFSET, hotend_offset[active_extruder].z = new_offs, NOOP);
|
|
|
|
drawMessage(""); // clear the error
|
|
|
|
drawAxisValue(axis);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
|
|
|
|
}
|
|
|
|
#elif HAS_BED_PROBE
|
|
|
|
// only change probe.offset.z
|
|
|
|
probe.offset.z += diff;
|
|
|
|
if (direction < 0 && current_position[axis] < Z_PROBE_OFFSET_RANGE_MIN) {
|
|
|
|
current_position[axis] = Z_PROBE_OFFSET_RANGE_MIN;
|
|
|
|
drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
|
|
|
|
}
|
|
|
|
else if (direction > 0 && current_position[axis] > Z_PROBE_OFFSET_RANGE_MAX) {
|
|
|
|
current_position[axis] = Z_PROBE_OFFSET_RANGE_MAX;
|
|
|
|
drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
drawMessage(""); // clear the error
|
|
|
|
}
|
|
|
|
drawAxisValue(axis);
|
|
|
|
#endif
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ui.manual_move.processing) {
|
|
|
|
// Get motion limit from software endstops, if any
|
|
|
|
float min, max;
|
|
|
|
soft_endstop.get_manual_axis_limits(axis, min, max);
|
|
|
|
|
|
|
|
// Delta limits XY based on the current offset from center
|
|
|
|
// This assumes the center is 0,0
|
|
|
|
#if ENABLED(DELTA)
|
|
|
|
if (axis != Z_AXIS && axis != E_AXIS) {
|
|
|
|
max = SQRT(sq((float)(DELTA_PRINTABLE_RADIUS)) - sq(current_position[Y_AXIS - axis])); // (Y_AXIS - axis) == the other axis
|
|
|
|
min = -max;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Get the new position
|
|
|
|
const bool limited = ui.manual_move.apply_diff(axis, diff, min, max);
|
|
|
|
#if IS_KINEMATIC
|
|
|
|
UNUSED(limited);
|
|
|
|
#else
|
|
|
|
PGM_P const msg = limited ? GET_TEXT(MSG_LCD_SOFT_ENDSTOPS) : NUL_STR;
|
|
|
|
drawMessage(msg);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ui.manual_move.soon(axis
|
|
|
|
#if MULTI_MANUAL
|
|
|
|
, motionAxisState.e_selection
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
drawAxisValue(axis);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void e_plus() { moveAxis(E_AXIS, 1); }
|
|
|
|
static void e_minus() { moveAxis(E_AXIS, -1); }
|
|
|
|
static void x_minus() { moveAxis(X_AXIS, -1); }
|
|
|
|
static void x_plus() { moveAxis(X_AXIS, 1); }
|
|
|
|
static void y_plus() { moveAxis(Y_AXIS, 1); }
|
|
|
|
static void y_minus() { moveAxis(Y_AXIS, -1); }
|
|
|
|
static void z_plus() { moveAxis(Z_AXIS, 1); }
|
|
|
|
static void z_minus() { moveAxis(Z_AXIS, -1); }
|
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN)
|
|
|
|
static void e_select() {
|
|
|
|
motionAxisState.e_selection++;
|
|
|
|
if (motionAxisState.e_selection >= EXTRUDERS) {
|
|
|
|
motionAxisState.e_selection = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
quick_feedback();
|
|
|
|
drawCurESelection();
|
|
|
|
drawAxisValue(E_AXIS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void do_home() {
|
|
|
|
quick_feedback();
|
|
|
|
drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING));
|
|
|
|
queue.inject_P(G28_STR);
|
|
|
|
// Disable touch until home is done
|
|
|
|
TERN_(HAS_TFT_XPT2046, touch.disable());
|
|
|
|
drawAxisValue(E_AXIS);
|
|
|
|
drawAxisValue(X_AXIS);
|
|
|
|
drawAxisValue(Y_AXIS);
|
|
|
|
drawAxisValue(Z_AXIS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void step_size() {
|
|
|
|
motionAxisState.currentStepSize = motionAxisState.currentStepSize / 10.0;
|
|
|
|
if (motionAxisState.currentStepSize < 0.0015) motionAxisState.currentStepSize = 10.0;
|
|
|
|
quick_feedback();
|
|
|
|
drawCurStepValue();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAS_BED_PROBE
|
|
|
|
static void z_select() {
|
|
|
|
motionAxisState.z_selection *= -1;
|
|
|
|
quick_feedback();
|
|
|
|
drawCurZSelection();
|
|
|
|
drawAxisValue(Z_AXIS);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void disable_steppers() {
|
|
|
|
quick_feedback();
|
|
|
|
queue.inject_P(PSTR("M84"));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drawBtn(int x, int y, const char *label, intptr_t data, MarlinImage img, uint16_t bgColor, bool enabled = true) {
|
|
|
|
uint16_t width = Images[imgBtn39Rounded].width;
|
|
|
|
uint16_t height = Images[imgBtn39Rounded].height;
|
|
|
|
|
|
|
|
if (!enabled) bgColor = COLOR_CONTROL_DISABLED;
|
|
|
|
|
|
|
|
tft.canvas(x, y, width, height);
|
|
|
|
tft.set_background(COLOR_BACKGROUND);
|
|
|
|
tft.add_image(0, 0, imgBtn39Rounded, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
|
|
|
|
|
|
|
|
// TODO: Make an add_text() taking a font arg
|
|
|
|
if (label) {
|
|
|
|
tft_string.set(label);
|
|
|
|
tft_string.trim();
|
|
|
|
tft.add_text(tft_string.center(width), height / 2 - tft_string.font_height() / 2, bgColor, tft_string);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tft.add_image(0, 0, img, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
|
|
|
|
}
|
|
|
|
|
|
|
|
TERN_(HAS_TFT_XPT2046, if (enabled) touch.add_control(BUTTON, x, y, width, height, data));
|
|
|
|
}
|
2020-09-17 06:52:21 -05:00
|
|
|
void MarlinUI::move_axis_screen() {
|
2021-04-28 04:08:21 -05:00
|
|
|
// Reset
|
|
|
|
defer_status_screen(true);
|
|
|
|
motionAxisState.blocked = false;
|
|
|
|
TERN_(HAS_TFT_XPT2046, touch.enable());
|
|
|
|
|
|
|
|
ui.clear_lcd();
|
|
|
|
|
|
|
|
TERN_(TOUCH_SCREEN, touch.clear());
|
|
|
|
|
|
|
|
const bool busy = printingIsActive();
|
|
|
|
|
|
|
|
// Babysteps during printing? Select babystep for Z probe offset
|
|
|
|
if (busy && ENABLED(BABYSTEP_ZPROBE_OFFSET))
|
|
|
|
motionAxisState.z_selection = Z_SELECTION_Z_PROBE;
|
|
|
|
|
|
|
|
// ROW 1 -> E- Y- CurY Z+
|
|
|
|
int x = X_MARGIN, y = Y_MARGIN, spacing = 0;
|
|
|
|
|
|
|
|
drawBtn(x, y, "E+", (intptr_t)e_plus, imgUp, E_BTN_COLOR, !busy);
|
|
|
|
|
|
|
|
spacing = (TFT_WIDTH - X_MARGIN * 2 - 3 * BTN_WIDTH) / 2;
|
|
|
|
x += BTN_WIDTH + spacing;
|
|
|
|
uint16_t yplus_x = x;
|
|
|
|
drawBtn(x, y, "Y+", (intptr_t)y_plus, imgUp, Y_BTN_COLOR, !busy);
|
|
|
|
|
|
|
|
// Cur Y
|
|
|
|
x += BTN_WIDTH;
|
|
|
|
motionAxisState.yValuePos.x = x + 2;
|
|
|
|
motionAxisState.yValuePos.y = y;
|
|
|
|
drawAxisValue(Y_AXIS);
|
|
|
|
|
|
|
|
x += spacing;
|
|
|
|
drawBtn(x, y, "Z+", (intptr_t)z_plus, imgUp, Z_BTN_COLOR, !busy || ENABLED(BABYSTEP_ZPROBE_OFFSET)); //only enabled when not busy or have baby step
|
|
|
|
|
|
|
|
// ROW 2 -> "Ex" X- HOME X+ "Z"
|
|
|
|
y += BTN_HEIGHT + (TFT_HEIGHT - Y_MARGIN * 2 - 4 * BTN_HEIGHT) / 3;
|
|
|
|
x = X_MARGIN;
|
|
|
|
spacing = (TFT_WIDTH - X_MARGIN * 2 - 5 * BTN_WIDTH) / 4;
|
|
|
|
|
|
|
|
motionAxisState.eNamePos.x = x;
|
|
|
|
motionAxisState.eNamePos.y = y;
|
|
|
|
drawCurESelection();
|
|
|
|
TERN_(HAS_TFT_XPT2046, if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, BTN_HEIGHT, (intptr_t)e_select));
|
|
|
|
|
|
|
|
x += BTN_WIDTH + spacing;
|
|
|
|
drawBtn(x, y, "X-", (intptr_t)x_minus, imgLeft, X_BTN_COLOR, !busy);
|
|
|
|
|
|
|
|
x += BTN_WIDTH + spacing; //imgHome is 64x64
|
|
|
|
TERN_(HAS_TFT_XPT2046, add_control(TFT_WIDTH / 2 - Images[imgHome].width / 2, y - (Images[imgHome].width - BTN_HEIGHT) / 2, BUTTON, (intptr_t)do_home, imgHome, !busy));
|
|
|
|
|
|
|
|
x += BTN_WIDTH + spacing;
|
|
|
|
uint16_t xplus_x = x;
|
|
|
|
drawBtn(x, y, "X+", (intptr_t)x_plus, imgRight, X_BTN_COLOR, !busy);
|
|
|
|
|
|
|
|
x += BTN_WIDTH + spacing;
|
|
|
|
motionAxisState.zTypePos.x = x;
|
|
|
|
motionAxisState.zTypePos.y = y;
|
|
|
|
drawCurZSelection();
|
|
|
|
#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
|
|
|
|
if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, 34 * 2, (intptr_t)z_select);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// ROW 3 -> E- CurX Y- Z-
|
|
|
|
y += BTN_HEIGHT + (TFT_HEIGHT - Y_MARGIN * 2 - 4 * BTN_HEIGHT) / 3;
|
|
|
|
x = X_MARGIN;
|
|
|
|
spacing = (TFT_WIDTH - X_MARGIN * 2 - 3 * BTN_WIDTH) / 2;
|
|
|
|
|
|
|
|
drawBtn(x, y, "E-", (intptr_t)e_minus, imgDown, E_BTN_COLOR, !busy);
|
|
|
|
|
|
|
|
// Cur E
|
|
|
|
motionAxisState.eValuePos.x = x;
|
|
|
|
motionAxisState.eValuePos.y = y + BTN_HEIGHT + 2;
|
|
|
|
drawAxisValue(E_AXIS);
|
|
|
|
|
|
|
|
// Cur X
|
|
|
|
motionAxisState.xValuePos.x = BTN_WIDTH + (TFT_WIDTH - X_MARGIN * 2 - 5 * BTN_WIDTH) / 4; //X- pos
|
|
|
|
motionAxisState.xValuePos.y = y - 10;
|
|
|
|
drawAxisValue(X_AXIS);
|
|
|
|
|
|
|
|
x += BTN_WIDTH + spacing;
|
|
|
|
drawBtn(x, y, "Y-", (intptr_t)y_minus, imgDown, Y_BTN_COLOR, !busy);
|
|
|
|
|
|
|
|
x += BTN_WIDTH + spacing;
|
|
|
|
drawBtn(x, y, "Z-", (intptr_t)z_minus, imgDown, Z_BTN_COLOR, !busy || ENABLED(BABYSTEP_ZPROBE_OFFSET)); //only enabled when not busy or have baby step
|
|
|
|
|
|
|
|
// Cur Z
|
|
|
|
motionAxisState.zValuePos.x = x;
|
|
|
|
motionAxisState.zValuePos.y = y + BTN_HEIGHT + 2;
|
|
|
|
drawAxisValue(Z_AXIS);
|
|
|
|
|
|
|
|
// ROW 4 -> step_size disable steppers back
|
|
|
|
y = TFT_HEIGHT - Y_MARGIN - BTN_HEIGHT; //
|
|
|
|
x = xplus_x - CUR_STEP_VALUE_WIDTH - 10;
|
|
|
|
motionAxisState.stepValuePos.x = yplus_x + BTN_WIDTH - CUR_STEP_VALUE_WIDTH;
|
|
|
|
motionAxisState.stepValuePos.y = TFT_HEIGHT - Y_MARGIN - BTN_HEIGHT;
|
|
|
|
if (!busy) {
|
|
|
|
drawCurStepValue();
|
|
|
|
TERN_(HAS_TFT_XPT2046, touch.add_control(BUTTON, motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, BTN_HEIGHT, (intptr_t)step_size));
|
|
|
|
}
|
|
|
|
|
|
|
|
// aligned with x+
|
|
|
|
drawBtn(xplus_x, y, "off", (intptr_t)disable_steppers, imgCancel, COLOR_WHITE, !busy);
|
|
|
|
|
|
|
|
TERN_(HAS_TFT_XPT2046, add_control(TFT_WIDTH - X_MARGIN - BTN_WIDTH, y, BACK, imgBack));
|
2020-09-17 06:52:21 -05:00
|
|
|
}
|
|
|
|
|
2020-07-30 01:43:19 -05:00
|
|
|
#endif // HAS_UI_320x240
|