3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
878 Commits 3 Branches 78 Tags 40 MiB
e5faba7226
Commit Graph

878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PavelSindler
e5faba7226 serial port set back (was previously changed for debugging purposes) 2018-03-15 14:42:03 +01:00
PavelSindler
08ec920d33 merge with upstream 2018-03-15 14:25:17 +01:00
XPila
42e902e41a
Merge pull request #557 from XPila/MK3 
version=3.2.0-alpha buildnumber=370 repository=Unknown
 2018-03-14 16:35:09 +01:00
Robert Pelnar
4bc1671953 version=3.2.0-alpha buildnumber=370 repository=Unknown 2018-03-14 16:33:50 +01:00
XPila
26754cc95c
Merge pull request #556 from XPila/MK3 
Disabled force selftest
 2018-03-14 16:26:27 +01:00
Robert Pelnar
67e90b576a Disabled force selftest 
XYZ calibration tunning
 2018-03-14 16:25:32 +01:00
PavelSindler
863fe1f054 show message that printer is not connected to monitoring on printer start 2018-03-14 15:35:39 +01:00
XPila
8e44d12ac7
Merge pull request #555 from XPila/MK3 
MK2-25-3 variant files
 2018-03-14 13:57:59 +01:00
Robert Pelnar
3ff5686336 MK2-25-3 variant files 2018-03-14 13:53:36 +01:00
XPila
9b630bdc53
Merge pull request #554 from XPila/MK3 
MK3+MK25+MK2
 2018-03-13 23:17:03 +01:00
Robert Pelnar
2f98ac989a Variant file for MK2 + cond. translation 2018-03-13 23:14:44 +01:00
Robert Pelnar
81cd96b8fe Variant file for MK25 + cond. translation 2018-03-13 23:02:46 +01:00
Robert Pelnar
c163d8a9f7 Variant file for MK3 2018-03-13 22:40:20 +01:00
XPila
a1d917b699
Merge pull request #553 from XPila/MK3 
Mk3 - merged branch MK25
 2018-03-13 20:47:38 +01:00
Robert Pelnar
46cecb1bdf deleted unused file 2018-03-13 20:44:06 +01:00
Robert Pelnar
ac1a56b493 Merge branch 'MK25' into MK3 2018-03-13 20:43:19 +01:00
PavelSindler
27cc5e51c3 removed duplicit declaration of prusa_statistics function 2018-03-13 19:12:36 +01:00
PavelSindler
5d389a2c36 Farm mode: when print finishes, ask which filament was used for print; statistics modified 2018-03-13 19:11:02 +01:00
PavelSindler
a3ad74a6be status screen fix 2018-03-13 19:08:19 +01:00
PavelSindler
8ec3c0fd7e removed "Printer disconnected" message 2018-03-13 18:50:56 +01:00
PavelSindler
f45f206faf sorting files disabled in farm mode, start printer status needs reponse from monitoring 2018-03-13 18:50:11 +01:00
PavelSindler
ddeb7b8c84 statistics improved, initial version of function which forces user to connect printer to monitoring 2018-03-13 18:43:42 +01:00
Robert Pelnar
16f9f35451 static_assert replaced with error directive 2018-03-13 16:47:38 +01:00
PavelSindler
0c97f46f25
Merge pull request #551 from XPila/MK3-new_xyz_cal 
New XYZ calibration with image processing
 2018-03-13 16:17:50 +01:00
XPila
a23ac6db7d
Merge pull request #550 from mkbel/safety_timer_MK3 
Safety timer (disable heaters after 15min idle)
 2018-03-13 15:03:45 +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
PavelSindler
98e96c9182
Merge pull request #457 from bubnikv/MK3_fast_dbg 
Mk3 fast dbg
 2018-03-13 14:13:29 +01:00
Robert Pelnar
65a91b366d New XYZ calibration with image processing 2018-03-13 12:55:35 +01:00
Marek Bel
6b08cdeaf1 Safety timer (disable heaters after 15min idle) 2018-03-12 23:45:10 +01:00
Marek Bel
262e800db7 Safety timer (disable heaters after 15min idle) 2018-03-12 23:35:50 +01:00
XPila
f7944c3821
Merge pull request #541 from XPila/MK3 
version changed
 2018-03-09 14:24:26 +01:00
Robert Pelnar
66dc65ecd4 version changed 2018-03-09 14:15:47 +01:00
PavelSindler
dd771b1481
Merge pull request #539 from PavelSindler/MK3_for_merging 
version changed
 2018-03-08 15:19:13 +01:00
PavelSindler
d512c9c9c2 version changed 2018-03-08 14:48:01 +01:00
PavelSindler
20031fb252
Merge pull request #538 from XPila/MK3 
Temperature calibration - remove steel
 2018-03-07 22:11:19 +01:00
Robert Pelnar
976e5a6a19 Temperature calibration - remove steel 2018-03-07 21:45:55 +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
XPila
fb5b7e9f7d
Merge pull request #535 from PavelSindler/x_axis_fix 
Dont use homing currents in axis selftest
 2018-03-07 20:46:34 +01:00
PavelSindler
abb9aa0a16 not using homing currents in axis selftest 2018-03-07 20:42:15 +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