Robert Pelnar
bd0eebcfbb
Merge remote-tracking branch 'upstream/MK25' into MK25
2018-03-27 15:46:22 +02:00
Robert Pelnar
1850a57b72
Revert "New XYZ calibration with image processing"
...
This reverts commit 18b76d17db .
2018-03-27 15:39:35 +02:00
Robert Pelnar
18b76d17db
New XYZ calibration with image processing
2018-03-26 14:11:15 +02:00
PavelSindler
425450b381
Merge pull request #573 from PavelSindler/remove_steel
...
commit nr changed
2018-03-20 21:38:34 +01:00
PavelSindler
39dc0fc17b
commit nr changed
2018-03-20 21:37:41 +01:00
XPila
f077134e8a
Merge pull request #572 from PavelSindler/remove_steel
...
temp cal: remove steel sheet
2018-03-20 21:23:56 +01:00
PavelSindler
b15fec6d4c
version
2018-03-20 21:20:10 +01:00
PavelSindler
b0fc0039f0
mesh bed leveling / auto home Y coordinates updated
2018-03-20 21:18:19 +01:00
PavelSindler
c43062b661
make space for removing steel sheet
2018-03-20 20:41:13 +01:00
PavelSindler
b75ca49cdc
reverted
2018-03-20 20:01:36 +01:00
PavelSindler
49f56b34c8
auto home and mesh bed calibration points corrected
2018-03-20 19:02:26 +01:00
PavelSindler
2b78394516
Merge pull request #571 from PavelSindler/MK25_selftest
...
commit nr changed, default repository changed to unknown
2018-03-20 14:05:17 +01:00
PavelSindler
16c3f0f14c
commit nr changed, default repository changed to unknown
2018-03-20 14:02:59 +01:00
PavelSindler
3b7ff89d47
Merge pull request #570 from PavelSindler/MK25_selftest
...
steppers mode translation
2018-03-20 13:58:10 +01:00
PavelSindler
6ffeab418c
steppers mode translation
2018-03-20 13:55:59 +01:00
PavelSindler
6f1d3ddf8d
Merge pull request #569 from PavelSindler/MK25_selftest
...
version changed
2018-03-20 13:43:51 +01:00
PavelSindler
db8cfc352f
version changed
2018-03-20 13:43:05 +01:00
PavelSindler
d0e471306b
Merge pull request #568 from PavelSindler/MK25_selftest
...
disable safety timer
2018-03-20 11:53:11 +01:00
PavelSindler
d24a894531
disable safety timer
2018-03-20 11:52:19 +01:00
XPila
701dc55f4e
Merge pull request #549 from mkbel/safety_timer
...
Safety timer (disable heaters after 15min idle)
2018-03-13 15:02:09 +01:00
XPila
f487691070
Merge pull request #536 from mkbel/menu_return
...
Menu return
2018-03-13 14:30:48 +01:00
Marek Bel
262e800db7
Safety timer (disable heaters after 15min idle)
2018-03-12 23:35:50 +01:00
PavelSindler
edb3764c62
Merge pull request #537 from PavelSindler/MK25_selftest
...
changed version
2018-03-07 21:02:56 +01:00
PavelSindler
b902d91760
changed version
2018-03-07 21:02:07 +01:00
Marek Bel
b41d680adf
Replace problematic character in comment.
2018-03-07 20:58:15 +01:00
Marek Bel
8ff028820a
Remove redundant parameter.
2018-03-07 20:55:01 +01:00
Marek Bel
2a53686d2f
Document valid usage of lcd_goto_menu(), remove redundant parameter.
2018-03-07 20:40:59 +01:00
Marek Bel
1aba608133
Document valid usage of lcd_goto_menu(), wrap lcd_second_serial_set() by HAS_SECOND_SERIAL_PORT macro.
2018-03-07 18:30:33 +01:00
Marek Bel
0c961dedc4
Reset menu stack in lcd_return_to_status().
...
Mark menuStack.reset() as redundant in lcd_status_screen(), but leave it there to be sure.
2018-03-07 18:15:24 +01:00
Marek Bel
716098c434
Preserve position in menu move axis Extruder.
2018-03-07 17:27:27 +01:00
Marek Bel
d0a98dc6cc
Document valid usage of lcd_goto_menu().
2018-03-07 17:18:10 +01:00
Marek Bel
0871925353
Remove special handling of lcd_move_z after long button press. Convert lcd_move_z after long button press to ordinary menu_action_submenu.
...
Known bug (feature) is, that with current maximum stack depth, when long press is activated in menu > settings > move axis > Move X and then Move Z is deactivated, menu is returned to "move axis" and not to "Move X".
2018-03-07 17:03:17 +01:00
Marek Bel
77c3d7d7f7
Review and document lcd_adjust_bed_reset() lcd_goto_menu() usage.
2018-03-07 16:47:20 +01:00
PavelSindler
f41584524e
Merge pull request #534 from PavelSindler/M221_fix
...
Fix of a regression bug, caused by pre-calculating the extrudemultiply
2018-03-07 16:13:16 +01:00
bubnikv
6ba07a358b
Fix of a regression bug, caused by pre-calculating the extrudemultiply
...
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
2018-03-07 16:08:19 +01:00
PavelSindler
1566487cbd
Merge pull request #532 from XPila/MK25
...
SafetyTimer disabled
2018-03-07 14:16:52 +01:00
Robert Pelnar
e3967e444b
SafetyTimer disabled
...
Watchdog disabled
watchdog.cpp and watchdog.h source code removed (using directly <avr/wdt.h>)
2018-03-07 14:13:34 +01:00
Marek Bel
b7df176a46
Preserve position in menu Live adjust Z.
2018-03-06 22:45:47 +01:00
Marek Bel
ed0e7a8b58
Preserve position in menu move axis.
2018-03-06 21:27:06 +01:00
Marek Bel
020269a83c
Fix unable to go back from main menu to status screen.
2018-03-06 21:26:14 +01:00
Marek Bel
e551ed1f6e
Replace lcd_goto_menu(...) by menu_action_back() in lcd_menu_fails_stats();
2018-03-06 19:51:13 +01:00
Marek Bel
235803bc2a
Move encoder stack to separate class MenuStack. Add menu record to MenuStack.
...
It was needed to add menuFunc_t menu to stack, as in some places in menu, it is impossible to hardcode parent menu. Example: lcd_babystep_z can be invoked both from main_menu() and settings_menu() depending on printer status.
2018-03-06 19:47:27 +01:00
XPila
55065cf124
Merge pull request #530 from PavelSindler/temp_cal_fix
...
steps per unit changed to 0.95%; changed temp cal. warnings, changed …
2018-03-06 18:26:37 +01:00
PavelSindler
c986ac14ec
pinda thermistor pin changed
2018-03-06 18:09:25 +01:00
PavelSindler
27659ae69e
steps per unit changed to 0.95%; changed temp cal. warnings, changed pin for PINDA probe
2018-03-06 16:48:39 +01:00
Robert Pelnar
e906405662
Merge remote-tracking branch 'upstream/MK25' into MK25
2018-03-06 15:12:34 +01:00
Robert Pelnar
a6f900fd3c
Merge remote-tracking branch 'upstream/MK25' into MK25
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-03-06 15:11:50 +01:00
PavelSindler
366268412b
Merge pull request #529 from PavelSindler/M221_fix
...
Fix of calculate_extrusion_multipliers().
2018-03-06 13:04:49 +01:00
bubnikv
2b7e50e45b
Fix of calculate_extrusion_multipliers().
...
This is a fix of a bug made in the previous commit.
2018-03-06 13:03:38 +01:00
PavelSindler
54749cbcba
Merge pull request #524 from mkbel/Add_fail_stats
...
Add fail statistics menu item for MK25.
2018-03-06 11:55:22 +01:00