584d147a02
fixup the indentation
8 years ago
e443e0e2a9
Fix scoping issues for double click to Z-Babystepping
8 years ago
17d1cd7c09
Double Click of Encoder Wheel Jumps to Z-BabyStepping
8 years ago
cd68380ce6
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.
8 years ago
6e0b3fcc08
Optimize M600 heater status LCD items
8 years ago
d9dcef8a87
Spacing, coding standards
8 years ago
8bf0b496b9
Improve M600 with timeout, wait for heatup.
8 years ago
c40fe2113c
Fix for broken MBL
...
LCD call was waiting forever, causing the system to hang.
8 years ago
4d4745c0eb
Parenthesize some menu defines for safety
8 years ago
a561bd5e3a
New feature: SDCARD_SORT_ALPHA
8 years ago
e44294bb4d
Make HOTEND_LOOP more consistent, let compiler optimize it
8 years ago
1bc5be3bdf
Cast DELTA_PRINTABLE_RADIUS to float in sq()
...
Addressing #5625
8 years ago
fb3c30e24c
Fix lcd_wait_for_homing causing menu to block
...
As a showcase function for how to do waiting in the lcd menu, this function should be preserved.
8 years ago
f8ae0fd29f
Merge pull request #5647 from manianac/RCBugFix-PrepareMenuFix
...
Fix empty Prepare menu
8 years ago
aab5118c6a
Remove error causing break command
...
Use index macro instead of e
8 years ago
306c184b1a
Allow M600 when dryrun debugging
8 years ago
61f15ef7e7
Fix 5194
...
I have been a bit too radical in cleaning up this section.
8 years ago
1a26ce1cdc
Merge pull request #5550 from FHeilmann/patch-2
...
Allow negative retract values in the LCD
8 years ago
1cba425308
Allow negative recover-swap length from LCD
8 years ago
644f45cbd8
Merge pull request #5563 from akaJes/m600
...
FILAMENT_CHANGE_FEATURE allowed in idle mode
8 years ago
0d2fc13516
Place "Level Bed" closer to "Auto Home"
8 years ago
b031d28ebf
Encoder events should not skip stripes
8 years ago
22881f38b9
Fix updating of "bool" menu items
8 years ago
eb68715b94
No "Cooldown" menu if heaters are off
8 years ago
4ed976b5ff
m600 fixes
8 years ago
18ba31e9b5
Add Debug Menu with LCD_PROGRESS_BAR_TEST as an example
8 years ago
a7334fd2a0
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.
8 years ago
292eb365c6
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.
8 years ago
67ca6c7bfe
Codestyle tweaks to ultralcd.cpp
8 years ago
d0e24e0876
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.
8 years ago
0772c8e55f
Merge pull request #5487 from thinkyhead/rc_easier_move_axis
...
Rearrange Move Menu, Fix up Delta Calibration
8 years ago
93b2833347
Move Menu: Select axis first, resolution after
8 years ago
641e0936d4
Patch up Delta Calibration Menu
8 years ago
b4dbf4d18a
Non-reentrant "Moving..." screen to safely wait in LCD
8 years ago
2b5d424394
Use handle_reprapworld_keypad for keypad handling
8 years ago
cd2b74e88d
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.
8 years ago
a298a58684
Remove redundant "E"
8 years ago
3fb43c11fc
Fix compile error with LCD_I2C_VIKI
8 years ago
01e5d46ea7
Patch some planner compile errors
8 years ago
a6fbd4a5d8
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
8 years ago
4bafdf4b66
Support DISTINCT_E_FACTORS in LCD Motion Menu
8 years ago
0b53d78046
Tweak editable items for debugging
8 years ago
b0361ebe4f
Merge pull request #5343 from thinkyhead/rc_invert_case_light
...
Allow case light pin to be active low
8 years ago
f60b4f8659
Allow case light pin to be active low
8 years ago
d07229f185
Fix redraw in SD Card menus
8 years ago
a69b1ee691
Merge pull request #5313 from thinkyhead/rc_fix_menu_actions
...
Keep drawing menu unless screen changes
8 years ago
32ee3acf86
Merge pull request #5315 from thinkyhead/rc_fixup_material_menus
...
Refine material heatup menu items
8 years ago
c70a06daf1
lcd_save_previous_menu => lcd_save_previous_screen
8 years ago
13ea43cc8d
Only exit menu handler when the screen changes
8 years ago
f45b6a7762
Merge pull request #5314 from thinkyhead/case_light_menu_fix
...
Fix and optimize case-light code
8 years ago
0951d385ce
Don't set heater temperature above its maximum
8 years ago
c9193e856d
Limit preheat parameters based on all nozzles
8 years ago
bb4529f7d2
PLA / ABS => Material 1 / 2
8 years ago
61437d988a
Fix and optimize case-light code
8 years ago
7a9fa78822
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)
8 years ago
71842b6a17
Apply const to LCD arguments and locals
8 years ago
2a9b3376a9
Merge pull request #5289 from thinkyhead/rc_which_menu_actions
...
Drop "static" keyword in ultralcd.cpp function declarations
8 years ago
b97dafe4b8
Drop "static" keyword in ultralcd.cpp function declarations
8 years ago
d891324830
Merge pull request #5258 from mosh1/mbl_speed_fix
...
Fix z feedrate value when doing mesh bed leveling. probe feedrate use…
8 years ago
7f8133a51f
Merge pull request #5255 from Kaibob2/CaseLightMenu
...
Case light menu (3rd attempt)
8 years ago
0c341f0c50
Added Menu entry for Case light
8 years ago
7b836a4000
Introduce a +1234.56 format for over 999 steps/mm
8 years ago
29b174bfb9
Fix z feedrate value when doing mesh bed leveling. probe feedrate uses XY_PROBE_SPEED
8 years ago
2cc32d85a3
Adjust ENSURE_SMOOTH_MOVES coding style
8 years ago
de89dc9f04
Ensure smooth print moves even with LCD enabled
...
lcd_update can take so much time that the block buffer gets drained if
there are only short segments. This leads to jerky printer movements for
example in circles and a bad print quality.
This change implements a simple check: Only if the block currently
executed is long enough, run lcd_update.
This also means the printer will not show actual values on the LCD nor
will it respond to buttons pressed. A option that keeps the menu
accessible is also available.
Aditionaly, slow down if a block would be so fast that adding a new
block to the buffer would take more time. In this case, the buffer would
drain until it's empty in worst case.
8 years ago
8e8b4398f3
Printer Stats / Completed prints line doesn't fit in display (when german)
8 years ago
7780052fb3
Give instant feedback for filament change
8 years ago
00662b8635
Minor babystep cleanup patches
8 years ago
cad792e702
Reduce code for invariant lcd_detected
8 years ago
c8c1a28f6f
Follow-up the PR #5089 (Centralize click-handling in the LCD loop)
...
bool feedback is no longer used
8 years ago
1a2310c494
Make LCD preheat vars an array to reduce code size
8 years ago
50ee749082
Centralize click-handling in the LCD loop
8 years ago
9cbedab91b
Use DPM where possible
8 years ago
4b056d8184
Fix warning in ultralcd.cpp
8 years ago
8b967a9ff0
Merge pull request #5058 from thinkyhead/rc_reverse_arrow_buttons
...
Apply encoder reverse options to keypad arrows
8 years ago
e151f952a3
Apply encoder reverse options to keypad arrows
8 years ago
0bd66807b2
fixed warning: extra ;
8 years ago
d35dc407a8
fixed warning: ISO C99 requires rest arguments to be used
8 years ago
c2b51af3ba
fixed warning: ISO C does not permit named variadic macros
8 years ago
0d3fc7dd89
Merge pull request #5059 from gcormier/fixbaby
...
Set defer delay back to false when exiting babystepping.
8 years ago
0009725637
Set defer delay back to false when exiting babystepping.
8 years ago
0908329d96
Merge pull request #5057 from thinkyhead/rc_mbl_lcd_logical
...
Fix manual leveling coordinates
8 years ago
1165e83263
MBL coordinates are logical
8 years ago
b19bba275f
No LCD timeout during babystepping
...
As requested in #5031
8 years ago
d963020532
Sort out some header dependencies
8 years ago
f8199b2cc1
Merge pull request #4982 from thinkyhead/rc_abl_bugfix
...
Fix planner with kinematics, delta ABL
8 years ago
f8c2473a71
Improve planner kinematics, fix delta ABL
8 years ago
ff6b23cb0f
Fix an issue with shifted LCD lines
8 years ago
a1b50f1102
Cleanup of code style
8 years ago
13c9dcc600
Add LCD menu for DAC
8 years ago
c592ccb6f5
Patch max_jerk[Z] menu item
8 years ago
d19cfcfc1d
max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK
8 years ago
850259bb25
Watch bed temp also for Control menu item
8 years ago
ea0dbee3c9
Enable ABL by type, support bilinear on cartesian
8 years ago
145d9005d1
Fix BLTOUCH string and SERVO_DELAY
8 years ago
13523cbf29
Fix and extend BLTouch support
8 years ago
f38a33a5d8
Add handling of BLTouch error state
8 years ago
9429c7db89
Use ABC indices in delta[]
8 years ago
83a41c7ceb
Remove SCARA axis_scaling
8 years ago
5ecc7d9f25
Clear LCD button state, apply timer to all
...
Addressing #3007
8 years ago
6ab54c60b1
Add conditionals for kinematics, leveling
8 years ago
e354cf5884
Apply sw_endstops_enabled to manual move
8 years ago
71319adbb8
Wrap ULTIPANEL-dependent code
8 years ago
305913545e
Move number-to-string function to utility.*
8 years ago
628dcbc764
extruder_multiplier => flow_percentage
8 years ago
132322e4d9
Fix #4614 : currentScreen only defined with ULTIPANEL
8 years ago
405afec393
Include decimeters in filamentUsed display
8 years ago
432e9a1f50
Use configured feedrates, center for DELTA_CALIBRATION_MENU
8 years ago
58c8e6cef2
Fixes #4576 : Convert filamentUsed to long for display
8 years ago
3be4511230
Patch command order in delta calibration menu
8 years ago
88540d8ecf
Fix: LCD displays SD status at startup
8 years ago
b16ea09498
Make DELTA_CALIBRATION_MENU more universal
8 years ago
42927530fe
Explicitly clear the screen in lcd_goto_screen
9 years ago
a6d2c2479f
Minor cleanup of lcd_goto_screen calls
9 years ago
e47c8b9829
Save bytes for custom chars (Hitachi LCD)
9 years ago
938e6d15c4
Patch up some flaws, here and there
9 years ago
7e2bd9a233
Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT
9 years ago
c9123adc59
Improved SCREEN / MENU macros
9 years ago
3cccaa9885
Allow encoder pulse/step override for more LCDs
9 years ago
330f82971b
Buzzer requires BEEPER_PIN
9 years ago
38af251b91
Use a default argument in _lcd_move_e
9 years ago
63fd1f49a6
PID_EXTRUSION_SCALING, disabled by default
9 years ago
ad68b4cb8b
Followup to #4468
9 years ago
696b63e300
Specify manual-movable E axes by extruder type
9 years ago
b7b7c90477
Merge pull request #4389 from thinkyhead/rc_optimize_planner
...
Optimize planner with precalculation, etc.
9 years ago
f8b5749235
Replace division in planner with multiplication
9 years ago
62d96d72f3
Renamed timestamp_t to duration_t
9 years ago
1766b990b8
Merge pull request #4376 from jbrazio/timestamp_t-short
...
Adds short format to timestamp_t
9 years ago
9e5dbf67e8
Update the stats menu to include longest job and extruded filament
9 years ago
b4aad85c9a
Rework stats menu to use timestamp_t
9 years ago
d5e2d523c7
Generalize kinematics function names
9 years ago
0432613ad7
use enabled macro for mapper setting
9 years ago
2bad02e60d
Reprapworld Keypad: F1 opens the Move Axis menu
9 years ago
eaa6f568ee
Prevent re-entrant call of Reprapworld Keypad handler
9 years ago
06ac1f3bcf
Reduce Reprapworld Keypad move code size
9 years ago
8a2efd1155
Rename ultralcd implementation files for consistency
9 years ago
c502018eab
Merge pull request #4353 from jbrazio/global-enum-file
...
General cleanup: enum
9 years ago
3ebad4e020
Moves all global enums to a central file
9 years ago
361307831e
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
9 years ago
f242aea032
Merge pull request #4319 from thinkyhead/rc_feedrates_to_mess_with_you
...
Wrangle feed rate variables
9 years ago
9f9fe043ba
Apply sq macro throughout
9 years ago
93ba5bddd7
Append units to feedrate variables
9 years ago
94955a8bf7
pad string in lcd_finishstatus
9 years ago
05da02f0a2
Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER
9 years ago
9766e24504
Merge pull request #4277 from thinkyhead/rc_mks_13_viki2
...
Support for VIKI2 with MKS 1.3 / 1.4
9 years ago
aaa0d298b9
Merge pull request #4326 from thinkyhead/rc_no_static_items_fix
...
Suppress compiler warnings in ultralcd.cpp
9 years ago
2d7fe9dc78
LCD Longer print
9 years ago
d53dcaa796
Suppress some compiler warnings
9 years ago
95ab2fd3ae
Fix skipping of static items
9 years ago
c5e51f6b96
finished => completed
9 years ago
e481b79af1
Allow stopwatch and printcounter to go over 18 hours
9 years ago
2224032568
Merge pull request #4285 from thinkyhead/rc_manual_move_fast_fine
...
No delay for the smallest LCD moves
9 years ago
a8b6b6a128
Merge pull request #4252 from thinkyhead/rc_rename_hpb
...
Replace PLA/ABS preheating with generic
9 years ago
ecd5e810ac
No delay for the smallest LCD moves
9 years ago
2b9515d60f
Merge pull request #4281 from AnHardt/lang-system
...
Don't use UTF-strlen() if the text is not UTF
9 years ago
e9f62d8fdb
Remove extraneous conditions for encoder position
9 years ago
54d35230df
Don't use UTF-strlen() if the text is not UTF
9 years ago
4865447830
Merge pull request #4276 from esenapaj/Suppress-warnings
...
Suppress warnings
9 years ago
6e68dd292b
Merge pull request #4243 from thinkyhead/rc_fix_static_scrolling
...
Improve STATIC_ITEM implementation
9 years ago
d17b161832
Don't draw current screen if simply changing screens
9 years ago
096f9981d1
Scroll to the top when changing screens
9 years ago
155af6b861
Rename vars, add comments for menu macros
9 years ago
31f2cf5f6f
Make encoderLine signed for proper compares
9 years ago
d2099fef0d
Left-justify thermistor info
9 years ago
85aeb02aa6
Invert headings on Graphical LCD
9 years ago
13dc619f43
Scroll static screens more simply
9 years ago
5051723c2e
Redraw after cursor correction in STATIC_ITEM
9 years ago
58177a1602
Suppress warnings
9 years ago
10ebf28ee3
Allow override of ENCODER_FEEDRATE_DEADZONE, lower default for Viki
9 years ago
6121c9018a
Merge pull request #4265 from thinkyhead/rc_buzzer_patchup
...
Two strategies to address a stuck buzzer
9 years ago
71674059c3
Two strategies to address a stuck buzzer
9 years ago
eaf9e615ce
Total print time for LCD correction (hours:minutes format)
9 years ago
f9e08b1fcd
Merge pull request #4254 from AnHardt/killscreen
...
Add a kill-screen
9 years ago
faac2bcfdb
Add a kill-screen
9 years ago
1026e5b071
Replace PLA/ABS preheating with generic
9 years ago
de3a169336
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
...
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
Always make a potential rise to `home_offset[Z_AXIS]` possible in G28.
Get rid of some very ugly constructs in MBL (ultralcd.cpp).
9 years ago
834ad14c8d
Add quickstop_stepper to update current position with stepper.quick_stop()
9 years ago
160a2be117
Change cancel_heatup to wait_for_heatup
9 years ago
ef8980bfa0
Shorter labels for Print Stats info
9 years ago
2ed625dafa
Fix compiler warnings for static screens
9 years ago
982f10e6a0
Use STATIC_ITEM for LCD message display
9 years ago
43ff0ce35f
Rewritten FILAMENT_CHANGE_ENABLE feature
9 years ago
51b7820686
Patch up About Printer sub-menus
9 years ago
7a377c1d75
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.
9 years ago
bd491818d6
Reduce storage requirements for strings, make some PGM
9 years ago
da88b00585
MBL: Add support for max z endstop
...
See https://github.com/MarlinFirmware/Marlin/issues/4088
9 years ago
74878d1f16
Always do a brief delay in `lcd_quick_feedback`
9 years ago
bb9c67b4b5
Tweak some feedrate vars
9 years ago
bbf5b486c3
Add an SD Card stop function, use in ultralcd
9 years ago
1000563d80
Make M851 standard with a bed probe
9 years ago
114d9db7d0
Show babysteps on the LCD in mm, not steps
9 years ago
c2b7ef1e7e
"e" was renamed to "eindex" in a previous commit
9 years ago
4d2119f83a
_lcd_move => _lcd_move_xyz
9 years ago
811967923a
Fix manual_move to move the correct E stepper
9 years ago
b322ac4417
No need to check ULTIPANEL with DOGLCD
9 years ago
ae9b09fe94
menu => screen
9 years ago
45ea8749d3
Wrap all items depending on ULTIPANEL
9 years ago
378ff92e98
manage_manual_move(); -> ULTIPANEL
...
Makr the call of `manage_manual_move() ` depandent of `ULTIPANEL`
9 years ago
e2d4919c01
Merge pull request #3991 from thinkyhead/rc_axis_units
...
Rename some vars to clarify their relationship to acceleration
9 years ago
5b5aa1572b
Non-blocking buzzer
9 years ago
Roxy-3D