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

863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
33a7723fba
Merge pull request #533 from bubnikv/M221_fix 
Fix of a regression bug, caused by pre-calculating the extrudemultiply
 2018-03-07 16:03:50 +01:00
bubnikv
fb4230f80d 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 15:46:46 +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