3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-25 12:57:53 +00:00
Code Issues Releases Wiki Activity
17d1cd7c09
MarlinFirmware/Marlin/ultralcd.cpp

3462 lines
115 KiB
C++
Raw Normal View History

Further cleanup of comments, partial Doxygen-style Following up on #3231
2016-03-25 06:19:46 +00:00
/**
Added gplv3 header to all Marlin files
2016-03-24 18:01:20 +00:00
* Marlin 3D Printer Firmware
* Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
*
*/
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#include "ultralcd.h"
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTRA_LCD)
simplified the includes, makefile now works with arduino23
2011-12-22 13:55:45 +00:00
#include "Marlin.h"
explicit includes to make it compile with AVRStudio/Eclipse
2012-05-03 12:22:43 +00:00
#include "language.h"
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
#include "cardreader.h"
explicit includes to make it compile with AVRStudio/Eclipse
2012-05-03 12:22:43 +00:00
#include "temperature.h"
compile fix: quickStop() needs stepper.h
2013-01-31 15:43:03 +00:00
#include "stepper.h"
Rename files to move them in the IDE
2015-04-26 04:04:54 +00:00
#include "configuration_store.h"
Move number-to-string function to utility.*
2016-08-20 23:05:54 +00:00
#include "utility.h"
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
Sort out some header dependencies
2016-10-10 20:34:35 +00:00
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
#include "buzzer.h"
#endif
Add handling of BLTouch error state
2016-09-18 23:02:53 +00:00
#if ENABLED(BLTOUCH)
Fix and extend BLTouch support
2016-09-20 18:56:23 +00:00
#include "endstops.h"
Add handling of BLTouch error state
2016-09-18 23:02:53 +00:00
#endif
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if ENABLED(PRINTCOUNTER)
#include "printcounter.h"
Renamed timestamp_t to duration_t
2016-07-24 02:13:35 +00:00
#include "duration_t.h"
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
Added feedrate setting for manual moves from panel
2013-07-30 12:33:30 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(FILAMENT_LCD_DISPLAY)
Apply three more commits
2015-04-13 01:07:08 +00:00
millis_t previous_lcd_status_ms = 0;
Display Filament Sensor data on 20x4 LCD Changes to support displaying the real-time filament width and the volume factor on a 20x4 LCD. The data is displayed on the 4th line. First the status message is displayed for 5 seconds, and then the filament data is displayed. The status message can be seen by re-selecting the info screen in the menu.
2014-11-11 03:43:58 +00:00
#endif
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
uint8_t lcd_status_message_level;
Wrap macros to prevent bad expansions
2016-03-13 06:38:55 +00:00
char lcd_status_message[3 * (LCD_WIDTH) + 1] = WELCOME_MSG; // worst case is kana with up to 3*LCD_WIDTH+1
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(DOGLCD)
Rename ultralcd implementation files for consistency
2016-07-19 22:26:14 +00:00
#include "ultralcd_impl_DOGM.h"
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
#include <U8glib.h>
Add include selector between char. LCD and GLCD
2013-03-19 19:59:21 +00:00
#else
Rename ultralcd implementation files for consistency
2016-07-19 22:26:14 +00:00
#include "ultralcd_impl_HD44780.h"
Add include selector between char. LCD and GLCD
2013-03-19 19:59:21 +00:00
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
// The main status screen
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_status_screen();
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
millis_t next_lcd_update_ms;
uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to draw, decrements after every draw. Set to 2 in LCD routines so the LCD gets at least 1 full redraw (first redraw is partial)
Optimize handling of block_buffer_runtime() millis_t is long - divisions take for ever. Return a kind of millisecond instead of microsecond - divided by 1024 instead of 1000 for speed. (2.4% error) That does not matter because block_buffer_runtime is already a too short estimation. Shrink the return-type.
2016-12-15 11:50:22 +00:00
uint16_t max_display_update_time = 0;
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
Distribute GLCD screen updates in time Currently we draw and send the screens for a graphical LCD all at once. We draw in two or four parts but draw them directly behind each other. For the tested status screen this takes 59-62ms in a single block. During this time nothing else (except the interrupts) can be done. When printing a sequence of very short moves the buffer drains - sometimes until it's empty. This PR splits the screen update into parts. Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0) Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0) Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms. Previous experiments with a even better distribution of the time slots like (30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag. Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes, it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of framebuffer are saved in RAM. 13:45:59.213 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:00.213 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:01.215 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:02.215 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:03.214 : echo: #:17 >:13 s:30; #:17 >:13 s:30; S#:34 S>:26 S:60 13:46:04.214 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:05.212 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:06.212 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 03:30:36.779 : echo: #:8 >:7 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:8 >:7 s:15; S#:34 S>:27 S:61 03:30:37.778 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:9 >:7 s:16; #:8 >:6 s:14; S#:35 S>:26 S:61 03:30:38.778 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:7 s:15; S#:35 S>:26 S:61 03:30:39.777 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:8 >:8 s:16; #:8 >:6 s:14; S#:34 S>:27 S:61 03:30:40.780 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:35 S>:25 S:60 03:30:41.780 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:9 >:6 s:15; S#:36 S>:25 S:61 03:30:42.779 : echo: #:8 >:6 s:14; #:10 >:8 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:34 S>:26 S:60 03:30:43.778 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:7 s:15; #:9 >:6 s:15; S#:36 S>:26 S:62 #: draw a stripe >: transfer a stripe s: sum of of draw and transfer for one stripe S#: sum of draws for a complete screen S>: sum of transfers for a complete screen S: time to draw and transfer a complete screen
2016-11-24 20:17:25 +00:00
#if ENABLED(DOGLCD)
bool drawing_screen = false;
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define LCDVIEW_KEEP_REDRAWING LCDVIEW_CALL_REDRAW_NEXT
#else
#define LCDVIEW_KEEP_REDRAWING LCDVIEW_REDRAW_NOW
Distribute GLCD screen updates in time Currently we draw and send the screens for a graphical LCD all at once. We draw in two or four parts but draw them directly behind each other. For the tested status screen this takes 59-62ms in a single block. During this time nothing else (except the interrupts) can be done. When printing a sequence of very short moves the buffer drains - sometimes until it's empty. This PR splits the screen update into parts. Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0) Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0) Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms. Previous experiments with a even better distribution of the time slots like (30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag. Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes, it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of framebuffer are saved in RAM. 13:45:59.213 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:00.213 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:01.215 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:02.215 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:03.214 : echo: #:17 >:13 s:30; #:17 >:13 s:30; S#:34 S>:26 S:60 13:46:04.214 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:05.212 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:06.212 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 03:30:36.779 : echo: #:8 >:7 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:8 >:7 s:15; S#:34 S>:27 S:61 03:30:37.778 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:9 >:7 s:16; #:8 >:6 s:14; S#:35 S>:26 S:61 03:30:38.778 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:7 s:15; S#:35 S>:26 S:61 03:30:39.777 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:8 >:8 s:16; #:8 >:6 s:14; S#:34 S>:27 S:61 03:30:40.780 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:35 S>:25 S:60 03:30:41.780 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:9 >:6 s:15; S#:36 S>:25 S:61 03:30:42.779 : echo: #:8 >:6 s:14; #:10 >:8 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:34 S>:26 S:60 03:30:43.778 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:7 s:15; #:9 >:6 s:15; S#:36 S>:26 S:62 #: draw a stripe >: transfer a stripe s: sum of of draw and transfer for one stripe S#: sum of draws for a complete screen S>: sum of transfers for a complete screen S: time to draw and transfer a complete screen
2016-11-24 20:17:25 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
#if ENABLED(DAC_STEPPER_CURRENT)
#include "stepper_dac.h" //was dac_mcp4728.h MarlinMain uses stepper dac for the m-codes
uint16_t driverPercent[XYZE];
#endif
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// place-holders for Ki and Kd edits
float raw_Ki, raw_Kd;
/**
* REVERSE_MENU_DIRECTION
*
* To reverse the menu direction we need a general way to reverse
* the direction of the encoder everywhere. So encoderDirection is
* added to allow the encoder to go the other way.
*
* This behavior is limited to scrolling Menus and SD card listings,
* and is disabled in other contexts.
*/
#if ENABLED(REVERSE_MENU_DIRECTION)
int8_t encoderDirection = 1;
#define ENCODER_DIRECTION_NORMAL() (encoderDirection = 1)
#define ENCODER_DIRECTION_MENUS() (encoderDirection = -1)
#else
#define ENCODER_DIRECTION_NORMAL() ;
#define ENCODER_DIRECTION_MENUS() ;
#endif
int8_t encoderDiff; // updated from interrupt context and added to encoderPosition every LCD update
millis_t manual_move_start_time = 0;
Fix manual_move to move the correct E stepper
2016-06-12 23:51:28 +00:00
int8_t manual_move_axis = (int8_t)NO_AXIS;
#if EXTRUDERS > 1
int8_t manual_move_e_index = 0;
#else
#define manual_move_e_index 0
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
bool encoderRateMultiplierEnabled;
int32_t lastEncoderMovementMillis;
Conditionals and comments for PS = 0
2015-03-30 23:50:05 +00:00
#if HAS_POWER_SWITCH
extern bool powersupply;
#endif
Fix and optimize case-light code
2016-11-28 05:51:51 +00:00
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
const float manual_feedrate_mm_m[] = MANUAL_FEEDRATE;
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_main_menu();
void lcd_tune_menu();
void lcd_prepare_menu();
void lcd_move_menu();
void lcd_control_menu();
void lcd_control_temperature_menu();
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_control_temperature_preheat_material1_settings_menu();
void lcd_control_temperature_preheat_material2_settings_menu();
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_control_motion_menu();
void lcd_control_volumetric_menu();
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
#if ENABLED(DAC_STEPPER_CURRENT)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void dac_driver_commit();
void dac_driver_getValues();
void lcd_dac_menu();
void lcd_dac_write_eeprom();
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
#endif
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if ENABLED(LCD_INFO_MENU)
#if ENABLED(PRINTCOUNTER)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_info_stats_menu();
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_info_thermistors_menu();
void lcd_info_board_menu();
void lcd_info_menu();
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
#endif // LCD_INFO_MENU
#if ENABLED(FILAMENT_CHANGE_FEATURE)
m600 fixes
2016-12-20 07:47:46 +00:00
void lcd_filament_change_toocold_menu();
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_option_menu();
void lcd_filament_change_init_message();
void lcd_filament_change_unload_message();
void lcd_filament_change_insert_message();
void lcd_filament_change_load_message();
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
void lcd_filament_change_heat_nozzle();
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_extrude_message();
void lcd_filament_change_resume_message();
Moves all global enums to a central file
2016-07-19 13:31:09 +00:00
#endif
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
Make HAS_LCD_CONTRAST a boolean flag
2016-05-31 18:47:02 +00:00
#if HAS_LCD_CONTRAST
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_set_contrast();
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 20:34:56 +00:00
#endif
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(FWRETRACT)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_control_retract_menu();
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
2013-09-23 21:25:11 +00:00
#endif
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(DELTA_CALIBRATION_MENU)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_delta_calibrate_menu();
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 20:34:56 +00:00
#endif
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(MANUAL_BED_LEVELING)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
#include "mesh_bed_leveling.h"
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
2013-09-23 21:25:11 +00:00
#endif
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Function pointer to menu functions.
menu => screen
2016-06-11 21:19:17 +00:00
typedef void (*screenFunc_t)();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Different types of actions that can be used in menu items.
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
#define menu_action_back(dummy) _menu_action_back()
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _menu_action_back();
void menu_action_submenu(screenFunc_t data);
void menu_action_gcode(const char* pgcode);
void menu_action_function(screenFunc_t data);
void menu_action_setting_edit_bool(const char* pstr, bool* ptr);
void menu_action_setting_edit_int3(const char* pstr, int* ptr, int minValue, int maxValue);
void menu_action_setting_edit_float3(const char* pstr, float* ptr, float minValue, float maxValue);
void menu_action_setting_edit_float32(const char* pstr, float* ptr, float minValue, float maxValue);
void menu_action_setting_edit_float43(const char* pstr, float* ptr, float minValue, float maxValue);
void menu_action_setting_edit_float5(const char* pstr, float* ptr, float minValue, float maxValue);
void menu_action_setting_edit_float51(const char* pstr, float* ptr, float minValue, float maxValue);
void menu_action_setting_edit_float52(const char* pstr, float* ptr, float minValue, float maxValue);
void menu_action_setting_edit_float62(const char* pstr, float* ptr, float minValue, float maxValue);
void menu_action_setting_edit_long5(const char* pstr, unsigned long* ptr, unsigned long minValue, unsigned long maxValue);
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_int3(const char* pstr, int* ptr, int minValue, int maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_float3(const char* pstr, float* ptr, float minValue, float maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_float32(const char* pstr, float* ptr, float minValue, float maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_float43(const char* pstr, float* ptr, float minValue, float maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_float5(const char* pstr, float* ptr, float minValue, float maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_float51(const char* pstr, float* ptr, float minValue, float maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_float52(const char* pstr, float* ptr, float minValue, float maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_float62(const char* pstr, float* ptr, float minValue, float maxValue, screenFunc_t callbackFunc);
void menu_action_setting_edit_callback_long5(const char* pstr, unsigned long* ptr, unsigned long minValue, unsigned long maxValue, screenFunc_t callbackFunc);
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
#if ENABLED(SDSUPPORT)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_sdcard_menu();
void menu_action_sdfile(const char* filename, char* longFilename);
void menu_action_sddirectory(const char* filename, char* longFilename);
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
#endif
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
/* Helper macros for menus */
Allow encoder pulse/step override for more LCDs
2016-08-02 22:54:33 +00:00
#ifndef ENCODER_FEEDRATE_DEADZONE
#define ENCODER_FEEDRATE_DEADZONE 10
#endif
#ifndef ENCODER_STEPS_PER_MENU_ITEM
#define ENCODER_STEPS_PER_MENU_ITEM 5
#endif
#ifndef ENCODER_PULSES_PER_STEP
#define ENCODER_PULSES_PER_STEP 1
#endif
MENU_HOLLOW_FRAME for the menu screens MENU_HOLLOW_FRAME for the menu screens and some pixel shifting to optimize the look with tall fonts. (cn)
2016-11-26 19:55:55 +00:00
#ifndef TALL_FONT_CORRECTION
#define TALL_FONT_CORRECTION 0
#endif
Reduce size of menu code - Get rid of _selected functions, passing selected state instead
2015-03-16 05:02:33 +00:00
/**
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
* START_SCREEN_OR_MENU generates init code for a screen or menu
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
*
* encoderLine is the position based on the encoder
Scroll static screens more simply
2016-07-08 22:08:56 +00:00
* encoderTopLine is the top menu line to display
Rename vars, add comments for menu macros
2016-07-09 19:26:20 +00:00
* _lcdLineNr is the index of the LCD line (e.g., 0-3)
* _menuLineNr is the menu item to draw and process
* _thisItemNr is the index of each MENU_ITEM or STATIC_ITEM
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
* _countedItems is the total number of items in the menu (after one call)
Reduce size of menu code - Get rid of _selected functions, passing selected state instead
2015-03-16 05:02:33 +00:00
*/
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
#define START_SCREEN_OR_MENU(LIMIT) \
Implement reverse menu direction in ultralcd.cpp
2016-03-09 09:04:24 +00:00
ENCODER_DIRECTION_MENUS(); \
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
encoderRateMultiplierEnabled = false; \
if (encoderPosition > 0x8000) encoderPosition = 0; \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
static int8_t _countedItems = 0; \
Parenthesize some menu defines for safety
2017-02-15 05:12:27 +00:00
int8_t encoderLine = encoderPosition / (ENCODER_STEPS_PER_MENU_ITEM); \
if (_countedItems > 0 && encoderLine >= _countedItems - (LIMIT)) { \
encoderLine = max(0, _countedItems - (LIMIT)); \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
encoderPosition = encoderLine * (ENCODER_STEPS_PER_MENU_ITEM); \
}
#define SCREEN_OR_MENU_LOOP() \
Rename vars, add comments for menu macros
2016-07-09 19:26:20 +00:00
int8_t _menuLineNr = encoderTopLine, _thisItemNr; \
Parenthesize some menu defines for safety
2017-02-15 05:12:27 +00:00
for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT - (TALL_FONT_CORRECTION); _lcdLineNr++, _menuLineNr++) { \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
_thisItemNr = 0
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
/**
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
* START_SCREEN Opening code for a screen having only static items.
* Do simplified scrolling of the entire screen.
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
*
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
* START_MENU Opening code for a screen with menu items.
* Scroll as-needed to keep the selected line in view.
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
*/
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
#define START_SCREEN() \
Parenthesize some menu defines for safety
2017-02-15 05:12:27 +00:00
START_SCREEN_OR_MENU(LCD_HEIGHT - (TALL_FONT_CORRECTION)); \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
encoderTopLine = encoderLine; \
bool _skipStatic = false; \
SCREEN_OR_MENU_LOOP()
#define START_MENU() \
START_SCREEN_OR_MENU(1); \
Only exit menu handler when the screen changes
2016-11-28 05:51:10 +00:00
screen_changed = false; \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
NOMORE(encoderTopLine, encoderLine); \
Parenthesize some menu defines for safety
2017-02-15 05:12:27 +00:00
if (encoderLine >= encoderTopLine + LCD_HEIGHT - (TALL_FONT_CORRECTION)) { \
encoderTopLine = encoderLine - (LCD_HEIGHT - (TALL_FONT_CORRECTION) - 1); \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
} \
bool _skipStatic = true; \
SCREEN_OR_MENU_LOOP()
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
/**
* MENU_ITEM generates draw & handler code for a menu item, potentially calling:
*
* lcd_implementation_drawmenu_[type](sel, row, label, arg3...)
* menu_action_[type](arg3...)
*
* Examples:
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
* MENU_ITEM(back, MSG_WATCH, 0 [dummy parameter] )
* or
* MENU_BACK(MSG_WATCH)
Have "back" menu items go to the previous item
2016-04-03 04:12:18 +00:00
* lcd_implementation_drawmenu_back(sel, row, PSTR(MSG_WATCH))
* menu_action_back()
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
*
* MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_sdcard_pause)
* lcd_implementation_drawmenu_function(sel, row, PSTR(MSG_PAUSE_PRINT), lcd_sdcard_pause)
* menu_action_function(lcd_sdcard_pause)
*
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
* MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999)
* MENU_ITEM(setting_edit_int3, MSG_SPEED, PSTR(MSG_SPEED), &feedrate_percentage, 10, 999)
* lcd_implementation_drawmenu_setting_edit_int3(sel, row, PSTR(MSG_SPEED), PSTR(MSG_SPEED), &feedrate_percentage, 10, 999)
* menu_action_setting_edit_int3(PSTR(MSG_SPEED), &feedrate_percentage, 10, 999)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
*
*/
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define _MENU_ITEM_PART_1(TYPE, LABEL, ...) \
Rename vars, add comments for menu macros
2016-07-09 19:26:20 +00:00
if (_menuLineNr == _thisItemNr) { \
Reduce size of menu code - Get rid of _selected functions, passing selected state instead
2015-03-16 05:02:33 +00:00
if (lcdDrawUpdate) \
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
lcd_implementation_drawmenu_ ## TYPE(encoderLine == _thisItemNr, _lcdLineNr, PSTR(LABEL), ## __VA_ARGS__); \
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
if (lcd_clicked && encoderLine == _thisItemNr) {
Reduce redundancy in MENU_ITEM code
2016-04-12 06:28:20 +00:00
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define _MENU_ITEM_PART_2(TYPE, ...) \
menu_action_ ## TYPE(__VA_ARGS__); \
Only exit menu handler when the screen changes
2016-11-28 05:51:10 +00:00
if (screen_changed) return; \
Replace missing backslash
2015-02-20 10:17:16 +00:00
} \
} \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
++_thisItemNr
Reduce redundancy in MENU_ITEM code
2016-04-12 06:28:20 +00:00
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define MENU_ITEM(TYPE, LABEL, ...) do { \
Fix skipping of static items
2016-07-15 02:01:57 +00:00
_skipStatic = false; \
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
_MENU_ITEM_PART_1(TYPE, LABEL, ## __VA_ARGS__); \
_MENU_ITEM_PART_2(TYPE, ## __VA_ARGS__); \
Reduce redundancy in MENU_ITEM code
2016-04-12 06:28:20 +00:00
} while(0)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
#define MENU_BACK(LABEL) MENU_ITEM(back, LABEL, 0)
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
// Used to print static text with no visible cursor.
Add Debug Menu with LCD_PROGRESS_BAR_TEST as an example
2016-12-20 05:36:06 +00:00
// Parameters: label [, bool center [, bool invert [, char *value] ] ]
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define STATIC_ITEM(LABEL, ...) \
Rename vars, add comments for menu macros
2016-07-09 19:26:20 +00:00
if (_menuLineNr == _thisItemNr) { \
Fix skipping of static items
2016-07-15 02:01:57 +00:00
if (_skipStatic && encoderLine <= _thisItemNr) { \
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
encoderPosition += ENCODER_STEPS_PER_MENU_ITEM; \
Redraw after cursor correction in STATIC_ITEM
2016-07-08 21:02:59 +00:00
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; \
} \
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
if (lcdDrawUpdate) \
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
lcd_implementation_drawmenu_static(_lcdLineNr, PSTR(LABEL), ## __VA_ARGS__); \
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
} \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
++_thisItemNr
Rename vars, add comments for menu macros
2016-07-09 19:26:20 +00:00
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
#define END_SCREEN() \
Scroll static screens more simply
2016-07-08 22:08:56 +00:00
} \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
_countedItems = _thisItemNr
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
Scroll static screens more simply
2016-07-08 22:08:56 +00:00
#define END_MENU() \
} \
Improved SCREEN / MENU macros
2016-08-03 00:39:20 +00:00
_countedItems = _thisItemNr; \
Suppress some compiler warnings
2016-07-17 00:59:01 +00:00
UNUSED(_skipStatic)
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ENCODER_RATE_MULTIPLIER)
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
//#define ENCODER_RATE_MULTIPLIER_DEBUG // If defined, output the encoder steps per second value
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
/**
* MENU_MULTIPLIER_ITEM generates drawing and handling code for a multiplier menu item
*/
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define MENU_MULTIPLIER_ITEM(type, label, ...) do { \
_MENU_ITEM_PART_1(type, label, ## __VA_ARGS__); \
Reduce redundancy in MENU_ITEM code
2016-04-12 06:28:20 +00:00
encoderRateMultiplierEnabled = true; \
lastEncoderMovementMillis = 0; \
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
_MENU_ITEM_PART_2(type, ## __VA_ARGS__); \
Reduce redundancy in MENU_ITEM code
2016-04-12 06:28:20 +00:00
} while(0)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
#endif //ENCODER_RATE_MULTIPLIER
Rename vars, add comments for menu macros
2016-07-09 19:26:20 +00:00
#define MENU_ITEM_DUMMY() do { _thisItemNr++; } while(0)
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define MENU_ITEM_EDIT(type, label, ...) MENU_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__)
#define MENU_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ENCODER_RATE_MULTIPLIER)
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__)
#define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
#else //!ENCODER_RATE_MULTIPLIER
fixed warning: ISO C does not permit named variadic macros
2016-10-13 13:29:29 +00:00
#define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__)
#define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
#endif //!ENCODER_RATE_MULTIPLIER
/** Used variables to keep track of the menu */
Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented
2015-05-05 09:03:20 +00:00
volatile uint8_t buttons; //the last checked buttons in a bit array.
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(REPRAPWORLD_KEYPAD)
Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented
2015-05-05 09:03:20 +00:00
volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
#endif
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
volatile uint8_t slow_buttons; // Bits of the pressed buttons.
#endif
Scroll static screens more simply
2016-07-08 22:08:56 +00:00
int8_t encoderTopLine; /* scroll offset in the current menu */
Apply three more commits
2015-04-13 01:07:08 +00:00
millis_t next_button_update_ms;
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
uint8_t lastEncoderBits;
Revert MBL menus to "known" working point
2016-04-21 19:40:22 +00:00
uint32_t encoderPosition;
SDCARDDETECT -> SD_DETECT, added docs - `SD_DETECT_PIN` replaces `SDCARDDETECT` - `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED` - Revise the description of `SD_DETECT_INVERTED` - Add a note about the override of `SD_DETECT_INVERTED` in `Conditionals.h`
2015-07-31 23:40:50 +00:00
#if PIN_EXISTS(SD_DETECT)
Give lcd_sd_status an UNKNOWN state (PR#180)
2015-09-13 23:43:14 +00:00
uint8_t lcd_sd_status;
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
typedef struct {
menu => screen
2016-06-11 21:19:17 +00:00
screenFunc_t menu_function;
Have "back" menu items go to the previous item
2016-04-03 04:12:18 +00:00
uint32_t encoder_position;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
} menuPosition;
Have "back" menu items go to the previous item
2016-04-03 04:12:18 +00:00
menu => screen
2016-06-11 21:19:17 +00:00
screenFunc_t currentScreen = lcd_status_screen; // pointer to the currently active menu handler
Have "back" menu items go to the previous item
2016-04-03 04:12:18 +00:00
menu => screen
2016-06-11 21:19:17 +00:00
menuPosition screen_history[10];
uint8_t screen_history_depth = 0;
Only exit menu handler when the screen changes
2016-11-28 05:51:10 +00:00
bool screen_changed;
Give names to lcdDrawUpdate values
2016-04-02 23:09:56 +00:00
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
// LCD and menu clicks
Non-reentrant "Moving..." screen to safely wait in LCD
2016-12-13 05:56:05 +00:00
bool lcd_clicked, wait_for_unclick, defer_return_to_status, no_reentrance;
Give names to lcdDrawUpdate values
2016-04-02 23:09:56 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Variables used when editing values.
const char* editLabel;
void* editValue;
int32_t minEditValue, maxEditValue;
menu => screen
2016-06-11 21:19:17 +00:00
screenFunc_t callbackFunc; // call this after editing
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
* General function to go directly to a screen
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder = 0) {
Double Click of Encoder Wheel Jumps to Z-BabyStepping
2017-02-22 01:08:19 +00:00
#ifdef DOUBLE_CLICK_JUMPS_TO_Z_BABYSTEPPING
#if ENABLED(BABYSTEPPING)
if (currentScreen==lcd_status_screen && screen==lcd_main_menu) // We are in leaving the status screen to goto the main_menu
status_screen_click_time = millis(); // screen. Mark the time so we know how quick the user is
// pressing buttons.
if (currentScreen==lcd_main_menu) {
if ( screen==lcd_status_screen && status_screen_click_time+DOUBLE_CLICK_TIME_WINDOW>millis() ) {
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
status_screen_click_time = 0;
lcd_babystep_z();
return;
}
}
#endif
#endif
menu => screen
2016-06-11 21:19:17 +00:00
if (currentScreen != screen) {
currentScreen = screen;
Remove extraneous conditions for encoder position
2016-07-11 00:28:58 +00:00
encoderPosition = encoder;
menu => screen
2016-06-11 21:19:17 +00:00
if (screen == lcd_status_screen) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
defer_return_to_status = false;
menu => screen
2016-06-11 21:19:17 +00:00
screen_history_depth = 0;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Explicitly clear the screen in lcd_goto_screen
2016-08-06 23:29:39 +00:00
lcd_implementation_clear();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(LCD_PROGRESS_BAR)
// For LCD_PROGRESS_BAR re-initialize custom characters
menu => screen
2016-06-11 21:19:17 +00:00
lcd_set_custom_characters(screen == lcd_status_screen);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Explicitly clear the screen in lcd_goto_screen
2016-08-06 23:29:39 +00:00
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
Only exit menu handler when the screen changes
2016-11-28 05:51:10 +00:00
screen_changed = true;
Distribute GLCD screen updates in time Currently we draw and send the screens for a graphical LCD all at once. We draw in two or four parts but draw them directly behind each other. For the tested status screen this takes 59-62ms in a single block. During this time nothing else (except the interrupts) can be done. When printing a sequence of very short moves the buffer drains - sometimes until it's empty. This PR splits the screen update into parts. Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0) Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0) Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms. Previous experiments with a even better distribution of the time slots like (30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag. Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes, it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of framebuffer are saved in RAM. 13:45:59.213 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:00.213 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:01.215 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:02.215 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:03.214 : echo: #:17 >:13 s:30; #:17 >:13 s:30; S#:34 S>:26 S:60 13:46:04.214 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:05.212 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:06.212 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 03:30:36.779 : echo: #:8 >:7 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:8 >:7 s:15; S#:34 S>:27 S:61 03:30:37.778 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:9 >:7 s:16; #:8 >:6 s:14; S#:35 S>:26 S:61 03:30:38.778 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:7 s:15; S#:35 S>:26 S:61 03:30:39.777 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:8 >:8 s:16; #:8 >:6 s:14; S#:34 S>:27 S:61 03:30:40.780 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:35 S>:25 S:60 03:30:41.780 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:9 >:6 s:15; S#:36 S>:25 S:61 03:30:42.779 : echo: #:8 >:6 s:14; #:10 >:8 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:34 S>:26 S:60 03:30:43.778 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:7 s:15; #:9 >:6 s:15; S#:36 S>:26 S:62 #: draw a stripe >: transfer a stripe s: sum of of draw and transfer for one stripe S#: sum of draws for a complete screen S>: sum of transfers for a complete screen S: time to draw and transfer a complete screen
2016-11-24 20:17:25 +00:00
#if ENABLED(DOGLCD)
drawing_screen = false;
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
}
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset). Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read. Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks. Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk. Conflicts: Marlin/language.h
2013-03-19 14:05:11 +00:00
Non-reentrant "Moving..." screen to safely wait in LCD
2016-12-13 05:56:05 +00:00
/**
* Synchronize safely while holding the current screen
* This blocks all further screen or stripe updates once called
*/
inline void lcd_synchronize() {
lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_MOVING));
if (no_reentrance) return;
no_reentrance = true;
screenFunc_t old_screen = currentScreen;
lcd_goto_screen(lcd_synchronize);
stepper.synchronize();
no_reentrance = false;
lcd_goto_screen(old_screen);
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
lcd_save_previous_menu => lcd_save_previous_screen
2016-11-28 05:51:26 +00:00
void lcd_save_previous_screen() {
menu => screen
2016-06-11 21:19:17 +00:00
if (screen_history_depth < COUNT(screen_history)) {
screen_history[screen_history_depth].menu_function = currentScreen;
Remove extraneous conditions for encoder position
2016-07-11 00:28:58 +00:00
screen_history[screen_history_depth].encoder_position = encoderPosition;
menu => screen
2016-06-11 21:19:17 +00:00
++screen_history_depth;
Handle defer_return_to_status in lcd_goto_menu
2016-04-05 21:05:41 +00:00
}
Reduce ultralcd.cpp redundancies
2014-12-18 15:30:05 +00:00
}
Fix bugs in edit submenus so they return to origin Expected behavior: After editing a value the menu should return to the previous place with the edited item selected. Actual behavior: Either the top (back) item from the previous screen is selected, or the menu jumps up another level. Solution: Pass the correct arguments to `lcd_goto_menu` on click when editing a value.
2016-03-09 11:52:05 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_goto_previous_menu() {
menu => screen
2016-06-11 21:19:17 +00:00
if (screen_history_depth > 0) {
--screen_history_depth;
Remove extraneous conditions for encoder position
2016-07-11 00:28:58 +00:00
lcd_goto_screen(
screen_history[screen_history_depth].menu_function,
screen_history[screen_history_depth].encoder_position
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
);
}
else
lcd_return_to_status();
Have "back" menu items go to the previous item
2016-04-03 04:12:18 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif // ULTIPANEL
Fix bugs in edit submenus so they return to origin Expected behavior: After editing a value the menu should return to the previous place with the edited item selected. Actual behavior: Either the top (back) item from the previous screen is selected, or the menu jumps up another level. Solution: Pass the correct arguments to `lcd_goto_menu` on click when editing a value.
2016-03-09 11:52:05 +00:00
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
/**
*
* "Info Screen"
*
* This is very display-dependent, so the lcd implementation draws this.
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_status_screen() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(ULTIPANEL)
ENCODER_DIRECTION_NORMAL();
encoderRateMultiplierEnabled = false;
#endif
Fix up LCD_PROGRESS_BAR - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.
2015-03-31 01:00:54 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(LCD_PROGRESS_BAR)
Apply three more commits
2015-04-13 01:07:08 +00:00
millis_t ms = millis();
Apply remaining ENABLED/DISABLED conditionals
2015-08-03 19:30:37 +00:00
#if DISABLED(PROGRESS_MSG_ONCE)
Test time difference in safe way
2016-04-10 22:55:12 +00:00
if (ELAPSED(ms, progress_bar_ms + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME)) {
Use millis_t for progress_bar_ms and expire_status_ms
2015-04-25 05:16:09 +00:00
progress_bar_ms = ms;
LCD Progress Bar
2014-12-28 06:26:14 +00:00
}
#endif
#if PROGRESS_MSG_EXPIRE > 0
Fix up LCD_PROGRESS_BAR - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.
2015-03-31 01:00:54 +00:00
// Handle message expire
Rename expireStatusMillis to expire_status_ms
2015-04-25 04:51:10 +00:00
if (expire_status_ms > 0) {
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
#if ENABLED(SDSUPPORT)
if (card.isFileOpen()) {
Fix up LCD_PROGRESS_BAR - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.
2015-03-31 01:00:54 +00:00
// Expire the message when printing is active
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
if (IS_SD_PRINTING) {
Test time difference in safe way
2016-04-10 22:55:12 +00:00
if (ELAPSED(ms, expire_status_ms)) {
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
lcd_status_message[0] = '\0';
expire_status_ms = 0;
}
}
else {
expire_status_ms += LCD_UPDATE_INTERVAL;
LCD Progress Bar
2014-12-28 06:26:14 +00:00
}
}
else {
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
expire_status_ms = 0;
LCD Progress Bar
2014-12-28 06:26:14 +00:00
}
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
#else
Rename expireStatusMillis to expire_status_ms
2015-04-25 04:51:10 +00:00
expire_status_ms = 0;
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
#endif //SDSUPPORT
LCD Progress Bar
2014-12-28 06:26:14 +00:00
}
#endif
#endif //LCD_PROGRESS_BAR
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
lcd_implementation_status_screen();
DOGLCD and LCD_PROGRESS_BAR to coexist Small changes (and formatting to confuse the diff’er) which first allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a #warning (rather than error) that the extra progress bar / message options don’t apply to graphical displays at this time. This leaves open perhaps combining the progress bar and message area in some future (or forked custom) graphical LCD display arrangement (at which time the relevant variables may be moved into ultralcd.cpp with externs in ultralcd.h). I also added a conditional error that the progress bar and the filament display may not work well together.
2015-01-10 02:16:56 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
M0-M1 Enhancements Allow M0 and M1 to include a message string. Ignore clicks on “Wait for user” so that the Info Screen stays up.
2014-11-25 00:56:37 +00:00
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
if (lcd_clicked) {
Minor cleanup of lcd_goto_screen calls
2016-08-06 23:24:26 +00:00
#if ENABLED(FILAMENT_LCD_DISPLAY)
previous_lcd_status_ms = millis(); // get status message to show up for a while
#endif
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
Save bytes for custom chars (Hitachi LCD)
2016-08-06 23:05:41 +00:00
#if ENABLED(LCD_PROGRESS_BAR)
false
LCD Progress Bar
2014-12-28 06:26:14 +00:00
#endif
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
);
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
lcd_goto_screen(lcd_main_menu);
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Apply all changes from latest Marlin_V1 Diffed and merged, preserving my updates
2013-06-06 22:49:25 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL_FEEDMULTIPLY)
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
int new_frm = feedrate_percentage + (int32_t)encoderPosition;
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
// Dead zone at 100% feedrate
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
if ((feedrate_percentage < 100 && new_frm > 100) || (feedrate_percentage > 100 && new_frm < 100)) {
feedrate_percentage = 100;
Small cleanup of feedrate dead-zone
2016-04-05 21:06:52 +00:00
encoderPosition = 0;
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
}
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
else if (feedrate_percentage == 100) {
More bits when encoderPosition is cast as signed
2016-04-09 03:47:12 +00:00
if ((int32_t)encoderPosition > ENCODER_FEEDRATE_DEADZONE) {
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
feedrate_percentage += (int32_t)encoderPosition - (ENCODER_FEEDRATE_DEADZONE);
Additional cleanup of ultralcd.cpp
2015-04-11 11:56:08 +00:00
encoderPosition = 0;
}
More bits when encoderPosition is cast as signed
2016-04-09 03:47:12 +00:00
else if ((int32_t)encoderPosition < -(ENCODER_FEEDRATE_DEADZONE)) {
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
feedrate_percentage += (int32_t)encoderPosition + ENCODER_FEEDRATE_DEADZONE;
Additional cleanup of ultralcd.cpp
2015-04-11 11:56:08 +00:00
encoderPosition = 0;
}
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
}
Additional cleanup of ultralcd.cpp
2015-04-11 11:56:08 +00:00
else {
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
feedrate_percentage = new_frm;
Apply all changes from latest Marlin_V1 Diffed and merged, preserving my updates
2013-06-06 22:49:25 +00:00
encoderPosition = 0;
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
}
#endif // ULTIPANEL_FEEDMULTIPLY
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
feedrate_percentage = constrain(feedrate_percentage, 10, 999);
Apply all changes from latest Marlin_V1 Diffed and merged, preserving my updates
2013-06-06 22:49:25 +00:00
Fix doubled lcd_quick_feedback - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.
2015-04-11 11:45:04 +00:00
#endif //ULTIPANEL
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Add a kill-screen
2016-07-10 02:50:45 +00:00
/**
*
* draw the kill screen
*
*/
void kill_screen(const char* lcd_msg) {
lcd_init();
lcd_setalertstatuspgm(lcd_msg);
#if ENABLED(DOGLCD)
u8g.firstPage();
do {
lcd_kill_screen();
} while (u8g.nextPage());
#else
lcd_kill_screen();
#endif
}
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
LCD Progress Bar
2014-12-28 06:26:14 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
inline void line_to_current(AxisEnum axis) {
Improve planner kinematics, fix delta ABL
2016-10-06 08:56:05 +00:00
planner.buffer_line_kinematic(current_position, MMM_TO_MMS(manual_feedrate_mm_m[axis]), active_extruder);
Closes #3826: SD printing will now pause and stop the print counter The LCD menu items for SD printing pause/stop have been updated to control also the print job timer. This commit also fixes a small output bug with M78, the failed print counter was displaying the wrong value.
2016-05-29 23:56:39 +00:00
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(SDSUPPORT)
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_sdcard_pause() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
card.pauseSDPrint();
print_job_timer.pause();
}
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_sdcard_resume() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
card.startFileprint();
print_job_timer.start();
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_sdcard_stop() {
Add an SD Card stop function, use in ultralcd
2016-06-18 01:27:14 +00:00
card.stopSDPrint();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
clear_command_queue();
Add quickstop_stepper to update current position with stepper.quick_stop()
2016-07-06 19:00:28 +00:00
quickstop_stepper();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
print_job_timer.stop();
Sort out some header dependencies
2016-10-10 20:34:35 +00:00
#if ENABLED(AUTOTEMP)
thermalManager.autotempShutdown();
#endif
Change cancel_heatup to wait_for_heatup
2016-07-06 16:17:50 +00:00
wait_for_heatup = false;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
lcd_setstatus(MSG_PRINT_ABORTED, true);
}
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //SDSUPPORT
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Allow case light pin to be active low
2016-12-02 05:31:03 +00:00
#if ENABLED(MENU_ITEM_CASE_LIGHT)
Fix and optimize case-light code
2016-11-28 05:51:51 +00:00
extern bool case_light_on;
extern void update_case_light();
void toggle_case_light() {
case_light_on = !case_light_on;
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
update_case_light();
}
#endif // MENU_ITEM_CASE_LIGHT
Add Debug Menu with LCD_PROGRESS_BAR_TEST as an example
2016-12-20 05:36:06 +00:00
#if ENABLED(LCD_PROGRESS_BAR_TEST)
static void progress_bar_test() {
static int8_t bar_percent = 0;
if (lcd_clicked) {
lcd_goto_previous_menu();
lcd_set_custom_characters(false);
return;
}
bar_percent += (int8_t)encoderPosition;
bar_percent = constrain(bar_percent, 0, 100);
encoderPosition = 0;
lcd_implementation_drawmenu_static(0, PSTR(MSG_PROGRESS_BAR_TEST), true, true);
lcd.setCursor((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2);
lcd.print(itostr3(bar_percent)); lcd.print('%');
lcd.setCursor(0, LCD_HEIGHT - 1); lcd_draw_progress_bar(bar_percent);
}
void _progress_bar_test() {
lcd_goto_screen(progress_bar_test);
lcd_set_custom_characters();
}
#endif // LCD_PROGRESS_BAR_TEST
#if HAS_DEBUG_MENU
void lcd_debug_menu() {
START_MENU();
MENU_BACK(MSG_MAIN); // ^ Main
#if ENABLED(LCD_PROGRESS_BAR_TEST)
MENU_ITEM(submenu, MSG_PROGRESS_BAR_TEST, _progress_bar_test);
#endif
END_MENU();
}
#endif // HAS_DEBUG_MENU
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Main" menu
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_main_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_WATCH);
Add handling of BLTouch error state
2016-09-18 23:02:53 +00:00
Add Debug Menu with LCD_PROGRESS_BAR_TEST as an example
2016-12-20 05:36:06 +00:00
//
// Debug Menu when certain options are enabled
//
#if HAS_DEBUG_MENU
MENU_ITEM(submenu, MSG_DEBUG_MENU, lcd_debug_menu);
#endif
Added Menu entry for Case light
2016-11-19 10:17:39 +00:00
//
// Switch case light on/off
//
Allow case light pin to be active low
2016-12-02 05:31:03 +00:00
#if ENABLED(MENU_ITEM_CASE_LIGHT)
Fix and optimize case-light code
2016-11-28 05:51:51 +00:00
if (case_light_on)
MENU_ITEM(function, MSG_LIGHTS_OFF, toggle_case_light);
Added Menu entry for Case light
2016-11-19 10:17:39 +00:00
else
Fix and optimize case-light code
2016-11-28 05:51:51 +00:00
MENU_ITEM(function, MSG_LIGHTS_ON, toggle_case_light);
Added Menu entry for Case light
2016-11-19 10:17:39 +00:00
#endif
Add handling of BLTouch error state
2016-09-18 23:02:53 +00:00
#if ENABLED(BLTOUCH)
Fix and extend BLTouch support
2016-09-20 18:56:23 +00:00
if (!endstops.z_probe_enabled && TEST_BLTOUCH())
MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
Add handling of BLTouch error state
2016-09-18 23:02:53 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
if (planner.movesplanned() || IS_SD_PRINTING) {
MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu);
}
else {
MENU_ITEM(submenu, MSG_PREPARE, lcd_prepare_menu);
#if ENABLED(DELTA_CALIBRATION_MENU)
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE, lcd_delta_calibrate_menu);
#endif
}
MENU_ITEM(submenu, MSG_CONTROL, lcd_control_menu);
#if ENABLED(SDSUPPORT)
if (card.cardOK) {
if (card.isFileOpen()) {
if (card.sdprinting)
MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_sdcard_pause);
else
MENU_ITEM(function, MSG_RESUME_PRINT, lcd_sdcard_resume);
MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop);
}
else {
MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu);
#if !PIN_EXISTS(SD_DETECT)
MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user
#endif
}
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
else {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
SDCARDDETECT -> SD_DETECT, added docs - `SD_DETECT_PIN` replaces `SDCARDDETECT` - `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED` - Revise the description of `SD_DETECT_INVERTED` - Add a note about the override of `SD_DETECT_INVERTED` in `Conditionals.h`
2015-07-31 23:40:50 +00:00
#if !PIN_EXISTS(SD_DETECT)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
#endif
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //SDSUPPORT
Show steps done in the babystep display
2016-04-19 03:39:15 +00:00
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if ENABLED(LCD_INFO_MENU)
MENU_ITEM(submenu, MSG_INFO_MENU, lcd_info_menu);
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
Reduce ultralcd.cpp redundancies
2014-12-18 15:30:05 +00:00
}
Implement BABYSTEPPING for COREXY and COREXZ
2016-03-11 05:35:44 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Tune" submenu items
*
*/
Add the socalled "Babystepping" feature. It is a realtime control over the head position via the LCD menu system that works _while_ printing. Using it, one can e.g. tune the z-position in realtime, while printing the first layer. Also, lost steps can be manually added/removed, but thats not the prime feature. Stuff is placed into the Tune->Babystep * It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then. Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name. say goodby to fuddling around with the z-axis.
2013-10-06 19:14:51 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Set the home offset based on the current_position
*/
void lcd_set_home_offsets() {
// M428 Command
enqueue_and_echo_commands_P(PSTR("M428"));
lcd_return_to_status();
}
Revert nozzle_bed_fan_menu_items For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly.
2015-12-04 00:31:22 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(BABYSTEPPING)
Introduce temp watch protection for the bed When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function. Conflicts: Marlin/Configuration_adv.h
2016-04-15 16:27:18 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_babystep(const AxisEnum axis, const char* msg) {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { defer_return_to_status = false; return lcd_goto_previous_menu(); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
ENCODER_DIRECTION_NORMAL();
if (encoderPosition) {
Minor babystep cleanup patches
2016-11-03 23:23:31 +00:00
int babystep_increment = (int32_t)encoderPosition * (BABYSTEP_MULTIPLICATOR);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
encoderPosition = 0;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
Show babysteps on the LCD in mm, not steps
2016-06-13 09:28:16 +00:00
thermalManager.babystep_axis(axis, babystep_increment);
babysteps_done += babystep_increment;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Show babysteps on the LCD in mm, not steps
2016-06-13 09:28:16 +00:00
if (lcdDrawUpdate)
lcd_implementation_drawedit(msg, ftostr43sign(
Replace division in planner with multiplication
2016-07-24 02:36:26 +00:00
((1000 * babysteps_done) * planner.steps_to_mm[axis]) * 0.001f
Show babysteps on the LCD in mm, not steps
2016-06-13 09:28:16 +00:00
));
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Revert nozzle_bed_fan_menu_items For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly.
2015-12-04 00:31:22 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(BABYSTEP_XY)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEPPING_X)); }
void _lcd_babystep_y() { _lcd_babystep(Y_AXIS, PSTR(MSG_BABYSTEPPING_Y)); }
void lcd_babystep_x() { lcd_goto_screen(_lcd_babystep_x); babysteps_done = 0; defer_return_to_status = true; }
void lcd_babystep_y() { lcd_goto_screen(_lcd_babystep_y); babysteps_done = 0; defer_return_to_status = true; }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, PSTR(MSG_BABYSTEPPING_Z)); }
void lcd_babystep_z() { lcd_goto_screen(_lcd_babystep_z); babysteps_done = 0; defer_return_to_status = true; }
Revert nozzle_bed_fan_menu_items For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly.
2015-12-04 00:31:22 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //BABYSTEPPING
Add "G29 S4" to fine tune Z level for Mesh Bed Leveling. Also add mbl.z_offset to the EEPROM, bumping the version to V23.
2016-03-24 21:16:09 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Watch temperature callbacks
*/
#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
Show nozzles, heaters, and extruders numbered 1-4
2015-09-12 02:52:01 +00:00
#if TEMP_SENSOR_0 != 0
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
void watch_temp_callback_E0() { thermalManager.start_watching_heater(0); }
Show nozzles, heaters, and extruders numbered 1-4
2015-09-12 02:52:01 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 1 && TEMP_SENSOR_1 != 0
void watch_temp_callback_E1() { thermalManager.start_watching_heater(1); }
#endif // HOTENDS > 1
#if HOTENDS > 2 && TEMP_SENSOR_2 != 0
void watch_temp_callback_E2() { thermalManager.start_watching_heater(2); }
#endif // HOTENDS > 2
#if HOTENDS > 3 && TEMP_SENSOR_3 != 0
void watch_temp_callback_E3() { thermalManager.start_watching_heater(3); }
#endif // HOTENDS > 3
#else
Show nozzles, heaters, and extruders numbered 1-4
2015-09-12 02:52:01 +00:00
#if TEMP_SENSOR_0 != 0
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
void watch_temp_callback_E0() {}
Show nozzles, heaters, and extruders numbered 1-4
2015-09-12 02:52:01 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 1 && TEMP_SENSOR_1 != 0
void watch_temp_callback_E1() {}
#endif // HOTENDS > 1
#if HOTENDS > 2 && TEMP_SENSOR_2 != 0
void watch_temp_callback_E2() {}
SINGLENOZZLE: EXTRUDERS versus HOTENDS
2016-05-27 00:43:20 +00:00
#endif // HOTENDS > 2
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3 && TEMP_SENSOR_3 != 0
void watch_temp_callback_E3() {}
#endif // HOTENDS > 3
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
#endif
Constrain Tune > Nozzle/Flow menu items
2015-09-07 00:14:02 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(THERMAL_PROTECTION_BED) && WATCH_BED_TEMP_PERIOD > 0
#if TEMP_SENSOR_BED != 0
void watch_temp_callback_bed() { thermalManager.start_watching_bed(); }
Support for multiple PWM fans
2016-03-06 02:27:45 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#else
#if TEMP_SENSOR_BED != 0
void watch_temp_callback_bed() {}
Support for multiple PWM fans
2016-03-06 02:27:45 +00:00
#endif
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
#endif
Constrain Tune > Nozzle/Flow menu items
2015-09-07 00:14:02 +00:00
Give instant feedback for filament change
2016-11-07 09:16:05 +00:00
#if ENABLED(FILAMENT_CHANGE_FEATURE)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_enqueue_filament_change() {
Allow M600 when dryrun debugging
2016-12-22 01:30:51 +00:00
if (!DEBUGGING(DRYRUN) && thermalManager.tooColdToExtrude(active_extruder)) {
m600 fixes
2016-12-20 07:47:46 +00:00
lcd_save_previous_screen();
lcd_goto_screen(lcd_filament_change_toocold_menu);
return;
}
Give instant feedback for filament change
2016-11-07 09:16:05 +00:00
lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT);
enqueue_and_echo_commands_P(PSTR("M600"));
}
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Tune" submenu
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_tune_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// ^ Main
//
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_MAIN);
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Speed:
//
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999);
Extended Preheat options Preheat LCD menus base on code by D-Base
2014-03-17 17:37:46 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Manual bed leveling, Bed Z:
#if ENABLED(MANUAL_BED_LEVELING)
MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
Show minimal preheat options in menus (PR#2471)
2015-07-19 19:07:12 +00:00
#endif
Add 4th extruder
2015-01-23 22:13:06 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Nozzle:
// Nozzle [1-4]:
//
#if HOTENDS == 1
#if TEMP_SENSOR_0 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
#endif
#else //HOTENDS > 1
#if TEMP_SENSOR_0 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
#endif
#if TEMP_SENSOR_1 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &thermalManager.target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1);
Temperature singleton class
2016-04-29 01:18:13 +00:00
#endif
SINGLENOZZLE: EXTRUDERS versus HOTENDS
2016-05-27 00:43:20 +00:00
#if HOTENDS > 2
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_2 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N3, &thermalManager.target_temperature[2], 0, HEATER_2_MAXTEMP - 15, watch_temp_callback_E2);
#endif
SINGLENOZZLE: EXTRUDERS versus HOTENDS
2016-05-27 00:43:20 +00:00
#if HOTENDS > 3
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_3 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N4, &thermalManager.target_temperature[3], 0, HEATER_3_MAXTEMP - 15, watch_temp_callback_E3);
#endif
#endif // HOTENDS > 3
#endif // HOTENDS > 2
#endif // HOTENDS > 1
//
// Bed:
//
#if TEMP_SENSOR_BED != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_BED, &thermalManager.target_temperature_bed, 0, BED_MAXTEMP - 15, watch_temp_callback_bed);
#endif
//
// Fan Speed:
//
#if FAN_COUNT > 0
#if HAS_FAN0
#if FAN_COUNT > 1
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED " 1"
#else
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED
Temperature singleton class
2016-04-29 01:18:13 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255);
#endif
#if HAS_FAN1
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
Temperature singleton class
2016-04-29 01:18:13 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HAS_FAN2
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
#endif
#endif // FAN_COUNT > 0
//
// Flow:
// Flow 1:
// Flow 2:
// Flow 3:
// Flow 4:
//
#if EXTRUDERS == 1
extruder_multiplier => flow_percentage
2016-08-19 03:13:47 +00:00
MENU_ITEM_EDIT(int3, MSG_FLOW, &flow_percentage[0], 10, 999);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#else // EXTRUDERS > 1
extruder_multiplier => flow_percentage
2016-08-19 03:13:47 +00:00
MENU_ITEM_EDIT(int3, MSG_FLOW, &flow_percentage[active_extruder], 10, 999);
MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &flow_percentage[0], 10, 999);
MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &flow_percentage[1], 10, 999);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if EXTRUDERS > 2
extruder_multiplier => flow_percentage
2016-08-19 03:13:47 +00:00
MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &flow_percentage[2], 10, 999);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if EXTRUDERS > 3
extruder_multiplier => flow_percentage
2016-08-19 03:13:47 +00:00
MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N4, &flow_percentage[3], 10, 999);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //EXTRUDERS > 3
#endif //EXTRUDERS > 2
#endif //EXTRUDERS > 1
//
// Babystep X:
// Babystep Y:
// Babystep Z:
//
#if ENABLED(BABYSTEPPING)
#if ENABLED(BABYSTEP_XY)
MENU_ITEM(submenu, MSG_BABYSTEP_X, lcd_babystep_x);
MENU_ITEM(submenu, MSG_BABYSTEP_Y, lcd_babystep_y);
#endif //BABYSTEP_XY
MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123 Trying to preheat a non-existent extruder causes a crash.
2016-04-14 06:40:21 +00:00
#endif
Extended Preheat options Preheat LCD menus base on code by D-Base
2014-03-17 17:37:46 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Change filament
//
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
#if ENABLED(FILAMENT_CHANGE_FEATURE)
Spacing, coding standards
2017-02-10 06:13:58 +00:00
if (!thermalManager.tooColdToExtrude(active_extruder))
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
END_MENU();
}
Fix compiler warnings - Patched up for most included configurations
2015-03-28 03:29:05 +00:00
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
/**
*
* "Driver current control" submenu items
*
*/
#if ENABLED(DAC_STEPPER_CURRENT)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void dac_driver_getValues() { LOOP_XYZE(i) driverPercent[i] = dac_current_get_percent((AxisEnum)i); }
Cleanup of code style
2016-10-07 20:57:24 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void dac_driver_commit() { dac_current_set_percents(driverPercent); }
Cleanup of code style
2016-10-07 20:57:24 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void dac_driver_eeprom_write() { dac_commit_eeprom(); }
Cleanup of code style
2016-10-07 20:57:24 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_dac_menu() {
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
dac_driver_getValues();
Added Menu entry for Case light
2016-11-19 10:17:39 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_CONTROL);
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
MENU_ITEM_EDIT_CALLBACK(int3, MSG_X " " MSG_DAC_PERCENT, &driverPercent[X_AXIS], 0, 100, dac_driver_commit);
MENU_ITEM_EDIT_CALLBACK(int3, MSG_Y " " MSG_DAC_PERCENT, &driverPercent[Y_AXIS], 0, 100, dac_driver_commit);
MENU_ITEM_EDIT_CALLBACK(int3, MSG_Z " " MSG_DAC_PERCENT, &driverPercent[Z_AXIS], 0, 100, dac_driver_commit);
MENU_ITEM_EDIT_CALLBACK(int3, MSG_E " " MSG_DAC_PERCENT, &driverPercent[E_AXIS], 0, 100, dac_driver_commit);
MENU_ITEM(function, MSG_DAC_EEPROM_WRITE, dac_driver_eeprom_write);
END_MENU();
}
#endif
Don't set heater temperature above its maximum
2016-11-28 06:57:36 +00:00
constexpr int heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Prepare" submenu items
*
*/
void _lcd_preheat(int endnum, const float temph, const float tempb, const int fan) {
Don't set heater temperature above its maximum
2016-11-28 06:57:36 +00:00
if (temph > 0) thermalManager.setTargetHotend(min(heater_maxtemp[endnum], temph), endnum);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_BED != 0
thermalManager.setTargetBed(tempb);
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
#else
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
UNUSED(tempb);
Show minimal preheat options in menus (PR#2471)
2015-07-19 19:07:12 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if FAN_COUNT > 0
#if FAN_COUNT > 1
fanSpeeds[active_extruder < FAN_COUNT ? active_extruder : 0] = fan;
#else
fanSpeeds[0] = fan;
#endif
#else
UNUSED(fan);
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
lcd_return_to_status();
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_0 != 0
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material1_hotend0() { _lcd_preheat(0, lcd_preheat_hotend_temp[0], lcd_preheat_bed_temp[0], lcd_preheat_fan_speed[0]); }
void lcd_preheat_material2_hotend0() { _lcd_preheat(0, lcd_preheat_hotend_temp[1], lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
Support for multiple PWM fans
2016-03-06 02:27:45 +00:00
#endif
Extended Preheat options Preheat LCD menus base on code by D-Base
2014-03-17 17:37:46 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 1
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material1_hotend1() { _lcd_preheat(1, lcd_preheat_hotend_temp[0], lcd_preheat_bed_temp[0], lcd_preheat_fan_speed[0]); }
void lcd_preheat_material2_hotend1() { _lcd_preheat(1, lcd_preheat_hotend_temp[1], lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 2
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material1_hotend2() { _lcd_preheat(2, lcd_preheat_hotend_temp[0], lcd_preheat_bed_temp[0], lcd_preheat_fan_speed[0]); }
void lcd_preheat_material2_hotend2() { _lcd_preheat(2, lcd_preheat_hotend_temp[1], lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material1_hotend3() { _lcd_preheat(3, lcd_preheat_hotend_temp[0], lcd_preheat_bed_temp[0], lcd_preheat_fan_speed[0]); }
void lcd_preheat_material2_hotend3() { _lcd_preheat(3, lcd_preheat_hotend_temp[1], lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#endif
Move lcd_autostart_sd to its logical place
2016-04-03 05:45:14 +00:00
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material1_hotend0123() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 1
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
thermalManager.setTargetHotend(lcd_preheat_hotend_temp[0], 1);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 2
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
thermalManager.setTargetHotend(lcd_preheat_hotend_temp[0], 2);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
thermalManager.setTargetHotend(lcd_preheat_hotend_temp[0], 3);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#endif
#endif
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
lcd_preheat_material1_hotend0();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material2_hotend0123() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 1
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
thermalManager.setTargetHotend(lcd_preheat_hotend_temp[1], 1);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 2
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
thermalManager.setTargetHotend(lcd_preheat_hotend_temp[1], 2);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
thermalManager.setTargetHotend(lcd_preheat_hotend_temp[1], 3);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#endif
#endif
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
lcd_preheat_material2_hotend0();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Move lcd_autostart_sd to its logical place
2016-04-03 05:45:14 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif // HOTENDS > 1
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_BED != 0
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material1_bedonly() { _lcd_preheat(0, 0, lcd_preheat_bed_temp[0], lcd_preheat_fan_speed[0]); }
void lcd_preheat_material2_bedonly() { _lcd_preheat(0, 0, lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material1_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_PREPARE);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS == 1
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#else
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_material1_hotend0);
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_material1_hotend1);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 2
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_material1_hotend2);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_material1_hotend3);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#endif
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_1_ALL, lcd_preheat_material1_hotend0123);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#if TEMP_SENSOR_BED != 0
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_1_BEDONLY, lcd_preheat_material1_bedonly);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
END_MENU();
}
Simplify MBL movement, zigzag
2016-04-13 09:37:41 +00:00
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_preheat_material2_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_PREPARE);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS == 1
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#else
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_material2_hotend0);
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_material2_hotend1);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 2
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_material2_hotend2);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_material2_hotend3);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#endif
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_2_ALL, lcd_preheat_material2_hotend0123);
Fix MBL lift
2016-04-16 21:17:06 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_BED != 0
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_2_BEDONLY, lcd_preheat_material2_bedonly);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
END_MENU();
}
#endif // TEMP_SENSOR_0 && (TEMP_SENSOR_1 || TEMP_SENSOR_2 || TEMP_SENSOR_3 || TEMP_SENSOR_BED)
void lcd_cooldown() {
#if FAN_COUNT > 0
for (uint8_t i = 0; i < FAN_COUNT; i++) fanSpeeds[i] = 0;
Simplify MBL movement, zigzag
2016-04-13 09:37:41 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
thermalManager.disable_all_heaters();
lcd_return_to_status();
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(SDSUPPORT) && ENABLED(MENU_ADDAUTOSTART)
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_autostart_sd() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
card.autostart_index = 0;
card.setroot();
card.checkautostart(true);
}
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(MANUAL_BED_LEVELING)
/**
*
* "Prepare" > "Bed Leveling" handlers
*
*/
static uint8_t _lcd_level_bed_position;
// Utility to go to the next mesh point
Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT
2016-08-04 03:51:05 +00:00
// A raise is added between points if Z_HOMING_HEIGHT is in use
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z
// Z position will be restored with the final action, a G28
inline void _mbl_goto_xy(float x, float y) {
Non-reentrant "Moving..." screen to safely wait in LCD
2016-12-13 05:56:05 +00:00
if (no_reentrance) return;
MBL coordinates are logical
2016-10-22 10:55:44 +00:00
current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT);
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
line_to_current(Z_AXIS);
MBL coordinates are logical
2016-10-22 10:55:44 +00:00
current_position[X_AXIS] = LOGICAL_X_POSITION(x);
current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
Fix z feedrate value when doing mesh bed leveling. probe feedrate uses XY_PROBE_SPEED
2016-11-20 00:34:41 +00:00
planner.buffer_line_kinematic(current_position, MMM_TO_MMS(XY_PROBE_SPEED), active_extruder);
Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT
2016-08-04 03:51:05 +00:00
#if Z_HOMING_HEIGHT > 0
MBL coordinates are logical
2016-10-22 10:55:44 +00:00
current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
line_to_current(Z_AXIS);
#endif
Non-reentrant "Moving..." screen to safely wait in LCD
2016-12-13 05:56:05 +00:00
lcd_synchronize();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_goto_next_point();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_bed_done() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_DONE));
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Step 7: Get the Z coordinate, then goto next point or exit
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_bed_get_z() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
ENCODER_DIRECTION_NORMAL();
Non-reentrant "Moving..." screen to safely wait in LCD
2016-12-13 05:56:05 +00:00
if (no_reentrance) goto KeepDrawing;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Encoder wheel adjusts the Z position
if (encoderPosition) {
refresh_cmd_timeout();
current_position[Z_AXIS] += float((int32_t)encoderPosition) * (MBL_Z_STEP);
NOLESS(current_position[Z_AXIS], 0);
NOMORE(current_position[Z_AXIS], MESH_HOME_SEARCH_Z * 2);
line_to_current(Z_AXIS);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
encoderPosition = 0;
}
static bool debounce_click = false;
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
if (lcd_clicked) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
if (!debounce_click) {
debounce_click = true; // ignore multiple "clicks" in a row
mbl.set_zigzag_z(_lcd_level_bed_position++, current_position[Z_AXIS]);
if (_lcd_level_bed_position == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) {
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
lcd_goto_screen(_lcd_level_bed_done);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT
2016-08-04 03:51:05 +00:00
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
line_to_current(Z_AXIS);
Non-reentrant "Moving..." screen to safely wait in LCD
2016-12-13 05:56:05 +00:00
lcd_synchronize();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
mbl.set_has_mesh(true);
enqueue_and_echo_commands_P(PSTR("G28"));
lcd_return_to_status();
//LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE);
#if HAS_BUZZER
Buzzer requires BEEPER_PIN
2016-08-02 04:10:53 +00:00
lcd_buzz(200, 659);
lcd_buzz(200, 698);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
}
else {
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
lcd_goto_screen(_lcd_level_goto_next_point);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
}
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
else {
debounce_click = false;
}
Non-reentrant "Moving..." screen to safely wait in LCD
2016-12-13 05:56:05 +00:00
KeepDrawing:
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Update on first display, then only on updates to Z position
// Show message above on clicks instead
if (lcdDrawUpdate) {
float v = current_position[Z_AXIS] - MESH_HOME_SEARCH_Z;
lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43sign(v + (v < 0 ? -0.0001 : 0.0001), '+'));
}
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Step 6: Display "Next point: 1 / 9" while waiting for move to finish
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_bed_moving() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
if (lcdDrawUpdate) {
char msg[10];
sprintf_P(msg, PSTR("%i / %u"), (int)(_lcd_level_bed_position + 1), (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS));
lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_NEXT_POINT), msg);
}
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
}
Revert MBL menus to "known" working point
2016-04-21 19:40:22 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Step 5: Initiate a move to the next point
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_goto_next_point() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Set the menu to display ahead of blocking call
menu => screen
2016-06-11 21:19:17 +00:00
lcd_goto_screen(_lcd_level_bed_moving);
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// _mbl_goto_xy runs the menu loop until the move is done
int8_t px, py;
mbl.zigzag(_lcd_level_bed_position, px, py);
_mbl_goto_xy(mbl.get_probe_x(px), mbl.get_probe_y(py));
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// After the blocking function returns, change menus
menu => screen
2016-06-11 21:19:17 +00:00
lcd_goto_screen(_lcd_level_bed_get_z);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Step 4: Display "Click to Begin", wait for click
* Move to the first probe position
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_bed_homing_done() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_WAITING));
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
if (lcd_clicked) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
_lcd_level_bed_position = 0;
MBL: Add support for max z endstop See https://github.com/MarlinFirmware/Marlin/issues/4088
2016-06-25 19:58:02 +00:00
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if Z_HOME_DIR > 0
+ Z_MAX_POS
#endif
;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
planner.set_position_mm(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
lcd_goto_screen(_lcd_level_goto_next_point);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
}
Further patches to MBL - break up into more handlers
2016-04-20 22:55:36 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Step 3: Display "Homing XYZ" - Wait for homing to finish
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_bed_homing() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
Fix for broken MBL LCD call was waiting forever, causing the system to hang.
2016-12-30 18:09:24 +00:00
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
lcd_goto_screen(_lcd_level_bed_homing_done);
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Step 2: Continue Bed Leveling...
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_level_bed_continue() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
defer_return_to_status = true;
axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
mbl.reset();
enqueue_and_echo_commands_P(PSTR("G28"));
menu => screen
2016-06-11 21:19:17 +00:00
lcd_goto_screen(_lcd_level_bed_homing);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Step 1: MBL entry-point: "Cancel" or "Level Bed"
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_level_bed() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_LEVEL_BED_CANCEL);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
END_MENU();
}
#endif // MANUAL_BED_LEVELING
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
/**
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
*
* "Prepare" submenu
*
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
*/
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_prepare_menu() {
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
START_MENU();
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// ^ Main
//
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_MAIN);
Move MBL code to its logical place
2016-04-03 05:46:15 +00:00
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
//
// Move Axis
//
#if ENABLED(DELTA)
if (axis_homed[Z_AXIS])
#endif
MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Auto Home
//
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
#if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
MENU_ITEM(gcode, MSG_AUTO_HOME_X, PSTR("G28 X"));
MENU_ITEM(gcode, MSG_AUTO_HOME_Y, PSTR("G28 Y"));
MENU_ITEM(gcode, MSG_AUTO_HOME_Z, PSTR("G28 Z"));
#endif
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Level Bed
//
Enable ABL by type, support bilinear on cartesian
2016-09-26 04:17:39 +00:00
#if HAS_ABL
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM(gcode, MSG_LEVEL_BED,
axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29")
);
#elif ENABLED(MANUAL_BED_LEVELING)
MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed);
#endif
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Place "Level Bed" closer to "Auto Home"
2016-12-20 08:51:03 +00:00
//
// Set Home Offsets
//
MENU_ITEM(function, MSG_SET_HOME_OFFSETS, lcd_set_home_offsets);
//MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0"));
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Disable Steppers
//
MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Preheat PLA
// Preheat ABS
//
#if TEMP_SENSOR_0 != 0
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_material1_menu);
MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_material2_menu);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#else
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_material1_hotend0);
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_material2_hotend0);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
m600 fixes
2016-12-20 07:47:46 +00:00
//
// Change filament
//
#if ENABLED(FILAMENT_CHANGE_FEATURE)
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
if (!thermalManager.tooColdToExtrude(active_extruder))
MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
m600 fixes
2016-12-20 07:47:46 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#endif // TEMP_SENSOR_0 != 0
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Cooldown
//
No "Cooldown" menu if heaters are off
2016-12-20 06:42:48 +00:00
bool has_heat = false;
Make HOTEND_LOOP more consistent, let compiler optimize it
2017-02-12 08:50:05 +00:00
HOTEND_LOOP() if (thermalManager.target_temperature[HOTEND_INDEX]) { has_heat = true; break; }
No "Cooldown" menu if heaters are off
2016-12-20 06:42:48 +00:00
#if HAS_TEMP_BED
if (thermalManager.target_temperature_bed) has_heat = true;
#endif
if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
Fix and extend BLTouch support
2016-09-20 18:56:23 +00:00
//
// BLTouch Self-Test and Reset
//
#if ENABLED(BLTOUCH)
Fix BLTOUCH string and SERVO_DELAY
2016-09-21 06:33:30 +00:00
MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
Fix and extend BLTouch support
2016-09-20 18:56:23 +00:00
if (!endstops.z_probe_enabled && TEST_BLTOUCH())
MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Switch power on/off
//
#if HAS_POWER_SWITCH
if (powersupply)
MENU_ITEM(gcode, MSG_SWITCH_PS_OFF, PSTR("M81"));
else
MENU_ITEM(gcode, MSG_SWITCH_PS_ON, PSTR("M80"));
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
#endif
Allow POWER_SUPPLY 0 for no power switch
2015-03-30 23:39:47 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Autostart
//
#if ENABLED(SDSUPPORT) && ENABLED(MENU_ADDAUTOSTART)
MENU_ITEM(function, MSG_AUTOSTART, lcd_autostart_sd);
#endif
Allow POWER_SUPPLY 0 for no power switch
2015-03-30 23:39:47 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
}
Allow POWER_SUPPLY 0 for no power switch
2015-03-30 23:39:47 +00:00
Patch up Delta Calibration Menu
2016-12-13 06:03:54 +00:00
float move_menu_scale;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(DELTA_CALIBRATION_MENU)
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Patch up Delta Calibration Menu
2016-12-13 06:03:54 +00:00
void lcd_move_z();
void lcd_delta_calibrate_menu();
void _lcd_calibrate_homing() {
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_LEVEL_BED_HOMING));
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
Patch up Delta Calibration Menu
2016-12-13 06:03:54 +00:00
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
lcd_goto_previous_menu();
}
void _lcd_delta_calibrate_home() {
enqueue_and_echo_commands_P(PSTR("G28"));
lcd_goto_screen(_lcd_calibrate_homing);
}
// Move directly to the tower position with uninterpolated moves
// If we used interpolated moves it would cause this to become re-entrant
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _goto_tower_pos(const float &a) {
Patch up Delta Calibration Menu
2016-12-13 06:03:54 +00:00
if (no_reentrance) return;
current_position[Z_AXIS] = max(Z_HOMING_HEIGHT, Z_CLEARANCE_BETWEEN_PROBES) + (DELTA_PRINTABLE_RADIUS) / 5;
line_to_current(Z_AXIS);
current_position[X_AXIS] = a < 0 ? X_HOME_POS : sin(a) * -(DELTA_PRINTABLE_RADIUS);
current_position[Y_AXIS] = a < 0 ? Y_HOME_POS : cos(a) * (DELTA_PRINTABLE_RADIUS);
line_to_current(Z_AXIS);
current_position[Z_AXIS] = 4.0;
line_to_current(Z_AXIS);
lcd_synchronize();
move_menu_scale = 0.1;
lcd_goto_screen(lcd_move_z);
Make DELTA_CALIBRATION_MENU more universal
2016-08-09 02:35:26 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _goto_tower_x() { _goto_tower_pos(RADIANS(120)); }
void _goto_tower_y() { _goto_tower_pos(RADIANS(240)); }
void _goto_tower_z() { _goto_tower_pos(0); }
void _goto_center() { _goto_tower_pos(-1); }
Make DELTA_CALIBRATION_MENU more universal
2016-08-09 02:35:26 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_delta_calibrate_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_MAIN);
Patch up Delta Calibration Menu
2016-12-13 06:03:54 +00:00
MENU_ITEM(submenu, MSG_AUTO_HOME, _lcd_delta_calibrate_home);
if (axis_homed[Z_AXIS]) {
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_X, _goto_tower_x);
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Y, _goto_tower_y);
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Z, _goto_tower_z);
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_CENTER, _goto_center);
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif // DELTA_CALIBRATION_MENU
Fix moves for DELTA for MANUAL_BED_LEVELING - Use `line_to_current` in place of `plan_buffer_line`
2015-04-09 11:32:14 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* If the most recent manual move hasn't been fed to the planner yet,
* and the planner can accept one, send immediately
*/
inline void manage_manual_move() {
No delay for the smallest LCD moves
2016-07-13 00:13:56 +00:00
if (manual_move_axis != (int8_t)NO_AXIS && ELAPSED(millis(), manual_move_start_time) && !planner.is_full()) {
Improve planner kinematics, fix delta ABL
2016-10-06 08:56:05 +00:00
planner.buffer_line_kinematic(current_position, MMM_TO_MMS(manual_feedrate_mm_m[manual_move_axis]), manual_move_e_index);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
manual_move_axis = (int8_t)NO_AXIS;
}
Fix moves for DELTA for MANUAL_BED_LEVELING - Use `line_to_current` in place of `plan_buffer_line`
2015-04-09 11:32:14 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
* Set a flag that lcd_update() should start a move
* to "current_position" after a short delay.
*/
Fix manual_move to move the correct E stepper
2016-06-12 23:51:28 +00:00
inline void manual_move_to_current(AxisEnum axis
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 1
Fix manual_move to move the correct E stepper
2016-06-12 23:51:28 +00:00
, int8_t eindex=-1
#endif
) {
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 1
Fix manual_move to move the correct E stepper
2016-06-12 23:51:28 +00:00
if (axis == E_AXIS) manual_move_e_index = eindex >= 0 ? eindex : active_extruder;
#endif
No delay for the smallest LCD moves
2016-07-13 00:13:56 +00:00
manual_move_start_time = millis() + (move_menu_scale < 0.99 ? 0UL : 250UL); // delay for bigger moves
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
manual_move_axis = (int8_t)axis;
Instead of trying to move now, set a flag to move asap
2016-03-08 04:11:56 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Prepare" > "Move Axis" submenu
*
*/
Instead of trying to move now, set a flag to move asap
2016-03-08 04:11:56 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_move_xyz(const char* name, AxisEnum axis) {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { return lcd_goto_previous_menu(); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
ENCODER_DIRECTION_NORMAL();
if (encoderPosition) {
refresh_cmd_timeout();
Apply sw_endstops_enabled to manual move
2016-08-21 01:09:57 +00:00
// Limit to software endstops, if enabled
float min = (soft_endstops_enabled && min_software_endstops) ? soft_endstop_min[axis] : current_position[axis] - 1000,
max = (soft_endstops_enabled && max_software_endstops) ? soft_endstop_max[axis] : current_position[axis] + 1000;
// Get the new position
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
current_position[axis] += float((int32_t)encoderPosition) * move_menu_scale;
Apply sw_endstops_enabled to manual move
2016-08-21 01:09:57 +00:00
// Delta limits XY based on the current offset from center
// This assumes the center is 0,0
#if ENABLED(DELTA)
if (axis != Z_AXIS) {
Cast DELTA_PRINTABLE_RADIUS to float in sq() Addressing #5625
2017-02-12 00:04:32 +00:00
max = sqrt(sq((float)(DELTA_PRINTABLE_RADIUS)) - sq(current_position[Y_AXIS - axis]));
Apply sw_endstops_enabled to manual move
2016-08-21 01:09:57 +00:00
min = -max;
}
#endif
// Limit only when trying to move towards the limit
if ((int32_t)encoderPosition < 0) NOLESS(current_position[axis], min);
if ((int32_t)encoderPosition > 0) NOMORE(current_position[axis], max);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
manual_move_to_current(axis);
Apply sw_endstops_enabled to manual move
2016-08-21 01:09:57 +00:00
encoderPosition = 0;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
}
if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr41sign(current_position[axis]));
Reduce ultralcd.cpp redundancies
2014-12-18 15:30:05 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_move_x() { _lcd_move_xyz(PSTR(MSG_MOVE_X), X_AXIS); }
void lcd_move_y() { _lcd_move_xyz(PSTR(MSG_MOVE_Y), Y_AXIS); }
void lcd_move_z() { _lcd_move_xyz(PSTR(MSG_MOVE_Z), Z_AXIS); }
void _lcd_move_e(
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 1
Use a default argument in _lcd_move_e
2016-08-01 07:12:20 +00:00
int8_t eindex=-1
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
) {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { return lcd_goto_previous_menu(); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
ENCODER_DIRECTION_NORMAL();
if (encoderPosition) {
current_position[E_AXIS] += float((int32_t)encoderPosition) * move_menu_scale;
encoderPosition = 0;
Fix manual_move to move the correct E stepper
2016-06-12 23:51:28 +00:00
manual_move_to_current(E_AXIS
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 1
Fix manual_move to move the correct E stepper
2016-06-12 23:51:28 +00:00
, eindex
#endif
);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
}
if (lcdDrawUpdate) {
PGM_P pos_label;
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL == 1
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
pos_label = PSTR(MSG_MOVE_E);
#else
"e" was renamed to "eindex" in a previous commit
2016-06-15 09:11:16 +00:00
switch (eindex) {
Suppress some compiler warnings
2016-07-17 00:59:01 +00:00
default: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E1); break;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
case 1: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E2); break;
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 2
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
case 2: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E3); break;
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 3
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
case 3: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E4); break;
Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER
2016-06-28 22:06:56 +00:00
#endif
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER
2016-06-28 22:06:56 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
lcd_implementation_drawedit(pos_label, ftostr41sign(current_position[E_AXIS]));
}
Fix Move E menu items
2015-09-11 07:37:32 +00:00
}
Reduce ultralcd.cpp redundancies
2014-12-18 15:30:05 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_move_e() { _lcd_move_e(); }
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 1
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_move_e0() { _lcd_move_e(0); }
void lcd_move_e1() { _lcd_move_e(1); }
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 2
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_move_e2() { _lcd_move_e(2); }
Specify manual-movable E axes by extruder type
2016-07-30 03:08:05 +00:00
#if E_MANUAL > 3
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_move_e3() { _lcd_move_e(3); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Added Extrude From Multiple Extruders from LCD feature
2015-08-20 16:37:00 +00:00
#endif
Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER
2016-06-28 22:06:56 +00:00
#endif
Added Extrude From Multiple Extruders from LCD feature
2015-08-20 16:37:00 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Prepare" > "Move Xmm" > "Move XYZ" submenu
*
*/
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
screenFunc_t _manual_move_func_ptr;
Disable LCD Move XYZ for unhomed Delta/SCARA
2016-04-07 08:58:23 +00:00
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
void lcd_move_menu_10mm() { move_menu_scale = 10.0; lcd_goto_screen(_manual_move_func_ptr); }
void lcd_move_menu_1mm() { move_menu_scale = 1.0; lcd_goto_screen(_manual_move_func_ptr); }
void lcd_move_menu_01mm() { move_menu_scale = 0.1; lcd_goto_screen(_manual_move_func_ptr); }
Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER
2016-06-28 22:06:56 +00:00
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
void _lcd_move_distance_menu(AxisEnum axis, screenFunc_t func) {
_manual_move_func_ptr = func;
START_MENU();
if (LCD_HEIGHT >= 4) {
switch(axis) {
case X_AXIS:
STATIC_ITEM(MSG_MOVE_X, true, true); break;
case Y_AXIS:
STATIC_ITEM(MSG_MOVE_Y, true, true); break;
case Z_AXIS:
STATIC_ITEM(MSG_MOVE_Z, true, true); break;
default:
STATIC_ITEM(MSG_MOVE_E, true, true); break;
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
MENU_BACK(MSG_MOVE_AXIS);
if (axis == X_AXIS || axis == Y_AXIS)
MENU_ITEM(submenu, MSG_MOVE_10MM, lcd_move_menu_10mm);
MENU_ITEM(submenu, MSG_MOVE_1MM, lcd_move_menu_1mm);
MENU_ITEM(submenu, MSG_MOVE_01MM, lcd_move_menu_01mm);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
Define lcd_move_[xyz] ahead of lcd_move_menu_axis
2015-04-10 02:33:16 +00:00
}
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
void lcd_move_get_x_amount() { _lcd_move_distance_menu(X_AXIS, lcd_move_x); }
void lcd_move_get_y_amount() { _lcd_move_distance_menu(Y_AXIS, lcd_move_y); }
void lcd_move_get_z_amount() { _lcd_move_distance_menu(Z_AXIS, lcd_move_z); }
void lcd_move_get_e_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e); }
#if E_MANUAL > 1
void lcd_move_get_e0_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e0); }
void lcd_move_get_e1_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e1); }
#if E_MANUAL > 2
void lcd_move_get_e2_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e2); }
#if E_MANUAL > 3
void lcd_move_get_e3_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e3); }
#endif
#endif
#endif
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Prepare" > "Move Axis" submenu
*
*/
Make Autotune options into Menu Edit Items
2016-03-22 01:10:08 +00:00
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
#if IS_KINEMATIC
#define _MOVE_XYZ_ALLOWED (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
#if ENABLED(DELTA)
#define _MOVE_XY_ALLOWED (current_position[Z_AXIS] <= delta_clip_start_height)
void lcd_lower_z_to_clip_height() {
if (!no_reentrance) {
current_position[Z_AXIS] = delta_clip_start_height;
line_to_current(Z_AXIS);
lcd_synchronize();
}
}
#else
#define _MOVE_XY_ALLOWED true
#endif
#else
#define _MOVE_XYZ_ALLOWED true
#define _MOVE_XY_ALLOWED true
#endif
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_move_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_PREPARE);
Make Autotune options into Menu Edit Items
2016-03-22 01:10:08 +00:00
Move Menu: Select axis first, resolution after
2016-12-13 05:58:16 +00:00
if (_MOVE_XYZ_ALLOWED) {
if (_MOVE_XY_ALLOWED) {
MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_get_x_amount);
MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_get_y_amount);
}
#if ENABLED(DELTA)
else
MENU_ITEM(function, MSG_FREE_XY, lcd_lower_z_to_clip_height);
#endif
MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_get_z_amount);
}
else
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
#if ENABLED(SWITCHING_EXTRUDER)
if (active_extruder)
MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0"));
else
MENU_ITEM(gcode, MSG_SELECT " " MSG_E2, PSTR("T1"));
#endif
MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_get_e_amount);
#if E_MANUAL > 1
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_get_e0_amount);
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E2, lcd_move_get_e1_amount);
#if E_MANUAL > 2
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E3, lcd_move_get_e2_amount);
#if E_MANUAL > 3
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E4, lcd_move_get_e3_amount);
#endif
#endif
#endif
Make Autotune options into Menu Edit Items
2016-03-22 01:10:08 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
Make Autotune options into Menu Edit Items
2016-03-22 01:10:08 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Control" submenu
*
*/
Make Autotune options into Menu Edit Items
2016-03-22 01:10:08 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_control_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_MAIN);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu);
MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu);
Add PID_PARAMS_PER_EXTRUDER conditional
2015-02-20 08:00:19 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HAS_LCD_CONTRAST
//MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63);
MENU_ITEM(submenu, MSG_CONTRAST, lcd_set_contrast);
suppress warnings
2016-04-02 21:28:17 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(FWRETRACT)
MENU_ITEM(submenu, MSG_RETRACT, lcd_control_retract_menu);
#endif
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
#if ENABLED(DAC_STEPPER_CURRENT)
Added Menu entry for Case light
2016-11-19 10:17:39 +00:00
MENU_ITEM(submenu, MSG_DRIVE_STRENGTH, lcd_dac_menu);
Add LCD menu for DAC
2016-10-03 22:15:29 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
MENU_ITEM(function, MSG_LOAD_EPROM, Config_RetrieveSettings);
suppress warnings
2016-04-02 21:28:17 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM(function, MSG_RESTORE_FAILSAFE, Config_ResetDefault);
END_MENU();
Proper implementation of PID menu items - Make this work per #1344
2015-02-20 07:54:06 +00:00
}
Apply PID_AUTOTUNE_MENU option to ultralcd.cpp
2016-03-26 02:22:33 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Temperature" submenu
*
*/
Add PID_PARAMS_PER_EXTRUDER conditional
2015-02-20 08:00:19 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(PID_AUTOTUNE_MENU)
Proper implementation of PID menu items - Make this work per #1344
2015-02-20 07:54:06 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(PIDTEMP)
int autotune_temp[HOTENDS] = ARRAY_BY_HOTENDS1(150);
Revert nozzle_bed_fan_menu_items For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly.
2015-12-04 00:31:22 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(PIDTEMPBED)
int autotune_temp_bed = 70;
Revert nozzle_bed_fan_menu_items For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly.
2015-12-04 00:31:22 +00:00
#endif
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_autotune(int e) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
char cmd[30];
sprintf_P(cmd, PSTR("M303 U1 E%i S%i"), e,
#if HAS_PID_FOR_BOTH
e < 0 ? autotune_temp_bed : autotune_temp[e]
#elif ENABLED(PIDTEMPBED)
autotune_temp_bed
#else
autotune_temp[e]
#endif
);
enqueue_and_echo_command(cmd);
}
Revert nozzle_bed_fan_menu_items For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly.
2015-12-04 00:31:22 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //PID_AUTOTUNE_MENU
Add comments to lcd_control_temperature_menu
2015-05-13 01:46:16 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(PIDTEMP)
Show nozzles, heaters, and extruders numbered 1-4
2015-09-12 02:52:01 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Helpers for editing PID Ki & Kd values
// grab the PID value out of the temp variable; scale it; then update the PID driver
void copy_and_scalePID_i(int e) {
Suppress some compiler warnings
2016-07-17 00:59:01 +00:00
#if DISABLED(PID_PARAMS_PER_HOTEND) || HOTENDS == 1
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
UNUSED(e);
#endif
PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
thermalManager.updatePID();
}
void copy_and_scalePID_d(int e) {
Suppress some compiler warnings
2016-07-17 00:59:01 +00:00
#if DISABLED(PID_PARAMS_PER_HOTEND) || HOTENDS == 1
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
UNUSED(e);
#endif
PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
thermalManager.updatePID();
}
#define _PIDTEMP_BASE_FUNCTIONS(eindex) \
void copy_and_scalePID_i_E ## eindex() { copy_and_scalePID_i(eindex); } \
void copy_and_scalePID_d_E ## eindex() { copy_and_scalePID_d(eindex); }
Proper implementation of PID menu items - Make this work per #1344
2015-02-20 07:54:06 +00:00
Apply PID_AUTOTUNE_MENU option to ultralcd.cpp
2016-03-26 02:22:33 +00:00
#if ENABLED(PID_AUTOTUNE_MENU)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#define _PIDTEMP_FUNCTIONS(eindex) \
_PIDTEMP_BASE_FUNCTIONS(eindex); \
void lcd_autotune_callback_E ## eindex() { _lcd_autotune(eindex); }
Apply PID_AUTOTUNE_MENU option to ultralcd.cpp
2016-03-26 02:22:33 +00:00
#else
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#define _PIDTEMP_FUNCTIONS(eindex) _PIDTEMP_BASE_FUNCTIONS(eindex)
Apply PID_AUTOTUNE_MENU option to ultralcd.cpp
2016-03-26 02:22:33 +00:00
#endif
Make Autotune options into Menu Edit Items
2016-03-22 01:10:08 +00:00
fixed warning: extra ;
2016-10-13 15:51:44 +00:00
_PIDTEMP_FUNCTIONS(0)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(PID_PARAMS_PER_HOTEND)
#if HOTENDS > 1
fixed warning: extra ;
2016-10-13 15:51:44 +00:00
_PIDTEMP_FUNCTIONS(1)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 2
fixed warning: extra ;
2016-10-13 15:51:44 +00:00
_PIDTEMP_FUNCTIONS(2)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3
fixed warning: extra ;
2016-10-13 15:51:44 +00:00
_PIDTEMP_FUNCTIONS(3)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //HOTENDS > 3
#endif //HOTENDS > 2
#endif //HOTENDS > 1
#endif //PID_PARAMS_PER_HOTEND
Proper implementation of PID menu items - Make this work per #1344
2015-02-20 07:54:06 +00:00
Show nozzles, heaters, and extruders numbered 1-4
2015-09-12 02:52:01 +00:00
#endif //PIDTEMP
Add comments to lcd_control_temperature_menu
2015-05-13 01:46:16 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Control" > "Temperature" submenu
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_control_temperature_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// ^ Control
//
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_CONTROL);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Nozzle:
// Nozzle [1-4]:
//
#if HOTENDS == 1
#if TEMP_SENSOR_0 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
#endif
#else //HOTENDS > 1
#if TEMP_SENSOR_0 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
#endif
#if TEMP_SENSOR_1 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &thermalManager.target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1);
#endif
#if HOTENDS > 2
#if TEMP_SENSOR_2 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N3, &thermalManager.target_temperature[2], 0, HEATER_2_MAXTEMP - 15, watch_temp_callback_E2);
#endif
#if HOTENDS > 3
#if TEMP_SENSOR_3 != 0
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N4, &thermalManager.target_temperature[3], 0, HEATER_3_MAXTEMP - 15, watch_temp_callback_E3);
#endif
#endif // HOTENDS > 3
#endif // HOTENDS > 2
#endif // HOTENDS > 1
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Bed:
//
#if TEMP_SENSOR_BED != 0
Watch bed temp also for Control menu item
2016-09-27 23:29:46 +00:00
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_BED, &thermalManager.target_temperature_bed, 0, BED_MAXTEMP - 15, watch_temp_callback_bed);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Planner singleton class
2016-04-28 01:06:32 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// Fan Speed:
//
#if FAN_COUNT > 0
#if HAS_FAN0
#if FAN_COUNT > 1
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED " 1"
#else
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED
#endif
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255);
#endif
#if HAS_FAN1
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
#endif
#if HAS_FAN2
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
#endif
#endif // FAN_COUNT > 0
//
// Autotemp, Min, Max, Fact
//
#if ENABLED(AUTOTEMP) && (TEMP_SENSOR_0 != 0)
MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
MENU_ITEM_EDIT(float3, MSG_MIN, &planner.autotemp_min, 0, HEATER_0_MAXTEMP - 15);
MENU_ITEM_EDIT(float3, MSG_MAX, &planner.autotemp_max, 0, HEATER_0_MAXTEMP - 15);
MENU_ITEM_EDIT(float32, MSG_FACTOR, &planner.autotemp_factor, 0.0, 1.0);
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
// PID-P, PID-I, PID-D, PID-C, PID Autotune
// PID-P E1, PID-I E1, PID-D E1, PID-C E1, PID Autotune E1
// PID-P E2, PID-I E2, PID-D E2, PID-C E2, PID Autotune E2
// PID-P E3, PID-I E3, PID-D E3, PID-C E3, PID Autotune E3
// PID-P E4, PID-I E4, PID-D E4, PID-C E4, PID Autotune E4
//
#if ENABLED(PIDTEMP)
#define _PID_BASE_MENU_ITEMS(ELABEL, eindex) \
raw_Ki = unscalePID_i(PID_PARAM(Ki, eindex)); \
raw_Kd = unscalePID_d(PID_PARAM(Kd, eindex)); \
MENU_ITEM_EDIT(float52, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex)
PID_EXTRUSION_SCALING, disabled by default
2016-08-01 00:49:34 +00:00
#if ENABLED(PID_EXTRUSION_SCALING)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#define _PID_MENU_ITEMS(ELABEL, eindex) \
_PID_BASE_MENU_ITEMS(ELABEL, eindex); \
MENU_ITEM_EDIT(float3, MSG_PID_C ELABEL, &PID_PARAM(Kc, eindex), 1, 9990)
#else
#define _PID_MENU_ITEMS(ELABEL, eindex) _PID_BASE_MENU_ITEMS(ELABEL, eindex)
#endif
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(PID_AUTOTUNE_MENU)
#define PID_MENU_ITEMS(ELABEL, eindex) \
_PID_MENU_ITEMS(ELABEL, eindex); \
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_PID_AUTOTUNE ELABEL, &autotune_temp[eindex], 150, heater_maxtemp[eindex] - 15, lcd_autotune_callback_E ## eindex)
#else
#define PID_MENU_ITEMS(ELABEL, eindex) _PID_MENU_ITEMS(ELABEL, eindex)
#endif
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
Remove redundant "E"
2016-12-08 10:57:41 +00:00
PID_MENU_ITEMS(" " MSG_E1, 0);
PID_MENU_ITEMS(" " MSG_E2, 1);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 2
Remove redundant "E"
2016-12-08 10:57:41 +00:00
PID_MENU_ITEMS(" " MSG_E3, 2);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HOTENDS > 3
Remove redundant "E"
2016-12-08 10:57:41 +00:00
PID_MENU_ITEMS(" " MSG_E4, 3);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //HOTENDS > 3
#endif //HOTENDS > 2
#else //!PID_PARAMS_PER_HOTEND || HOTENDS == 1
PID_MENU_ITEMS("", 0);
#endif //!PID_PARAMS_PER_HOTEND || HOTENDS == 1
#endif //PIDTEMP
//
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
// Preheat Material 1 conf
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(submenu, MSG_PREHEAT_1_SETTINGS, lcd_control_temperature_preheat_material1_settings_menu);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
// Preheat Material 2 conf
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
//
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
MENU_ITEM(submenu, MSG_PREHEAT_2_SETTINGS, lcd_control_temperature_preheat_material2_settings_menu);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _lcd_control_temperature_preheat_settings_menu(uint8_t material) {
Limit preheat parameters based on all nozzles
2016-11-28 06:51:52 +00:00
#if HOTENDS > 3
#define MINTEMP_ALL MIN4(HEATER_0_MINTEMP, HEATER_1_MINTEMP, HEATER_2_MINTEMP, HEATER_3_MINTEMP)
#define MAXTEMP_ALL MAX4(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP)
#elif HOTENDS > 2
#define MINTEMP_ALL MIN3(HEATER_0_MINTEMP, HEATER_1_MINTEMP, HEATER_2_MINTEMP)
#define MAXTEMP_ALL MAX3(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP)
#elif HOTENDS > 1
#define MINTEMP_ALL min(HEATER_0_MINTEMP, HEATER_1_MINTEMP)
#define MAXTEMP_ALL max(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP)
#else
#define MINTEMP_ALL HEATER_0_MINTEMP
#define MAXTEMP_ALL HEATER_0_MAXTEMP
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_TEMPERATURE);
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &lcd_preheat_fan_speed[material], 0, 255);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if TEMP_SENSOR_0 != 0
Limit preheat parameters based on all nozzles
2016-11-28 06:51:52 +00:00
MENU_ITEM_EDIT(int3, MSG_NOZZLE, &lcd_preheat_hotend_temp[material], MINTEMP_ALL, MAXTEMP_ALL - 15);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#if TEMP_SENSOR_BED != 0
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
MENU_ITEM_EDIT(int3, MSG_BED, &lcd_preheat_bed_temp[material], BED_MINTEMP, BED_MAXTEMP - 15);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
#endif
END_MENU();
}
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
/**
*
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
* "Temperature" > "Preheat Material 1 conf" submenu
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
*
*/
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_control_temperature_preheat_material1_settings_menu() { _lcd_control_temperature_preheat_settings_menu(0); }
Make LCD preheat vars an array to reduce code size
2016-10-27 07:40:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
* "Temperature" > "Preheat Material 2 conf" submenu
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
*
*/
PLA / ABS => Material 1 / 2
2016-11-28 06:39:06 +00:00
void lcd_control_temperature_preheat_material2_settings_menu() { _lcd_control_temperature_preheat_settings_menu(1); }
added contrast control function for gLCDs
2013-07-14 08:28:26 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _reset_acceleration_rates() { planner.reset_acceleration_rates(); }
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#if ENABLED(DISTINCT_E_FACTORS)
void _reset_e_acceleration_rate(const uint8_t e) { if (e == active_extruder) _reset_acceleration_rates(); }
void _reset_e0_acceleration_rate() { _reset_e_acceleration_rate(0); }
void _reset_e1_acceleration_rate() { _reset_e_acceleration_rate(1); }
#if E_STEPPERS > 2
void _reset_e2_acceleration_rate() { _reset_e_acceleration_rate(2); }
#if E_STEPPERS > 3
void _reset_e3_acceleration_rate() { _reset_e_acceleration_rate(3); }
#endif
#endif
#endif
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _planner_refresh_positioning() { planner.refresh_positioning(); }
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#if ENABLED(DISTINCT_E_FACTORS)
void _planner_refresh_e_positioning(const uint8_t e) {
if (e == active_extruder)
_planner_refresh_positioning();
else
Patch some planner compile errors
2016-12-07 08:26:24 +00:00
planner.steps_to_mm[e] = 1.0 / planner.axis_steps_per_mm[e];
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
}
void _planner_refresh_e0_positioning() { _reset_e_acceleration_rate(0); }
void _planner_refresh_e1_positioning() { _reset_e_acceleration_rate(1); }
#if E_STEPPERS > 2
void _planner_refresh_e2_positioning() { _reset_e_acceleration_rate(2); }
#if E_STEPPERS > 3
void _planner_refresh_e3_positioning() { _reset_e_acceleration_rate(3); }
#endif
#endif
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Control" > "Motion" submenu
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_control_motion_menu() {
Formatting and lcd contrast masking
2015-04-08 04:11:03 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_CONTROL);
Make M851 standard with a bed probe
2016-06-15 01:05:20 +00:00
#if HAS_BED_PROBE
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
Formatting and lcd contrast masking
2015-04-08 04:11:03 +00:00
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
// Manual bed leveling, Bed Z:
#if ENABLED(MANUAL_BED_LEVELING)
MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
#endif
MENU_ITEM_EDIT(float5, MSG_ACC, &planner.acceleration, 10, 99000);
max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK
2016-10-02 09:37:13 +00:00
MENU_ITEM_EDIT(float3, MSG_VX_JERK, &planner.max_jerk[X_AXIS], 1, 990);
MENU_ITEM_EDIT(float3, MSG_VY_JERK, &planner.max_jerk[Y_AXIS], 1, 990);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(DELTA)
Patch max_jerk[Z] menu item
2016-10-02 15:12:47 +00:00
MENU_ITEM_EDIT(float3, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 1, 990);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#else
max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK
2016-10-02 09:37:13 +00:00
MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 0.1, 990);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK
2016-10-02 09:37:13 +00:00
MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
//
// M203 Settings
//
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_X, &planner.max_feedrate_mm_s[X_AXIS], 1, 999);
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Y, &planner.max_feedrate_mm_s[Y_AXIS], 1, 999);
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Z, &planner.max_feedrate_mm_s[Z_AXIS], 1, 999);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#if ENABLED(DISTINCT_E_FACTORS)
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E, &planner.max_feedrate_mm_s[E_AXIS + active_extruder], 1, 999);
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E1, &planner.max_feedrate_mm_s[E_AXIS], 1, 999);
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E2, &planner.max_feedrate_mm_s[E_AXIS + 1], 1, 999);
#if E_STEPPERS > 2
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E3, &planner.max_feedrate_mm_s[E_AXIS + 2], 1, 999);
#if E_STEPPERS > 3
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E3, &planner.max_feedrate_mm_s[E_AXIS + 3], 1, 999);
#endif
#endif
#else
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E, &planner.max_feedrate_mm_s[E_AXIS], 1, 999);
#endif
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
MENU_ITEM_EDIT(float3, MSG_VMIN, &planner.min_feedrate_mm_s, 0, 999);
MENU_ITEM_EDIT(float3, MSG_VTRAV_MIN, &planner.min_travel_feedrate_mm_s, 0, 999);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
//
// M201 Settings
//
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_X, &planner.max_acceleration_mm_per_s2[X_AXIS], 100, 99000, _reset_acceleration_rates);
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Y, &planner.max_acceleration_mm_per_s2[Y_AXIS], 100, 99000, _reset_acceleration_rates);
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Z, &planner.max_acceleration_mm_per_s2[Z_AXIS], 10, 99000, _reset_acceleration_rates);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#if ENABLED(DISTINCT_E_FACTORS)
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E, &planner.max_acceleration_mm_per_s2[E_AXIS + active_extruder], 100, 99000, _reset_acceleration_rates);
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E1, &planner.max_acceleration_mm_per_s2[E_AXIS], 100, 99000, _reset_e0_acceleration_rate);
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E2, &planner.max_acceleration_mm_per_s2[E_AXIS + 1], 100, 99000, _reset_e1_acceleration_rate);
#if E_STEPPERS > 2
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E3, &planner.max_acceleration_mm_per_s2[E_AXIS + 2], 100, 99000, _reset_e2_acceleration_rate);
#if E_STEPPERS > 3
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E4, &planner.max_acceleration_mm_per_s2[E_AXIS + 3], 100, 99000, _reset_e3_acceleration_rate);
#endif
#endif
#else
MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E, &planner.max_acceleration_mm_per_s2[E_AXIS], 100, 99000, _reset_acceleration_rates);
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM_EDIT(float5, MSG_A_RETRACT, &planner.retract_acceleration, 100, 99000);
MENU_ITEM_EDIT(float5, MSG_A_TRAVEL, &planner.travel_acceleration, 100, 99000);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
//
// M92 Settings
//
Introduce a +1234.56 format for over 999 steps/mm
2016-11-15 22:01:30 +00:00
MENU_ITEM_EDIT_CALLBACK(float62, MSG_XSTEPS, &planner.axis_steps_per_mm[X_AXIS], 5, 9999, _planner_refresh_positioning);
MENU_ITEM_EDIT_CALLBACK(float62, MSG_YSTEPS, &planner.axis_steps_per_mm[Y_AXIS], 5, 9999, _planner_refresh_positioning);
MENU_ITEM_EDIT_CALLBACK(float62, MSG_ZSTEPS, &planner.axis_steps_per_mm[Z_AXIS], 5, 9999, _planner_refresh_positioning);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#if ENABLED(DISTINCT_E_FACTORS)
MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.axis_steps_per_mm[E_AXIS + active_extruder], 5, 9999, _planner_refresh_positioning);
Remove redundant "E"
2016-12-08 10:57:41 +00:00
MENU_ITEM_EDIT_CALLBACK(float62, MSG_E1STEPS, &planner.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_e0_positioning);
MENU_ITEM_EDIT_CALLBACK(float62, MSG_E2STEPS, &planner.axis_steps_per_mm[E_AXIS + 1], 5, 9999, _planner_refresh_e1_positioning);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#if E_STEPPERS > 2
Remove redundant "E"
2016-12-08 10:57:41 +00:00
MENU_ITEM_EDIT_CALLBACK(float62, MSG_E3STEPS, &planner.axis_steps_per_mm[E_AXIS + 2], 5, 9999, _planner_refresh_e2_positioning);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#if E_STEPPERS > 3
Remove redundant "E"
2016-12-08 10:57:41 +00:00
MENU_ITEM_EDIT_CALLBACK(float62, MSG_E4STEPS, &planner.axis_steps_per_mm[E_AXIS + 3], 5, 9999, _planner_refresh_e3_positioning);
Support DISTINCT_E_FACTORS in LCD Motion Menu
2016-12-04 04:45:34 +00:00
#endif
#endif
#else
MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_positioning);
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &stepper.abort_on_endstop_hit);
#endif
Formatting and lcd contrast masking
2015-04-08 04:11:03 +00:00
END_MENU();
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* "Control" > "Filament" submenu
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_control_volumetric_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_CONTROL);
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers);
if (volumetric_enabled) {
#if EXTRUDERS == 1
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
#else //EXTRUDERS > 1
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E1, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E2, &filament_size[1], 1.5, 3.25, calculate_volumetric_multipliers);
#if EXTRUDERS > 2
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E3, &filament_size[2], 1.5, 3.25, calculate_volumetric_multipliers);
#if EXTRUDERS > 3
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E4, &filament_size[3], 1.5, 3.25, calculate_volumetric_multipliers);
#endif //EXTRUDERS > 3
#endif //EXTRUDERS > 2
#endif //EXTRUDERS > 1
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 20:34:56 +00:00
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
/**
*
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
* "Control" > "Contrast" submenu
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
*
*/
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if HAS_LCD_CONTRAST
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_set_contrast() {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { return lcd_goto_previous_menu(); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
ENCODER_DIRECTION_NORMAL();
if (encoderPosition) {
set_lcd_contrast(lcd_contrast + encoderPosition);
encoderPosition = 0;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
}
if (lcdDrawUpdate) {
lcd_implementation_drawedit(PSTR(MSG_CONTRAST),
#if LCD_CONTRAST_MAX >= 100
itostr3(lcd_contrast)
#else
itostr2(lcd_contrast)
#endif
);
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif // HAS_LCD_CONTRAST
/**
*
* "Control" > "Retract" submenu
*
*/
#if ENABLED(FWRETRACT)
Move number-to-string function to utility.*
2016-08-20 23:05:54 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_control_retract_menu() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_CONTROL);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM_EDIT(bool, MSG_AUTORETRACT, &autoretract_enabled);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT, &retract_length, 0, 100);
#if EXTRUDERS > 1
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100);
#endif
Tweak some feedrate vars
2016-06-22 10:27:31 +00:00
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate_mm_s, 1, 999);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
Allow negative retract values in the LCD This can already be done via G-Code, so adding the capability to the LCD should be straight forward.
2016-12-19 13:19:06 +00:00
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, -100, 100);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if EXTRUDERS > 1
Allow negative recover-swap length from LCD
2016-12-20 09:16:08 +00:00
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, -100, 100);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &retract_recover_feedrate_mm_s, 1, 999);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
END_MENU();
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
}
Move number-to-string function to utility.*
2016-08-20 23:05:54 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif // FWRETRACT
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(SDSUPPORT)
Revert MBL menus to "known" working point
2016-04-21 19:40:22 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if !PIN_EXISTS(SD_DETECT)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_sd_refresh() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
card.initsd();
Scroll static screens more simply
2016-07-08 22:08:56 +00:00
encoderTopLine = 0;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
#endif
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_sd_updir() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
card.updir();
Scroll static screens more simply
2016-07-08 22:08:56 +00:00
encoderTopLine = 0;
Fix redraw in SD Card menus
2016-12-02 00:15:58 +00:00
screen_changed = true;
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
/**
*
* "Print from SD" submenu
*
*/
void lcd_sdcard_menu() {
ENCODER_DIRECTION_MENUS();
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
if (!lcdDrawUpdate && !lcd_clicked) return; // nothing to do (so don't thrash the SD card)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
uint16_t fileCnt = card.getnrfilenames();
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_MAIN);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
card.getWorkDirName();
if (card.filename[0] == '/') {
#if !PIN_EXISTS(SD_DETECT)
MENU_ITEM(function, LCD_STR_REFRESH MSG_REFRESH, lcd_sd_refresh);
#endif
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
}
else {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir);
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
for (uint16_t i = 0; i < fileCnt; i++) {
Rename vars, add comments for menu macros
2016-07-09 19:26:20 +00:00
if (_menuLineNr == _thisItemNr) {
New feature: SDCARD_SORT_ALPHA
2017-02-09 13:02:25 +00:00
#if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA)
int nr = fileCnt - 1 - i;
#else
int nr = i;
#endif
#if ENABLED(SDCARD_SORT_ALPHA)
card.getfilename_sorted(nr);
#else
card.getfilename(nr);
#endif
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
if (card.filenameIsDir)
MENU_ITEM(sddirectory, MSG_CARD_MENU, card.filename, card.longFilename);
else
MENU_ITEM(sdfile, MSG_CARD_MENU, card.filename, card.longFilename);
}
else {
MENU_ITEM_DUMMY();
}
}
END_MENU();
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif //SDSUPPORT
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if ENABLED(LCD_INFO_MENU)
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if ENABLED(PRINTCOUNTER)
/**
*
Don't draw current screen if simply changing screens
2016-07-11 00:53:11 +00:00
* About Printer > Statistics submenu
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_info_stats_menu() {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { return lcd_goto_previous_menu(); }
Don't draw current screen if simply changing screens
2016-07-11 00:53:11 +00:00
Update the stats menu to include longest job and extruded filament
2016-07-23 01:48:21 +00:00
char buffer[21];
Rework stats menu to use timestamp_t
2016-07-23 00:42:21 +00:00
printStatistics stats = print_job_timer.getStats();
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
Update the stats menu to include longest job and extruded filament
2016-07-23 01:48:21 +00:00
START_SCREEN(); // 12345678901234567890
STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints)); // Print Count: 999
Printer Stats / Completed prints line doesn't fit in display (when german)
2016-11-09 21:03:25 +00:00
STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS": ", false, false, itostr3left(stats.finishedPrints)); // Completed : 666
Update the stats menu to include longest job and extruded filament
2016-07-23 01:48:21 +00:00
Renamed timestamp_t to duration_t
2016-07-24 02:13:35 +00:00
duration_t elapsed = stats.printTime;
elapsed.toString(buffer);
Update the stats menu to include longest job and extruded filament
2016-07-23 01:48:21 +00:00
STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false); // Total print Time:
STATIC_ITEM("", false, false, buffer); // 99y 364d 23h 59m 59s
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
Renamed timestamp_t to duration_t
2016-07-24 02:13:35 +00:00
elapsed = stats.longestPrint;
elapsed.toString(buffer);
Update the stats menu to include longest job and extruded filament
2016-07-23 01:48:21 +00:00
STATIC_ITEM(MSG_INFO_PRINT_LONGEST ": ", false, false); // Longest job time:
STATIC_ITEM("", false, false, buffer); // 99y 364d 23h 59m 59s
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
Include decimeters in filamentUsed display
2016-08-12 12:16:43 +00:00
sprintf_P(buffer, PSTR("%ld.%im"), long(stats.filamentUsed / 1000), int(stats.filamentUsed / 100) % 10);
Update the stats menu to include longest job and extruded filament
2016-07-23 01:48:21 +00:00
STATIC_ITEM(MSG_INFO_PRINT_FILAMENT ": ", false, false); // Extruded total:
STATIC_ITEM("", false, false, buffer); // 125m
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
}
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
#endif // PRINTCOUNTER
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
/**
*
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
* About Printer > Thermistors
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_info_thermistors_menu() {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { return lcd_goto_previous_menu(); }
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#define THERMISTOR_ID TEMP_SENSOR_0
#include "thermistornames.h"
Left-justify thermistor info
2016-07-09 01:20:15 +00:00
STATIC_ITEM("T0: " THERMISTOR_NAME, false, true);
STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_0_MINTEMP), false);
STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_0_MAXTEMP), false);
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if TEMP_SENSOR_1 != 0
#undef THERMISTOR_ID
#define THERMISTOR_ID TEMP_SENSOR_1
#include "thermistornames.h"
Left-justify thermistor info
2016-07-09 01:20:15 +00:00
STATIC_ITEM("T1: " THERMISTOR_NAME, false, true);
STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_1_MINTEMP), false);
STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_1_MAXTEMP), false);
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
#if TEMP_SENSOR_2 != 0
#undef THERMISTOR_ID
#define THERMISTOR_ID TEMP_SENSOR_2
#include "thermistornames.h"
Left-justify thermistor info
2016-07-09 01:20:15 +00:00
STATIC_ITEM("T2: " THERMISTOR_NAME, false, true);
STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_2_MINTEMP), false);
STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_2_MAXTEMP), false);
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
#if TEMP_SENSOR_3 != 0
#undef THERMISTOR_ID
#define THERMISTOR_ID TEMP_SENSOR_3
#include "thermistornames.h"
Left-justify thermistor info
2016-07-09 01:20:15 +00:00
STATIC_ITEM("T3: " THERMISTOR_NAME, false, true);
STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_3_MINTEMP), false);
STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_3_MAXTEMP), false);
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if TEMP_SENSOR_BED != 0
#undef THERMISTOR_ID
#define THERMISTOR_ID TEMP_SENSOR_BED
#include "thermistornames.h"
Left-justify thermistor info
2016-07-09 01:20:15 +00:00
STATIC_ITEM("TBed:" THERMISTOR_NAME, false, true);
STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(BED_MINTEMP), false);
STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(BED_MAXTEMP), false);
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
}
/**
*
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
* About Printer > Board Info
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_info_board_menu() {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { return lcd_goto_previous_menu(); }
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
STATIC_ITEM(BOARD_NAME, true, true); // MyPrinterController
STATIC_ITEM(MSG_INFO_BAUDRATE ": " STRINGIFY(BAUDRATE), true); // Baud: 250000
STATIC_ITEM(MSG_INFO_PROTOCOL ": " PROTOCOL_VERSION, true); // Protocol: 1.0
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#ifdef POWER_SUPPLY
#if (POWER_SUPPLY == 1)
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
STATIC_ITEM(MSG_INFO_PSU ": ATX", true); // Power Supply: ATX
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#elif (POWER_SUPPLY == 2)
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
STATIC_ITEM(MSG_INFO_PSU ": XBox", true); // Power Supply: XBox
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
#endif // POWER_SUPPLY
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
}
/**
*
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
* About Printer > Printer Info
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_info_printer_menu() {
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
if (lcd_clicked) { return lcd_goto_previous_menu(); }
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
STATIC_ITEM(MSG_MARLIN, true, true); // Marlin
STATIC_ITEM(SHORT_BUILD_VERSION, true); // x.x.x-Branch
STATIC_ITEM(STRING_DISTRIBUTION_DATE, true); // YYYY-MM-DD HH:MM
STATIC_ITEM(MACHINE_NAME, true); // My3DPrinter
STATIC_ITEM(WEBSITE_URL, true); // www.my3dprinter.com
STATIC_ITEM(MSG_INFO_EXTRUDERS ": " STRINGIFY(EXTRUDERS), true); // Extruders: 2
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
}
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
/**
*
* "About Printer" submenu
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_info_menu() {
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
START_MENU();
fixed warning: ISO C99 requires rest arguments to be used
2016-10-13 15:44:35 +00:00
MENU_BACK(MSG_MAIN);
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
MENU_ITEM(submenu, MSG_INFO_PRINTER_MENU, lcd_info_printer_menu); // Printer Info >
MENU_ITEM(submenu, MSG_INFO_BOARD_MENU, lcd_info_board_menu); // Board Info >
MENU_ITEM(submenu, MSG_INFO_THERMISTOR_MENU, lcd_info_thermistors_menu); // Thermistors >
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#if ENABLED(PRINTCOUNTER)
Patch up About Printer sub-menus
2016-07-02 21:04:18 +00:00
MENU_ITEM(submenu, MSG_INFO_STATS_MENU, lcd_info_stats_menu); // Printer Statistics >
Add "About Printer" information menu. Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.
2016-06-30 09:24:29 +00:00
#endif
END_MENU();
}
#endif // LCD_INFO_MENU
Spacing, coding standards
2017-02-10 06:13:58 +00:00
/**
*
* Filament Change Feature Screens
*
*/
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
#if ENABLED(FILAMENT_CHANGE_FEATURE)
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
// Portions from STATIC_ITEM...
#define HOTEND_STATUS_ITEM() do { \
if (_menuLineNr == _thisItemNr) { \
if (lcdDrawUpdate) \
lcd_implementation_drawmenu_static(_lcdLineNr, PSTR(MSG_FILAMENT_CHANGE_NOZZLE), false, true); \
lcd_implementation_hotend_status(_lcdLineNr); \
if (_skipStatic && encoderLine <= _thisItemNr) { \
encoderPosition += ENCODER_STEPS_PER_MENU_ITEM; \
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; \
} \
else \
lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; \
} \
++_thisItemNr; \
} while(0)
m600 fixes
2016-12-20 07:47:46 +00:00
void lcd_filament_change_toocold_menu() {
START_MENU();
STATIC_ITEM(MSG_HEATING_FAILED_LCD, true, true);
Spacing, coding standards
2017-02-10 06:13:58 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_MINTEMP STRINGIFY(EXTRUDE_MINTEMP) ".", false, false);
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
MENU_BACK(MSG_BACK);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#if LCD_HEIGHT > 4
STATIC_ITEM(" ");
#endif
HOTEND_STATUS_ITEM();
m600 fixes
2016-12-20 07:47:46 +00:00
END_MENU();
}
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_resume_print() {
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_extrude_more() {
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_EXTRUDE_MORE;
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_option_menu() {
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
START_MENU();
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#if LCD_HEIGHT > 2
Invert headings on Graphical LCD
2016-07-09 01:18:40 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER, true, false);
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_RESUME, lcd_filament_change_resume_print);
MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_EXTRUDE, lcd_filament_change_extrude_more);
END_MENU();
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_init_message() {
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
Invert headings on Graphical LCD
2016-07-09 01:18:40 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_INIT_1);
#ifdef MSG_FILAMENT_CHANGE_INIT_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_INIT_2);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define __FC_LINES_A 3
#else
#define __FC_LINES_A 2
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
#ifdef MSG_FILAMENT_CHANGE_INIT_3
STATIC_ITEM(MSG_FILAMENT_CHANGE_INIT_3);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define _FC_LINES_A (__FC_LINES_A + 1)
#else
#define _FC_LINES_A __FC_LINES_A
#endif
#if LCD_HEIGHT > _FC_LINES_A + 1
STATIC_ITEM(" ");
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
HOTEND_STATUS_ITEM();
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_unload_message() {
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
Invert headings on Graphical LCD
2016-07-09 01:18:40 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_UNLOAD_1);
#ifdef MSG_FILAMENT_CHANGE_UNLOAD_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_UNLOAD_2);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define __FC_LINES_B 3
#else
#define __FC_LINES_B 2
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
#ifdef MSG_FILAMENT_CHANGE_UNLOAD_3
STATIC_ITEM(MSG_FILAMENT_CHANGE_UNLOAD_3);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define _FC_LINES_B (__FC_LINES_B + 1)
#else
#define _FC_LINES_B __FC_LINES_B
#endif
#if LCD_HEIGHT > _FC_LINES_B + 1
STATIC_ITEM(" ");
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
HOTEND_STATUS_ITEM();
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
END_SCREEN();
}
void lcd_filament_change_wait_for_nozzles_to_heat() {
START_SCREEN();
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEATING_1);
#ifdef MSG_FILAMENT_CHANGE_HEATING_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEATING_2);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define _FC_LINES_C 3
#else
#define _FC_LINES_C 2
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#if LCD_HEIGHT > _FC_LINES_C + 1
STATIC_ITEM(" ");
#endif
HOTEND_STATUS_ITEM();
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
END_SCREEN();
}
void lcd_filament_change_heat_nozzle() {
START_SCREEN();
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEAT_1);
#ifdef MSG_FILAMENT_CHANGE_INSERT_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEAT_2);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define _FC_LINES_D 3
#else
#define _FC_LINES_D 2
#endif
#if LCD_HEIGHT > _FC_LINES_D + 1
STATIC_ITEM(" ");
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
HOTEND_STATUS_ITEM();
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_insert_message() {
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
Invert headings on Graphical LCD
2016-07-09 01:18:40 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_INSERT_1);
#ifdef MSG_FILAMENT_CHANGE_INSERT_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_INSERT_2);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define __FC_LINES_E 3
#else
#define __FC_LINES_E 2
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
#ifdef MSG_FILAMENT_CHANGE_INSERT_3
STATIC_ITEM(MSG_FILAMENT_CHANGE_INSERT_3);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define _FC_LINES_E (__FC_LINES_E + 1)
#else
#define _FC_LINES_E __FC_LINES_E
#endif
#if LCD_HEIGHT > _FC_LINES_E + 1
STATIC_ITEM(" ");
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
HOTEND_STATUS_ITEM();
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_load_message() {
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
Invert headings on Graphical LCD
2016-07-09 01:18:40 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_LOAD_1);
#ifdef MSG_FILAMENT_CHANGE_LOAD_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_LOAD_2);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define __FC_LINES_F 3
#else
#define __FC_LINES_F 2
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
#ifdef MSG_FILAMENT_CHANGE_LOAD_3
STATIC_ITEM(MSG_FILAMENT_CHANGE_LOAD_3);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define _FC_LINES_F (__FC_LINES_F + 1)
#else
#define _FC_LINES_F __FC_LINES_F
#endif
#if LCD_HEIGHT > _FC_LINES_F + 1
STATIC_ITEM(" ");
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
HOTEND_STATUS_ITEM();
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_extrude_message() {
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
Invert headings on Graphical LCD
2016-07-09 01:18:40 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_EXTRUDE_1);
#ifdef MSG_FILAMENT_CHANGE_EXTRUDE_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_EXTRUDE_2);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define __FC_LINES_G 3
#else
#define __FC_LINES_G 2
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
#ifdef MSG_FILAMENT_CHANGE_EXTRUDE_3
STATIC_ITEM(MSG_FILAMENT_CHANGE_EXTRUDE_3);
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
#define _FC_LINES_G (__FC_LINES_G + 1)
#else
#define _FC_LINES_G __FC_LINES_G
#endif
#if LCD_HEIGHT > _FC_LINES_G + 1
STATIC_ITEM(" ");
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
#endif
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
HOTEND_STATUS_ITEM();
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void lcd_filament_change_resume_message() {
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
START_SCREEN();
Invert headings on Graphical LCD
2016-07-09 01:18:40 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_HEADER, true, true);
Use STATIC_ITEM for LCD message display
2016-06-25 02:24:24 +00:00
STATIC_ITEM(MSG_FILAMENT_CHANGE_RESUME_1);
#ifdef MSG_FILAMENT_CHANGE_RESUME_2
STATIC_ITEM(MSG_FILAMENT_CHANGE_RESUME_2);
#endif
#ifdef MSG_FILAMENT_CHANGE_RESUME_3
STATIC_ITEM(MSG_FILAMENT_CHANGE_RESUME_3);
#endif
Fix compiler warnings for static screens
2016-07-03 22:12:21 +00:00
END_SCREEN();
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
}
Moves all global enums to a central file
2016-07-19 13:31:09 +00:00
Apply const to LCD arguments and locals
2016-11-24 06:54:21 +00:00
void lcd_filament_change_show_message(const FilamentChangeMessage message) {
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
switch (message) {
case FILAMENT_CHANGE_MESSAGE_INIT:
defer_return_to_status = true;
lcd_goto_screen(lcd_filament_change_init_message);
break;
case FILAMENT_CHANGE_MESSAGE_UNLOAD:
lcd_goto_screen(lcd_filament_change_unload_message);
break;
case FILAMENT_CHANGE_MESSAGE_INSERT:
lcd_goto_screen(lcd_filament_change_insert_message);
break;
case FILAMENT_CHANGE_MESSAGE_LOAD:
lcd_goto_screen(lcd_filament_change_load_message);
break;
case FILAMENT_CHANGE_MESSAGE_EXTRUDE:
lcd_goto_screen(lcd_filament_change_extrude_message);
break;
Improve M600 with timeout, wait for heatup.
2017-01-21 23:10:57 +00:00
case FILAMENT_CHANGE_MESSAGE_CLICK_TO_HEAT_NOZZLE:
lcd_goto_screen(lcd_filament_change_heat_nozzle);
break;
case FILAMENT_CHANGE_MESSAGE_WAIT_FOR_NOZZLES_TO_HEAT:
lcd_goto_screen(lcd_filament_change_wait_for_nozzles_to_heat);
break;
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-04-28 16:57:21 +00:00
case FILAMENT_CHANGE_MESSAGE_OPTION:
filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_WAIT_FOR;
lcd_goto_screen(lcd_filament_change_option_menu);
break;
case FILAMENT_CHANGE_MESSAGE_RESUME:
lcd_goto_screen(lcd_filament_change_resume_message);
break;
case FILAMENT_CHANGE_MESSAGE_STATUS:
lcd_return_to_status();
break;
}
}
#endif // FILAMENT_CHANGE_FEATURE
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* Functions for editing single values
*
* The "menu_edit_type" macro generates the functions needed to edit a numerical value.
*
* For example, menu_edit_type(int, int3, itostr3, 1) expands into these functions:
*
* bool _menu_edit_int3();
* void menu_edit_int3(); // edit int (interactively)
* void menu_edit_callback_int3(); // edit int (interactively) with callback on completion
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
* void _menu_action_setting_edit_int3(const char * const pstr, int * const ptr, const int minValue, const int maxValue);
* void menu_action_setting_edit_int3(const char * const pstr, int * const ptr, const int minValue, const int maxValue);
* void menu_action_setting_edit_callback_int3(const char * const pstr, int * const ptr, const int minValue, const int maxValue, const screenFunc_t callback); // edit int with callback
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
*
* You can then use one of the menu macros to present the edit interface:
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
* MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
*
* This expands into a more primitive menu item:
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
* MENU_ITEM(setting_edit_int3, MSG_SPEED, PSTR(MSG_SPEED), &feedrate_percentage, 10, 999)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
*
*
* Also: MENU_MULTIPLIER_ITEM_EDIT, MENU_ITEM_EDIT_CALLBACK, and MENU_MULTIPLIER_ITEM_EDIT_CALLBACK
*
Append units to feedrate variables
2016-07-16 01:49:34 +00:00
* menu_action_setting_edit_int3(PSTR(MSG_SPEED), &feedrate_percentage, 10, 999)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
*/
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
#define menu_edit_type(_type, _name, _strFunc, _scale) \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
bool _menu_edit_ ## _name () { \
ENCODER_DIRECTION_NORMAL(); \
if ((int32_t)encoderPosition < 0) encoderPosition = 0; \
if ((int32_t)encoderPosition > maxEditValue) encoderPosition = maxEditValue; \
if (lcdDrawUpdate) \
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
lcd_implementation_drawedit(editLabel, _strFunc(((_type)((int32_t)encoderPosition + minEditValue)) * (1.0 / _scale))); \
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
if (lcd_clicked) { \
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
*((_type*)editValue) = ((_type)((int32_t)encoderPosition + minEditValue)) * (1.0 / _scale); \
Follow-up the PR #5089 (Centralize click-handling in the LCD loop) bool feedback is no longer used
2016-11-01 23:36:02 +00:00
lcd_goto_previous_menu(); \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
} \
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
return lcd_clicked; \
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset). Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read. Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks. Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk. Conflicts: Marlin/language.h
2013-03-19 14:05:11 +00:00
} \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
void menu_edit_ ## _name () { _menu_edit_ ## _name(); } \
void menu_edit_callback_ ## _name () { if (_menu_edit_ ## _name ()) (*callbackFunc)(); } \
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
void _menu_action_setting_edit_ ## _name (const char * const pstr, _type* const ptr, const _type minValue, const _type maxValue) { \
lcd_save_previous_menu => lcd_save_previous_screen
2016-11-28 05:51:26 +00:00
lcd_save_previous_screen(); \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
\
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; \
\
editLabel = pstr; \
editValue = ptr; \
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
minEditValue = minValue * _scale; \
maxEditValue = maxValue * _scale - minEditValue; \
encoderPosition = (*ptr) * _scale - minEditValue; \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
} \
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
void menu_action_setting_edit_ ## _name (const char * const pstr, _type * const ptr, const _type minValue, const _type maxValue) { \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
_menu_action_setting_edit_ ## _name(pstr, ptr, minValue, maxValue); \
menu => screen
2016-06-11 21:19:17 +00:00
currentScreen = menu_edit_ ## _name; \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}\
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
void menu_action_setting_edit_callback_ ## _name (const char * const pstr, _type * const ptr, const _type minValue, const _type maxValue, const screenFunc_t callback) { \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
_menu_action_setting_edit_ ## _name(pstr, ptr, minValue, maxValue); \
menu => screen
2016-06-11 21:19:17 +00:00
currentScreen = menu_edit_callback_ ## _name; \
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
callbackFunc = callback; \
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
} \
typedef void _name
menu_edit_type(int, int3, itostr3, 1);
menu_edit_type(float, float3, ftostr3, 1.0);
menu_edit_type(float, float32, ftostr32, 100.0);
menu_edit_type(float, float43, ftostr43sign, 1000.0);
menu_edit_type(float, float5, ftostr5rj, 0.01);
menu_edit_type(float, float51, ftostr51sign, 10.0);
menu_edit_type(float, float52, ftostr52sign, 100.0);
Replace ftostr62sign with ftostr62rj `ftostr62sign()` is used only when displaing/editing Steps/mm. A sign is not needed - the value is always positive. Because the number part is long there is no't much place for the values name. With this PR the is one more char for the name possible.
2016-12-12 13:35:02 +00:00
menu_edit_type(float, float62, ftostr62rj, 100.0);
Tweak editable items for debugging
2016-12-04 09:51:10 +00:00
menu_edit_type(unsigned long, long5, ftostr5rj, 0.01);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* Handlers for RepRap World Keypad input
*
*/
#if ENABLED(REPRAPWORLD_KEYPAD)
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _reprapworld_keypad_move(AxisEnum axis, int dir) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
Reduce Reprapworld Keypad move code size
2016-06-04 08:09:59 +00:00
encoderPosition = dir;
switch (axis) {
case X_AXIS: lcd_move_x(); break;
case Y_AXIS: lcd_move_y(); break;
case Z_AXIS: lcd_move_z();
Fix warning in ultralcd.cpp
2016-10-23 01:08:29 +00:00
default: break;
Reduce Reprapworld Keypad move code size
2016-06-04 08:09:59 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void reprapworld_keypad_move_z_up() { _reprapworld_keypad_move(Z_AXIS, 1); }
void reprapworld_keypad_move_z_down() { _reprapworld_keypad_move(Z_AXIS, -1); }
void reprapworld_keypad_move_x_left() { _reprapworld_keypad_move(X_AXIS, -1); }
void reprapworld_keypad_move_x_right() { _reprapworld_keypad_move(X_AXIS, 1); }
void reprapworld_keypad_move_y_up() { _reprapworld_keypad_move(Y_AXIS, -1); }
void reprapworld_keypad_move_y_down() { _reprapworld_keypad_move(Y_AXIS, 1); }
void reprapworld_keypad_move_home() { enqueue_and_echo_commands_P(PSTR("G28")); } // move all axes home and wait
void reprapworld_keypad_move_menu() { lcd_goto_screen(lcd_move_menu); }
Use handle_reprapworld_keypad for keypad handling
2016-12-13 05:51:46 +00:00
inline void handle_reprapworld_keypad() {
static uint8_t keypad_debounce = 0;
if (!REPRAPWORLD_KEYPAD_PRESSED) {
if (keypad_debounce > 0) keypad_debounce--;
}
else if (!keypad_debounce) {
keypad_debounce = 2;
if (REPRAPWORLD_KEYPAD_MOVE_MENU) reprapworld_keypad_move_menu();
#if DISABLED(DELTA) && Z_HOME_DIR == -1
if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) reprapworld_keypad_move_z_up();
#endif
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) {
#if ENABLED(DELTA) || Z_HOME_DIR != -1
if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) reprapworld_keypad_move_z_up();
#endif
if (REPRAPWORLD_KEYPAD_MOVE_Z_DOWN) reprapworld_keypad_move_z_down();
if (REPRAPWORLD_KEYPAD_MOVE_X_LEFT) reprapworld_keypad_move_x_left();
if (REPRAPWORLD_KEYPAD_MOVE_X_RIGHT) reprapworld_keypad_move_x_right();
if (REPRAPWORLD_KEYPAD_MOVE_Y_DOWN) reprapworld_keypad_move_y_down();
if (REPRAPWORLD_KEYPAD_MOVE_Y_UP) reprapworld_keypad_move_y_up();
}
else {
if (REPRAPWORLD_KEYPAD_MOVE_HOME) reprapworld_keypad_move_home();
}
}
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif // REPRAPWORLD_KEYPAD
Move buzzing code to buzzr.h & buzzer.cpp (PR#2307) at least the lcd independent part from Marlin_main.cpp.
2015-06-17 14:31:14 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* Audio feedback for controller clicks
*
*/
Buzzer requires BEEPER_PIN
2016-08-02 04:10:53 +00:00
void lcd_buzz(long duration, uint16_t freq) {
#if ENABLED(LCD_USE_I2C_BUZZER)
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
lcd.buzz(duration, freq);
Buzzer requires BEEPER_PIN
2016-08-02 04:10:53 +00:00
#elif PIN_EXISTS(BEEPER)
buzzer.tone(duration, freq);
Patch up some flaws, here and there
2016-08-05 15:17:06 +00:00
#else
UNUSED(duration); UNUSED(freq);
Buzzer requires BEEPER_PIN
2016-08-02 04:10:53 +00:00
#endif
}
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
void lcd_quick_feedback() {
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
Clear LCD button state, apply timer to all Addressing #3007
2016-09-13 21:09:50 +00:00
buttons = 0;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
next_button_update_ms = millis() + 500;
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Two strategies to address a stuck buzzer
2016-07-11 02:25:23 +00:00
// Buzz and wait. The delay is needed for buttons to settle!
Buzzer requires BEEPER_PIN
2016-08-02 04:10:53 +00:00
lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(LCD_USE_I2C_BUZZER)
Two strategies to address a stuck buzzer
2016-07-11 02:25:23 +00:00
delay(10);
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#elif PIN_EXISTS(BEEPER)
Two strategies to address a stuck buzzer
2016-07-11 02:25:23 +00:00
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#endif
Conditionalize functions that rely on SDSUPPORT
2015-09-11 09:18:42 +00:00
}
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
/**
*
* Menu actions
*
*/
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void _menu_action_back() { lcd_goto_previous_menu(); }
lcd_save_previous_menu => lcd_save_previous_screen
2016-11-28 05:51:26 +00:00
void menu_action_submenu(screenFunc_t func) { lcd_save_previous_screen(); lcd_goto_screen(func); }
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void menu_action_gcode(const char* pgcode) { enqueue_and_echo_commands_P(pgcode); }
void menu_action_function(screenFunc_t func) { (*func)(); }
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
#if ENABLED(SDSUPPORT)
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void menu_action_sdfile(const char* filename, char* longFilename) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
UNUSED(longFilename);
card.openAndPrintFile(filename);
lcd_return_to_status();
}
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void menu_action_sddirectory(const char* filename, char* longFilename) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
UNUSED(longFilename);
card.chdir(filename);
encoderPosition = 0;
Fix redraw in SD Card menus
2016-12-02 00:15:58 +00:00
screen_changed = true;
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
}
#endif //SDSUPPORT
Fix updating of "bool" menu items
2016-12-20 06:51:07 +00:00
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) {UNUSED(pstr); *ptr = !(*ptr); lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-24 02:43:01 +00:00
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
menu_action_setting_edit_bool(pstr, ptr);
(*callback)();
}
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Save bytes for custom chars (Hitachi LCD)
2016-08-06 23:05:41 +00:00
#endif // ULTIPANEL
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
void lcd_init() {
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
Save bytes for custom chars (Hitachi LCD)
2016-08-06 23:05:41 +00:00
lcd_implementation_init(
#if ENABLED(LCD_PROGRESS_BAR)
true
#endif
);
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(NEWPANEL)
Apply standard pin test to buttons This is the easiest way to make button pin testing consistent without renaming all the button pins. Just make a macro especially for testing if button pins are set, since they are named consistently in the pins files.
2016-03-27 11:25:33 +00:00
#if BUTTON_EXISTS(EN1)
Fixing Rigidbot LCD Panel Support
2015-12-13 01:57:36 +00:00
SET_INPUT(BTN_EN1);
WRITE(BTN_EN1, HIGH);
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Apply standard pin test to buttons This is the easiest way to make button pin testing consistent without renaming all the button pins. Just make a macro especially for testing if button pins are set, since they are named consistently in the pins files.
2016-03-27 11:25:33 +00:00
#if BUTTON_EXISTS(EN2)
Fixing Rigidbot LCD Panel Support
2015-12-13 01:57:36 +00:00
SET_INPUT(BTN_EN2);
WRITE(BTN_EN2, HIGH);
#endif
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
Apply standard pin test to buttons This is the easiest way to make button pin testing consistent without renaming all the button pins. Just make a macro especially for testing if button pins are set, since they are named consistently in the pins files.
2016-03-27 11:25:33 +00:00
#if BUTTON_EXISTS(ENC)
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
SET_INPUT(BTN_ENC);
WRITE(BTN_ENC, HIGH);
#endif
#if ENABLED(REPRAPWORLD_KEYPAD)
Use DPM where possible
2016-10-24 10:26:30 +00:00
SET_OUTPUT(SHIFT_CLK);
OUT_WRITE(SHIFT_LD, HIGH);
SET_INPUT_PULLUP(SHIFT_OUT);
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
#endif
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
#if BUTTON_EXISTS(UP)
Using SET_INPUT instead of pinMode
2015-12-24 17:12:25 +00:00
SET_INPUT(BTN_UP);
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
#endif
#if BUTTON_EXISTS(DWN)
Using SET_INPUT instead of pinMode
2015-12-24 17:12:25 +00:00
SET_INPUT(BTN_DWN);
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
#endif
#if BUTTON_EXISTS(LFT)
Using SET_INPUT instead of pinMode
2015-12-24 17:12:25 +00:00
SET_INPUT(BTN_LFT);
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
#endif
#if BUTTON_EXISTS(RT)
Using SET_INPUT instead of pinMode
2015-12-24 17:12:25 +00:00
SET_INPUT(BTN_RT);
Fixing Rigidbot LCD Panel Support
2015-12-13 01:57:36 +00:00
#endif
Remove extraneous conditions for encoder position
2016-07-11 00:28:58 +00:00
#else // !NEWPANEL
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
#if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register
Use DPM where possible
2016-10-24 10:26:30 +00:00
SET_OUTPUT(SR_DATA_PIN);
SET_OUTPUT(SR_CLK_PIN);
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
#elif defined(SHIFT_CLK)
Use DPM where possible
2016-10-24 10:26:30 +00:00
SET_OUTPUT(SHIFT_CLK);
OUT_WRITE(SHIFT_LD, HIGH);
OUT_WRITE(SHIFT_EN, LOW);
SET_INPUT_PULLUP(SHIFT_OUT);
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
#endif // SR_LCD_2W_NL
Remove extraneous conditions for encoder position
2016-07-11 00:28:58 +00:00
#endif // !NEWPANEL
Initial SAV MkI (RepRap CloneWars board) integration. Included support for BT dongle on AT90USB boards. Added LCD Shift Register LCD control Included support for RepRap Clone Wars project board (SAV MKI).
2013-10-30 10:45:32 +00:00
SDCARDDETECT -> SD_DETECT, added docs - `SD_DETECT_PIN` replaces `SDCARDDETECT` - `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED` - Revise the description of `SD_DETECT_INVERTED` - Add a note about the override of `SD_DETECT_INVERTED` in `Conditionals.h`
2015-07-31 23:40:50 +00:00
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
Fix Printrboard with LCD (redo) Based on #2860 - rebased for RCBugFix
2016-03-06 06:03:16 +00:00
SET_INPUT(SD_DETECT_PIN);
SDCARDDETECT -> SD_DETECT, added docs - `SD_DETECT_PIN` replaces `SDCARDDETECT` - `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED` - Revise the description of `SD_DETECT_INVERTED` - Add a note about the override of `SD_DETECT_INVERTED` in `Conditionals.h`
2015-07-31 23:40:50 +00:00
WRITE(SD_DETECT_PIN, HIGH);
Give lcd_sd_status an UNKNOWN state (PR#180)
2015-09-13 23:43:14 +00:00
lcd_sd_status = 2; // UNKNOWN
Rename SDCARDDETECT to SDCARDDETECT_PIN - Rename the pin so it can be tested with `PIN_EXISTS` - Fix some incorrect tests for `SDCARDDETECT`
2015-07-31 22:09:36 +00:00
#endif
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
Changed slow buttons behavior.
2013-11-17 16:41:30 +00:00
slow_buttons = 0;
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
#endif
lcd_buttons_update();
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
2012-12-21 15:14:47 +00:00
encoderDiff = 0;
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
#endif
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Use const parameters instead of static casting Alternative fix to #3149
2016-03-19 10:36:53 +00:00
int lcd_strlen(const char* s) {
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
int i = 0, j = 0;
while (s[i]) {
use enabled macro for mapper setting
2016-07-18 19:42:41 +00:00
#if ENABLED(MAPPER_NON)
Don't use UTF-strlen() if the text is not UTF
2016-07-12 17:59:03 +00:00
j++;
#else
use enabled macro for mapper setting
2016-07-18 19:42:41 +00:00
if ((s[i] & 0xC0u) != 0x80u) j++;
Don't use UTF-strlen() if the text is not UTF
2016-07-12 17:59:03 +00:00
#endif
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
i++;
}
return j;
Fix iss#1492 Introduced lcd_strlen() and lcd_strlen_P(). Replaced the old functions where necessary. Reworked language_ru.h. Speeded up test for zero length string in cardreader.cpp
2015-02-16 12:53:58 +00:00
}
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
int lcd_strlen_P(const char* s) {
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
int j = 0;
while (pgm_read_byte(s)) {
use enabled macro for mapper setting
2016-07-18 19:42:41 +00:00
#if ENABLED(MAPPER_NON)
Moves all global enums to a central file
2016-07-19 13:31:09 +00:00
j++;
Don't use UTF-strlen() if the text is not UTF
2016-07-12 17:59:03 +00:00
#else
use enabled macro for mapper setting
2016-07-18 19:42:41 +00:00
if ((pgm_read_byte(s) & 0xC0u) != 0x80u) j++;
Don't use UTF-strlen() if the text is not UTF
2016-07-12 17:59:03 +00:00
#endif
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
s++;
}
return j;
Fix iss#1492 Introduced lcd_strlen() and lcd_strlen_P(). Replaced the old functions where necessary. Reworked language_ru.h. Speeded up test for zero length string in cardreader.cpp
2015-02-16 12:53:58 +00:00
}
Keep blinking limited to LCD_UPDATE_INTERVAL
2016-03-29 02:33:04 +00:00
bool lcd_blink() {
static uint8_t blink = 0;
static millis_t next_blink_ms = 0;
Always limit blink to ~1 second intervals
2016-04-01 21:20:47 +00:00
millis_t ms = millis();
Test time difference in safe way
2016-04-10 22:55:12 +00:00
if (ELAPSED(ms, next_blink_ms)) {
Keep blinking limited to LCD_UPDATE_INTERVAL
2016-03-29 02:33:04 +00:00
blink ^= 0xFF;
Always limit blink to ~1 second intervals
2016-04-01 21:20:47 +00:00
next_blink_ms = ms + 1000 - LCD_UPDATE_INTERVAL / 2;
Keep blinking limited to LCD_UPDATE_INTERVAL
2016-03-29 02:33:04 +00:00
}
return blink != 0;
}
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
/**
* Update the LCD, read encoder buttons, etc.
* - Read button states
* - Check the SD Card slot state
* - Act on RepRap World keypad input
* - Update the encoder position
* - Apply acceleration to the encoder position
Add nextMenu, nextEncoderPosition to change menus after handler loop
2016-04-21 02:49:00 +00:00
* - Set lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NOW on controller events
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
* - Reset the Info Screen timeout if there's any input
* - Update status indicators, if any
*
Give names to lcdDrawUpdate values
2016-04-02 23:09:56 +00:00
* Run the current LCD menu handler callback function:
More fine-grained control of LCD redraw
2016-04-09 02:52:40 +00:00
* - Call the handler only if lcdDrawUpdate != LCDVIEW_NONE
* - Before calling the handler, LCDVIEW_CALL_NO_REDRAW => LCDVIEW_NONE
Give names to lcdDrawUpdate values
2016-04-02 23:09:56 +00:00
* - Call the menu handler. Menu handlers should do the following:
Add nextMenu, nextEncoderPosition to change menus after handler loop
2016-04-21 02:49:00 +00:00
* - If a value changes, set lcdDrawUpdate to LCDVIEW_REDRAW_NOW and draw the value
* (Encoder events automatically set lcdDrawUpdate for you.)
Give names to lcdDrawUpdate values
2016-04-02 23:09:56 +00:00
* - if (lcdDrawUpdate) { redraw }
* - Before exiting the handler set lcdDrawUpdate to:
More fine-grained control of LCD redraw
2016-04-09 02:52:40 +00:00
* - LCDVIEW_CLEAR_CALL_REDRAW to clear screen and set LCDVIEW_CALL_REDRAW_NEXT.
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
* - LCDVIEW_REDRAW_NOW or LCDVIEW_NONE to keep drawing, but only in this loop.
Fix updating of "bool" menu items
2016-12-20 06:51:07 +00:00
* - LCDVIEW_CALL_REDRAW_NEXT to keep drawing and draw on the next loop also.
Add nextMenu, nextEncoderPosition to change menus after handler loop
2016-04-21 02:49:00 +00:00
* - LCDVIEW_CALL_NO_REDRAW to keep drawing (or start drawing) with no redraw on the next loop.
* - NOTE: For graphical displays menu handlers may be called 2 or more times per loop,
* so don't change lcdDrawUpdate without considering this.
Give names to lcdDrawUpdate values
2016-04-02 23:09:56 +00:00
*
* After the menu handler callback runs (or not):
More fine-grained control of LCD redraw
2016-04-09 02:52:40 +00:00
* - Clear the LCD if lcdDrawUpdate == LCDVIEW_CLEAR_CALL_REDRAW
Revert MBL menus to "known" working point
2016-04-21 19:40:22 +00:00
* - Update lcdDrawUpdate for the next loop (i.e., move one state down, usually)
Give names to lcdDrawUpdate values
2016-04-02 23:09:56 +00:00
*
* No worries. This function is only called from the main thread.
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
*/
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
void lcd_update() {
Wrap all items depending on ULTIPANEL
2016-06-11 21:12:00 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
Apply three more commits
2015-04-13 01:07:08 +00:00
static millis_t return_to_status_ms = 0;
manage_manual_move(); -> ULTIPANEL Makr the call of `manage_manual_move() ` depandent of `ULTIPANEL`
2016-06-10 21:36:57 +00:00
manage_manual_move();
Fix iss#1492 Introduced lcd_strlen() and lcd_strlen_P(). Replaced the old functions where necessary. Reworked language_ru.h. Speeded up test for zero length string in cardreader.cpp
2015-02-16 12:53:58 +00:00
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
lcd_buttons_update();
// If the action button is pressed...
if (LCD_CLICKED) {
if (!wait_for_unclick) { // If not waiting for a debounce release:
wait_for_unclick = true; // Set debounce flag to ignore continous clicks
lcd_clicked = !wait_for_user; // Keep the click if not waiting for a user-click
wait_for_user = false; // Any click clears wait for user
lcd_quick_feedback(); // Always make a click sound
}
}
else wait_for_unclick = false;
#endif
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 20:34:56 +00:00
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
Init lcd_sd_status as false to force lcd_update test Replaces #145 which is way out of date
2015-09-12 04:53:07 +00:00
bool sd_status = IS_SD_INSERTED;
if (sd_status != lcd_sd_status && lcd_detected()) {
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 20:34:56 +00:00
Give lcd_sd_status an UNKNOWN state (PR#180)
2015-09-13 23:43:14 +00:00
if (sd_status) {
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
card.initsd();
Give lcd_sd_status an UNKNOWN state (PR#180)
2015-09-13 23:43:14 +00:00
if (lcd_sd_status != 2) LCD_MESSAGEPGM(MSG_SD_INSERTED);
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
else {
card.release();
Give lcd_sd_status an UNKNOWN state (PR#180)
2015-09-13 23:43:14 +00:00
if (lcd_sd_status != 2) LCD_MESSAGEPGM(MSG_SD_REMOVED);
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
Give lcd_sd_status an UNKNOWN state (PR#180)
2015-09-13 23:43:14 +00:00
Fix: LCD displays SD status at startup
2016-08-09 03:53:18 +00:00
lcd_sd_status = sd_status;
Save bytes for custom chars (Hitachi LCD)
2016-08-06 23:05:41 +00:00
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR)
currentScreen == lcd_status_screen
#endif
);
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Conditionals for ULTIPANEL without SDSUPPORT
2015-09-05 00:40:12 +00:00
#endif //SDSUPPORT && SD_DETECT_PIN
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
Apply three more commits
2015-04-13 01:07:08 +00:00
millis_t ms = millis();
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
if (ELAPSED(ms, next_lcd_update_ms)
#if ENABLED(DOGLCD)
|| drawing_screen
#endif
) {
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
More fine-grained control of LCD redraw
2016-04-09 02:52:40 +00:00
next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
#if ENABLED(LCD_HAS_STATUS_INDICATORS)
lcd_implementation_update_indicators();
#endif
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Wrap ULTIPANEL-dependent code
2016-08-20 23:12:57 +00:00
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
slow_buttons = lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
#endif
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(REPRAPWORLD_KEYPAD)
Use handle_reprapworld_keypad for keypad handling
2016-12-13 05:51:46 +00:00
handle_reprapworld_keypad();
#endif
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
bool encoderPastThreshold = (abs(encoderDiff) >= ENCODER_PULSES_PER_STEP);
Centralize click-handling in the LCD loop
2016-10-26 06:42:52 +00:00
if (encoderPastThreshold || lcd_clicked) {
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
if (encoderPastThreshold) {
Merge in encoder multiplier
2015-02-22 04:18:49 +00:00
int32_t encoderMultiplier = 1;
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ENCODER_RATE_MULTIPLIER)
Merge in encoder multiplier
2015-02-22 04:18:49 +00:00
if (encoderRateMultiplierEnabled) {
int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP;
if (lastEncoderMovementMillis != 0) {
Cleaning up, getting rid of the fake encoder count variable.
2015-12-13 17:40:48 +00:00
// Note that the rate is always calculated between to passes through the
Merge in encoder multiplier
2015-02-22 04:18:49 +00:00
// loop and that the abs of the encoderDiff value is tracked.
float encoderStepRate = (float)(encoderMovementSteps) / ((float)(ms - lastEncoderMovementMillis)) * 1000.0;
if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ENCODER_RATE_MULTIPLIER_DEBUG)
Merge in encoder multiplier
2015-02-22 04:18:49 +00:00
SERIAL_ECHO_START;
Reduce storage requirements for strings, make some PGM
2016-06-27 23:29:35 +00:00
SERIAL_ECHOPAIR("Enc Step Rate: ", encoderStepRate);
SERIAL_ECHOPAIR(" Multiplier: ", encoderMultiplier);
SERIAL_ECHOPAIR(" ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
SERIAL_ECHOPAIR(" ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
SERIAL_EOL;
Merge in encoder multiplier
2015-02-22 04:18:49 +00:00
#endif //ENCODER_RATE_MULTIPLIER_DEBUG
}
lastEncoderMovementMillis = ms;
Allow POWER_SUPPLY 0 for no power switch
2015-03-30 23:39:47 +00:00
} // encoderRateMultiplierEnabled
Merge in encoder multiplier
2015-02-22 04:18:49 +00:00
#endif //ENCODER_RATE_MULTIPLIER
encoderPosition += (encoderDiff * encoderMultiplier) / ENCODER_PULSES_PER_STEP;
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
encoderDiff = 0;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
Apply three more commits
2015-04-13 01:07:08 +00:00
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
Optimize M600 heater status LCD items
2017-02-18 05:57:13 +00:00
lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
Reduce Reprapworld Keypad move code size
2016-06-04 08:09:59 +00:00
#endif // ULTIPANEL
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Adjust ENSURE_SMOOTH_MOVES coding style
2016-11-19 07:09:32 +00:00
// We arrive here every ~100ms when idling often enough.
// Instead of tracking the changes simply redraw the Info Screen ~1 time a second.
static int8_t lcd_status_update_delay = 1; // first update one loop delayed
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
if (
Fix #4614: currentScreen only defined with ULTIPANEL
2016-08-14 07:29:46 +00:00
#if ENABLED(ULTIPANEL)
Adjust ENSURE_SMOOTH_MOVES coding style
2016-11-19 07:09:32 +00:00
currentScreen == lcd_status_screen &&
Fix #4614: currentScreen only defined with ULTIPANEL
2016-08-14 07:29:46 +00:00
#endif
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
!lcd_status_update_delay--
Adjust ENSURE_SMOOTH_MOVES coding style
2016-11-19 07:09:32 +00:00
) {
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
lcd_status_update_delay = 9
Codestyle tweaks to ultralcd.cpp
2016-12-14 12:20:33 +00:00
#if ENABLED(DOGLCD)
+ 3
#endif
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
;
max_display_update_time--;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
}
Apply three more commits
2015-04-13 01:07:08 +00:00
Optimize handling of block_buffer_runtime() millis_t is long - divisions take for ever. Return a kind of millisecond instead of microsecond - divided by 1024 instead of 1000 for speed. (2.4% error) That does not matter because block_buffer_runtime is already a too short estimation. Shrink the return-type.
2016-12-15 11:50:22 +00:00
// then we want to use 1/2 of the time only.
uint16_t bbr2 = planner.block_buffer_runtime() >> 1;
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
#if ENABLED(DOGLCD)
Optimize handling of block_buffer_runtime() millis_t is long - divisions take for ever. Return a kind of millisecond instead of microsecond - divided by 1024 instead of 1000 for speed. (2.4% error) That does not matter because block_buffer_runtime is already a too short estimation. Shrink the return-type.
2016-12-15 11:50:22 +00:00
if ((lcdDrawUpdate || drawing_screen) && (!bbr2 || (bbr2 > max_display_update_time)))
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
#else
Optimize handling of block_buffer_runtime() millis_t is long - divisions take for ever. Return a kind of millisecond instead of microsecond - divided by 1024 instead of 1000 for speed. (2.4% error) That does not matter because block_buffer_runtime is already a too short estimation. Shrink the return-type.
2016-12-15 11:50:22 +00:00
if (lcdDrawUpdate && (!bbr2 || (bbr2 > max_display_update_time)))
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
#endif
{
Distribute GLCD screen updates in time Currently we draw and send the screens for a graphical LCD all at once. We draw in two or four parts but draw them directly behind each other. For the tested status screen this takes 59-62ms in a single block. During this time nothing else (except the interrupts) can be done. When printing a sequence of very short moves the buffer drains - sometimes until it's empty. This PR splits the screen update into parts. Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0) Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0) Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms. Previous experiments with a even better distribution of the time slots like (30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag. Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes, it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of framebuffer are saved in RAM. 13:45:59.213 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:00.213 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:01.215 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:02.215 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:03.214 : echo: #:17 >:13 s:30; #:17 >:13 s:30; S#:34 S>:26 S:60 13:46:04.214 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:05.212 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:06.212 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 03:30:36.779 : echo: #:8 >:7 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:8 >:7 s:15; S#:34 S>:27 S:61 03:30:37.778 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:9 >:7 s:16; #:8 >:6 s:14; S#:35 S>:26 S:61 03:30:38.778 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:7 s:15; S#:35 S>:26 S:61 03:30:39.777 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:8 >:8 s:16; #:8 >:6 s:14; S#:34 S>:27 S:61 03:30:40.780 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:35 S>:25 S:60 03:30:41.780 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:9 >:6 s:15; S#:36 S>:25 S:61 03:30:42.779 : echo: #:8 >:6 s:14; #:10 >:8 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:34 S>:26 S:60 03:30:43.778 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:7 s:15; #:9 >:6 s:15; S#:36 S>:26 S:62 #: draw a stripe >: transfer a stripe s: sum of of draw and transfer for one stripe S#: sum of draws for a complete screen S>: sum of transfers for a complete screen S: time to draw and transfer a complete screen
2016-11-24 20:17:25 +00:00
#if ENABLED(DOGLCD)
if (!drawing_screen)
#endif
{
switch (lcdDrawUpdate) {
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
case LCDVIEW_CALL_NO_REDRAW:
Distribute GLCD screen updates in time Currently we draw and send the screens for a graphical LCD all at once. We draw in two or four parts but draw them directly behind each other. For the tested status screen this takes 59-62ms in a single block. During this time nothing else (except the interrupts) can be done. When printing a sequence of very short moves the buffer drains - sometimes until it's empty. This PR splits the screen update into parts. Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0) Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0) Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms. Previous experiments with a even better distribution of the time slots like (30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag. Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes, it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of framebuffer are saved in RAM. 13:45:59.213 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:00.213 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:01.215 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:02.215 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:03.214 : echo: #:17 >:13 s:30; #:17 >:13 s:30; S#:34 S>:26 S:60 13:46:04.214 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:05.212 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:06.212 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 03:30:36.779 : echo: #:8 >:7 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:8 >:7 s:15; S#:34 S>:27 S:61 03:30:37.778 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:9 >:7 s:16; #:8 >:6 s:14; S#:35 S>:26 S:61 03:30:38.778 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:7 s:15; S#:35 S>:26 S:61 03:30:39.777 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:8 >:8 s:16; #:8 >:6 s:14; S#:34 S>:27 S:61 03:30:40.780 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:35 S>:25 S:60 03:30:41.780 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:9 >:6 s:15; S#:36 S>:25 S:61 03:30:42.779 : echo: #:8 >:6 s:14; #:10 >:8 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:34 S>:26 S:60 03:30:43.778 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:7 s:15; #:9 >:6 s:15; S#:36 S>:26 S:62 #: draw a stripe >: transfer a stripe s: sum of of draw and transfer for one stripe S#: sum of draws for a complete screen S>: sum of transfers for a complete screen S: time to draw and transfer a complete screen
2016-11-24 20:17:25 +00:00
lcdDrawUpdate = LCDVIEW_NONE;
break;
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
case LCDVIEW_CLEAR_CALL_REDRAW: // set by handlers, then altered after (rarely occurs here)
case LCDVIEW_CALL_REDRAW_NEXT: // set by handlers, then altered after (never occurs here?)
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
case LCDVIEW_REDRAW_NOW: // set above, or by a handler through LCDVIEW_CALL_REDRAW_NEXT
Distribute GLCD screen updates in time Currently we draw and send the screens for a graphical LCD all at once. We draw in two or four parts but draw them directly behind each other. For the tested status screen this takes 59-62ms in a single block. During this time nothing else (except the interrupts) can be done. When printing a sequence of very short moves the buffer drains - sometimes until it's empty. This PR splits the screen update into parts. Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0) Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0) Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms. Previous experiments with a even better distribution of the time slots like (30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag. Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes, it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of framebuffer are saved in RAM. 13:45:59.213 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:00.213 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:01.215 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:02.215 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:03.214 : echo: #:17 >:13 s:30; #:17 >:13 s:30; S#:34 S>:26 S:60 13:46:04.214 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:05.212 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:06.212 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 03:30:36.779 : echo: #:8 >:7 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:8 >:7 s:15; S#:34 S>:27 S:61 03:30:37.778 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:9 >:7 s:16; #:8 >:6 s:14; S#:35 S>:26 S:61 03:30:38.778 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:7 s:15; S#:35 S>:26 S:61 03:30:39.777 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:8 >:8 s:16; #:8 >:6 s:14; S#:34 S>:27 S:61 03:30:40.780 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:35 S>:25 S:60 03:30:41.780 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:9 >:6 s:15; S#:36 S>:25 S:61 03:30:42.779 : echo: #:8 >:6 s:14; #:10 >:8 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:34 S>:26 S:60 03:30:43.778 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:7 s:15; #:9 >:6 s:15; S#:36 S>:26 S:62 #: draw a stripe >: transfer a stripe s: sum of of draw and transfer for one stripe S#: sum of draws for a complete screen S>: sum of transfers for a complete screen S: time to draw and transfer a complete screen
2016-11-24 20:17:25 +00:00
case LCDVIEW_NONE:
break;
} // switch
}
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
#if ENABLED(ULTIPANEL)
#define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false
#else
#define CURRENTSCREEN() lcd_status_screen()
#endif
#if ENABLED(DOGLCD) // Changes due to different driver architecture of the DOGM display
if (!drawing_screen) {
u8g.firstPage();
drawing_screen = 1;
}
lcd_setFont(FONT_MENU);
Fix 5194 I have been a bit too radical in cleaning up this section.
2016-12-20 16:29:23 +00:00
u8g.setColorIndex(1);
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
CURRENTSCREEN();
if (drawing_screen && (drawing_screen = u8g.nextPage())) {
Codestyle tweaks to ultralcd.cpp
2016-12-14 12:20:33 +00:00
NOLESS(max_display_update_time, millis() - ms);
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
return;
}
#else
CURRENTSCREEN();
#endif
Codestyle tweaks to ultralcd.cpp
2016-12-14 12:20:33 +00:00
NOLESS(max_display_update_time, millis() - ms);
Adaptive screen updates for all kinds of displays The target here is to update the screens of graphical and char base displays as fast as possible, without draining the planner buffer too much. For that measure the time it takes to draw and transfer one (partial) screen to the display. Build a max. value from that. Because ther can be large differences, depending on how much the display updates are interrupted, the max value is decreased by one ms/s. This way it can shrink again. On the other side we keep track on how much time it takes to empty the planner buffer. Now we draw the next (partial) display update only then, when we do not drain the planner buffer to much. We draw only when the time in the buffer is two times larger than a update takes, or the buffer is empty anyway. When we have begun to draw a screen we do not wait until the next 100ms time slot comes. We draw the next partial screen as fast as possible, but give the system a chance to refill the buffers a bit. When we see, during drawing a screen, the screen contend has changed, we stop the current draw and begin to draw the new content from the top.
2016-12-12 13:35:02 +00:00
}
#if ENABLED(ULTIPANEL)
// Return to Status Screen after a timeout
if (currentScreen == lcd_status_screen || defer_return_to_status)
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
else if (ELAPSED(ms, return_to_status_ms))
lcd_return_to_status();
#endif // ULTIPANEL
#if ENABLED(DOGLCD)
if (!drawing_screen)
#endif
{
switch (lcdDrawUpdate) {
case LCDVIEW_CLEAR_CALL_REDRAW:
lcd_implementation_clear();
case LCDVIEW_CALL_REDRAW_NEXT:
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
break;
case LCDVIEW_REDRAW_NOW:
lcdDrawUpdate = LCDVIEW_NONE;
break;
case LCDVIEW_NONE:
break;
} // switch
}
Distribute GLCD screen updates in time Currently we draw and send the screens for a graphical LCD all at once. We draw in two or four parts but draw them directly behind each other. For the tested status screen this takes 59-62ms in a single block. During this time nothing else (except the interrupts) can be done. When printing a sequence of very short moves the buffer drains - sometimes until it's empty. This PR splits the screen update into parts. Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0) Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0) Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms. Previous experiments with a even better distribution of the time slots like (30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag. Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes, it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of framebuffer are saved in RAM. 13:45:59.213 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:00.213 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:01.215 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 13:46:02.215 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:03.214 : echo: #:17 >:13 s:30; #:17 >:13 s:30; S#:34 S>:26 S:60 13:46:04.214 : echo: #:16 >:13 s:29; #:16 >:14 s:30; S#:32 S>:27 S:59 13:46:05.212 : echo: #:16 >:14 s:30; #:17 >:13 s:30; S#:33 S>:27 S:60 13:46:06.212 : echo: #:17 >:13 s:30; #:16 >:13 s:29; S#:33 S>:26 S:59 03:30:36.779 : echo: #:8 >:7 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:8 >:7 s:15; S#:34 S>:27 S:61 03:30:37.778 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:9 >:7 s:16; #:8 >:6 s:14; S#:35 S>:26 S:61 03:30:38.778 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:7 s:15; S#:35 S>:26 S:61 03:30:39.777 : echo: #:8 >:6 s:14; #:10 >:7 s:17; #:8 >:8 s:16; #:8 >:6 s:14; S#:34 S>:27 S:61 03:30:40.780 : echo: #:8 >:6 s:14; #:11 >:7 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:35 S>:25 S:60 03:30:41.780 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:6 s:14; #:9 >:6 s:15; S#:36 S>:25 S:61 03:30:42.779 : echo: #:8 >:6 s:14; #:10 >:8 s:18; #:8 >:6 s:14; #:8 >:6 s:14; S#:34 S>:26 S:60 03:30:43.778 : echo: #:9 >:6 s:15; #:10 >:7 s:17; #:8 >:7 s:15; #:9 >:6 s:15; S#:36 S>:26 S:62 #: draw a stripe >: transfer a stripe s: sum of of draw and transfer for one stripe S#: sum of draws for a complete screen S>: sum of transfers for a complete screen S: time to draw and transfer a complete screen
2016-11-24 20:17:25 +00:00
} // ELAPSED(ms, next_lcd_update_ms)
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
pad string in lcd_finishstatus
2016-07-17 18:33:01 +00:00
void set_utf_strlen(char* s, uint8_t n) {
uint8_t i = 0, j = 0;
while (s[i] && (j < n)) {
Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins) ・Solve a flickering when SD card is inserted or removed at using a ASCII LCD + language_kana.h
2016-07-18 05:12:55 +00:00
#if ENABLED(MAPPER_NON)
j++;
#else
if ((s[i] & 0xC0u) != 0x80u) j++;
#endif
pad string in lcd_finishstatus
2016-07-17 18:33:01 +00:00
i++;
}
while (j++ < n) s[i++] = ' ';
s[i] = '\0';
}
Fix up LCD_PROGRESS_BAR - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.
2015-03-31 01:00:54 +00:00
void lcd_finishstatus(bool persist=false) {
pad string in lcd_finishstatus
2016-07-17 18:33:01 +00:00
set_utf_strlen(lcd_status_message, LCD_WIDTH);
suppress warnings
2016-04-02 21:28:17 +00:00
#if !(ENABLED(LCD_PROGRESS_BAR) && (PROGRESS_MSG_EXPIRE > 0))
UNUSED(persist);
#endif
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(LCD_PROGRESS_BAR)
Use millis_t for progress_bar_ms and expire_status_ms
2015-04-25 05:16:09 +00:00
progress_bar_ms = millis();
LCD Progress Bar
2014-12-28 06:26:14 +00:00
#if PROGRESS_MSG_EXPIRE > 0
Use millis_t for progress_bar_ms and expire_status_ms
2015-04-25 05:16:09 +00:00
expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
LCD Progress Bar
2014-12-28 06:26:14 +00:00
#endif
#endif
More fine-grained control of LCD redraw
2016-04-09 02:52:40 +00:00
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
LCD Progress Bar
2014-12-28 06:26:14 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(FILAMENT_LCD_DISPLAY)
Apply three more commits
2015-04-13 01:07:08 +00:00
previous_lcd_status_ms = millis(); //get status message to show up for a while
LCD Progress Bar
2014-12-28 06:26:14 +00:00
#endif
}
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
Rename expireStatusMillis to expire_status_ms
2015-04-25 04:51:10 +00:00
void dontExpireStatus() { expire_status_ms = 0; }
Fix up LCD_PROGRESS_BAR - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.
2015-03-31 01:00:54 +00:00
#endif
G4 shows status message only if no message is set already - Address issue raised in #1961
2015-04-25 03:13:01 +00:00
bool lcd_hasstatus() { return (lcd_status_message[0] != '\0'); }
Apply const to LCD arguments and locals
2016-11-24 06:54:21 +00:00
void lcd_setstatus(const char* const message, bool persist) {
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
if (lcd_status_message_level > 0) return;
Wrap macros to prevent bad expansions
2016-03-13 06:38:55 +00:00
strncpy(lcd_status_message, message, 3 * (LCD_WIDTH));
Fix up LCD_PROGRESS_BAR - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.
2015-03-31 01:00:54 +00:00
lcd_finishstatus(persist);
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Apply const to LCD arguments and locals
2016-11-24 06:54:21 +00:00
void lcd_setstatuspgm(const char* const message, uint8_t level) {
pad string in lcd_finishstatus
2016-07-17 18:33:01 +00:00
if (level < lcd_status_message_level) return;
lcd_status_message_level = level;
strncpy_P(lcd_status_message, message, 3 * (LCD_WIDTH));
lcd_finishstatus(level > 0);
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Add status_printf to print messages to the lcd status line. Also add a hotend indicator to the heating message displayed on the lcd status line.
2017-02-20 08:51:07 +00:00
void status_printf(uint8_t level, const char *status, ...) {
if (level < lcd_status_message_level) return;
lcd_status_message_level = level;
va_list args;
va_start(args, status);
vsnprintf(lcd_status_message, 3 * (LCD_WIDTH), status, args);
va_end(args);
lcd_finishstatus(level > 0);
}
Apply const to LCD arguments and locals
2016-11-24 06:54:21 +00:00
void lcd_setalertstatuspgm(const char* const message) {
Fix up LCD_PROGRESS_BAR - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.
2015-03-31 01:00:54 +00:00
lcd_setstatuspgm(message, 1);
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
lcd_return_to_status();
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
#endif
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
void lcd_reset_alert_level() { lcd_status_message_level = 0; }
Make HAS_LCD_CONTRAST a boolean flag
2016-05-31 18:47:02 +00:00
#if HAS_LCD_CONTRAST
Apply const to LCD arguments and locals
2016-11-24 06:54:21 +00:00
void set_lcd_contrast(const int value) {
Improved LCD contrast handling Based on MarlinFirmware/MarlinDev#200 from @eboston
2016-06-02 21:34:51 +00:00
lcd_contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 20:34:56 +00:00
u8g.setContrast(lcd_contrast);
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
added contrast control function for gLCDs
2013-07-14 08:28:26 +00:00
#endif
Overridable Options - Part 7 (PR#2559) Apply `ENABLED` / `DISABLED` macros to LCD-related files.
2015-07-31 05:26:53 +00:00
#if ENABLED(ULTIPANEL)
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
/**
* Setup Rotary Encoder Bit Values (for two pin encoders to indicate movement)
* These values are independent of which pins are used for EN_A and EN_B indications
* The rotary encoder part is also independent to the chipset used for the LCD
*/
#if defined(EN_A) && defined(EN_B)
#define encrot0 0
#define encrot1 2
#define encrot2 3
#define encrot3 1
Clean up spacing and comments Also clean up some trailing spaces in a few other sources
2015-06-12 11:12:55 +00:00
#endif
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Apply standard pin test to buttons This is the easiest way to make button pin testing consistent without renaming all the button pins. Just make a macro especially for testing if button pins are set, since they are named consistently in the pins files.
2016-03-27 11:25:33 +00:00
#define GET_BUTTON_STATES(DST) \
uint8_t new_##DST = 0; \
WRITE(SHIFT_LD, LOW); \
WRITE(SHIFT_LD, HIGH); \
for (int8_t i = 0; i < 8; i++) { \
new_##DST >>= 1; \
if (READ(SHIFT_OUT)) SBI(new_##DST, 7); \
WRITE(SHIFT_CLK, HIGH); \
WRITE(SHIFT_CLK, LOW); \
} \
DST = ~new_##DST; //invert it, because a pressed switch produces a logical 0
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
/**
* Read encoder buttons from the hardware registers
* Warning: This function is called from interrupt context!
*/
void lcd_buttons_update() {
Clear LCD button state, apply timer to all Addressing #3007
2016-09-13 21:09:50 +00:00
millis_t now = millis();
if (ELAPSED(now, next_button_update_ms)) {
#if ENABLED(NEWPANEL)
uint8_t newbutton = 0;
#if BUTTON_EXISTS(EN1)
if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
#endif
#if BUTTON_EXISTS(EN2)
if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
#endif
#if BUTTON_EXISTS(ENC)
if (BUTTON_PRESSED(ENC)) newbutton |= EN_C;
#endif
#if LCD_HAS_DIRECTIONAL_BUTTONS
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
Apply encoder reverse options to keypad arrows
2016-10-22 12:40:02 +00:00
// Manage directional buttons
#if ENABLED(REVERSE_MENU_DIRECTION)
#define _ENCODER_UD_STEPS (ENCODER_STEPS_PER_MENU_ITEM * encoderDirection)
#else
#define _ENCODER_UD_STEPS ENCODER_STEPS_PER_MENU_ITEM
#endif
#if ENABLED(REVERSE_ENCODER_DIRECTION)
#define ENCODER_UD_STEPS _ENCODER_UD_STEPS
#define ENCODER_LR_PULSES ENCODER_PULSES_PER_STEP
#else
#define ENCODER_UD_STEPS -(_ENCODER_UD_STEPS)
#define ENCODER_LR_PULSES -(ENCODER_PULSES_PER_STEP)
#endif
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
if (false) {
// for the else-ifs below
Cleaning up, getting rid of the fake encoder count variable.
2015-12-13 17:40:48 +00:00
}
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
#if BUTTON_EXISTS(UP)
else if (BUTTON_PRESSED(UP)) {
Apply encoder reverse options to keypad arrows
2016-10-22 12:40:02 +00:00
encoderDiff = -(ENCODER_UD_STEPS);
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
next_button_update_ms = now + 300;
}
#endif
#if BUTTON_EXISTS(DWN)
else if (BUTTON_PRESSED(DWN)) {
Apply encoder reverse options to keypad arrows
2016-10-22 12:40:02 +00:00
encoderDiff = ENCODER_UD_STEPS;
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
next_button_update_ms = now + 300;
}
#endif
#if BUTTON_EXISTS(LFT)
else if (BUTTON_PRESSED(LFT)) {
Apply encoder reverse options to keypad arrows
2016-10-22 12:40:02 +00:00
encoderDiff = -(ENCODER_LR_PULSES);
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
next_button_update_ms = now + 300;
}
#endif
#if BUTTON_EXISTS(RT)
else if (BUTTON_PRESSED(RT)) {
Apply encoder reverse options to keypad arrows
2016-10-22 12:40:02 +00:00
encoderDiff = ENCODER_LR_PULSES;
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
next_button_update_ms = now + 300;
}
#endif
Clear LCD button state, apply timer to all Addressing #3007
2016-09-13 21:09:50 +00:00
#endif // LCD_HAS_DIRECTIONAL_BUTTONS
Use directional buttons when defined
2016-05-03 19:50:49 +00:00
Clear LCD button state, apply timer to all Addressing #3007
2016-09-13 21:09:50 +00:00
buttons = newbutton;
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
buttons |= slow_buttons;
#endif
#if ENABLED(REPRAPWORLD_KEYPAD)
GET_BUTTON_STATES(buttons_reprapworld_keypad);
#endif
#else
GET_BUTTON_STATES(buttons);
#endif //!NEWPANEL
} // next_button_update_ms
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Remove extraneous conditions for encoder position
2016-07-11 00:28:58 +00:00
// Manage encoder rotation
Add REVERSE_ENCODER_DIRECTION option
2016-05-11 22:39:28 +00:00
#if ENABLED(REVERSE_MENU_DIRECTION) && ENABLED(REVERSE_ENCODER_DIRECTION)
#define ENCODER_DIFF_CW (encoderDiff -= encoderDirection)
#define ENCODER_DIFF_CCW (encoderDiff += encoderDirection)
#elif ENABLED(REVERSE_MENU_DIRECTION)
Implement reverse menu direction in ultralcd.cpp
2016-03-09 09:04:24 +00:00
#define ENCODER_DIFF_CW (encoderDiff += encoderDirection)
#define ENCODER_DIFF_CCW (encoderDiff -= encoderDirection)
Add REVERSE_ENCODER_DIRECTION option
2016-05-11 22:39:28 +00:00
#elif ENABLED(REVERSE_ENCODER_DIRECTION)
#define ENCODER_DIFF_CW (encoderDiff--)
#define ENCODER_DIFF_CCW (encoderDiff++)
Implement reverse menu direction in ultralcd.cpp
2016-03-09 09:04:24 +00:00
#else
#define ENCODER_DIFF_CW (encoderDiff++)
#define ENCODER_DIFF_CCW (encoderDiff--)
#endif
#define ENCODER_SPIN(_E1, _E2) switch (lastEncoderBits) { case _E1: ENCODER_DIFF_CW; break; case _E2: ENCODER_DIFF_CCW; }
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
uint8_t enc = 0;
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
if (buttons & EN_A) enc |= B01;
if (buttons & EN_B) enc |= B10;
if (enc != lastEncoderBits) {
Styling adjustments (PR#2668 & PR#2670) Keep "astyled" reformatting
2015-10-03 06:08:58 +00:00
switch (enc) {
Implement reverse menu direction in ultralcd.cpp
2016-03-09 09:04:24 +00:00
case encrot0: ENCODER_SPIN(encrot3, encrot1); break;
case encrot1: ENCODER_SPIN(encrot0, encrot2); break;
case encrot2: ENCODER_SPIN(encrot1, encrot3); break;
case encrot3: ENCODER_SPIN(encrot2, encrot0); break;
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
}
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
}
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
lastEncoderBits = enc;
Cleanup and fix ultralcd.cpp - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting
2015-02-22 01:38:56 +00:00
}
Activate LiquidTWI2 device detection and space-pad LCD status line.
2014-03-03 21:01:27 +00:00
Reduce code for invariant lcd_detected
2016-11-03 23:03:02 +00:00
#if (ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)) && ENABLED(DETECT_DEVICE)
bool lcd_detected() { return lcd.LcdDetected() == 1; }
Fix compile error with LCD_I2C_VIKI
2016-12-08 05:29:06 +00:00
#else
bool lcd_detected() { return true; }
Reduce code for invariant lcd_detected
2016-11-03 23:03:02 +00:00
#endif
Level Bed in Prepare submenu - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-28 02:11:25 +00:00
Rework buzzing (PR#2296) by: Moving HAS_LCD_BUZZ macro to Coditionals.h Renaming HAS_LCD_BUZZ to HAS_BUZZER to make clear is has nothing to do with the lcd. Removing the ULTRALCD condition. Moving declaration of lcd_buzz() out of the ULTRA_LCD block in ultralcd.h Moving definition of lcd_buzz() out of the ULTIPANEL block in ultralcd.cpp Renaming lcd_buzz() to buzz() to make clear is has nothing to do with the lcd. All buzzing code is now only dependent on the existence of a BEEPER-pin or the definition of a LCD_USE_I2C_BUZZER. To do: Check the conditions for the BEEPER-pin in all pin-files.
2015-06-14 22:12:02 +00:00
#endif // ULTIPANEL
Fix moves for DELTA for MANUAL_BED_LEVELING - Use `line_to_current` in place of `plan_buffer_line`
2015-04-09 11:32:14 +00:00
#endif // ULTRA_LCD
Reference in New Issue Copy Permalink