Commit Graph

2839 Commits

Author SHA1 Message Date
DRracer
83578c3389 documentation + minor code cleanup based on code review 2019-06-06 15:50:13 +02:00
DRracer
5985c0608e Revert changes to pins_Einsy_1_0.h not related to the fan check error
fix
2019-06-03 09:02:27 +02:00
DRracer
09fee4e64d remove fan error simulation automaton 2019-05-31 11:30:30 +02:00
DRracer
6755791778 Fix repeated fan error checking 2019-05-31 11:29:11 +02:00
DRracer
adb5baa12b Merge remote-tracking branch 'upstream/MK3' into MK3 2019-05-31 11:05:24 +02:00
DRracer
ebfad55617
Merge pull request #1888 from mkbel/always_cut_independent
Always cut independent
2019-05-31 07:00:37 +02:00
DRracer
e05e4be89b
Merge pull request #1887 from mkbel/fix_cut_menu
Fix cut filament menu item labels.
2019-05-31 06:56:17 +02:00
Marek Bel
00da4640e2 Document. 2019-05-30 23:29:33 +02:00
Marek Bel
e79c203c96 Do not always cut if it is not enabled from menu. 2019-05-30 23:04:06 +02:00
Marek Bel
ccb649b1f6 Add always cut experimental / for testing feature. 2019-05-30 23:03:59 +02:00
Marek Bel
18122049a6 Fix cut filament menu item labels. 2019-05-30 19:36:10 +02:00
DRracer
1c619133a3
Merge pull request #1880 from NotaRobotexe/power_panic
PFW-828  add uvlo tiny z positio back
2019-05-28 14:29:13 +02:00
NotaRobotexe
bcb6129c29 delete comment 2019-05-28 14:11:38 +02:00
NotaRobotexe
8842d16832 add back uvlo tiny z positio 2019-05-28 13:50:21 +02:00
DRracer
326c061d8c testing pin 5 2019-05-27 18:27:24 +02:00
DRracer
2f96badef4
Merge pull request #1870 from NotaRobotexe/power_panic
PFW-828 after power panic printer start print in the air
2019-05-27 17:13:08 +02:00
Marek Běl
9c3b93f900
Merge pull request #1869 from DRracer/fix_mintemp_and_fsensor
Fix MINTEMP errors and fsensor runout
2019-05-27 16:32:22 +02:00
DRracer
253087a4c5 Code cleanup 2019-05-27 16:18:21 +02:00
DRracer
4d020d99f6 Code cleanup 2019-05-27 14:57:02 +02:00
NotaRobotexe
f070a10904 edit 2019-05-27 10:10:24 +02:00
NotaRobotexe
55a2d588f1 PFW-828 printing in the air after power panic 2019-05-24 18:30:58 +02:00
NotaRobotexe
69455bfc75 PFW-828 fix printing in the air after power panic 2019-05-24 18:28:16 +02:00
DRracer
098c0979ba
Merge pull request #1848 from MRprusa3d/PFW-853
recovery from "Stop()"
2019-05-24 09:54:07 +02:00
DRracer
a84d4cedb8
Merge pull request #1866 from NotaRobotexe/check_fw
Check firmware version. Add support only for MK3/MK3S
2019-05-24 09:49:40 +02:00
DRracer
9cb0bc7bcf Fix MINTEMP errors and fsensor runout 2019-05-24 08:46:44 +02:00
NotaRobotexe
1399d7dcc8 support only for MK3/MK3S 2019-05-23 15:22:31 +02:00
Marek Běl
df02030fe0
Merge pull request #1863 from DRracer/lcd20190523
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 14:31:51 +02:00
Marek Běl
e6b79e6696
Merge pull request #1856 from ondratu/pause_print_on_funcheck_fix
pause printer by flag
2019-05-23 13:48:58 +02:00
Ondrej Tuma
63235625ab pause printer by flag 2019-05-23 13:13:11 +02:00
DRracer
e17f3f8405 change language files accordingly 2019-05-23 11:14:26 +02:00
DRracer
da98977de3 Fix. menu texts and formatting - issues PFW-877 and PFW-879 2019-05-23 10:45:55 +02:00
MRprusa3d
a408f90659 recovery from "Stop()" 2019-05-18 21:28:59 +02:00
Marek Běl
7ff50e966d
Merge pull request #1843 from DRracer/MK3
Save 236B by improving functions in menu.cpp
2019-05-16 17:33:25 +02:00
Marek Bel
15ba17f110 Fix translator columns hint for Adjusting Z: 2019-05-16 17:30:15 +02:00
Marek Bel
74d8c15b4f Fix documentation. 2019-05-16 17:23:54 +02:00
Marek Bel
dcfc6348ed Fix documentation. 2019-05-16 17:22:47 +02:00
DRracer
a453c6fc9d Save 236B by improving functions in menu.cpp. Beware - the label now has
to come with a ':' as its last character. Changed language files along
with this commit too.
2019-05-16 16:43:44 +02:00
Marek Běl
8bc4952f10
Merge pull request #1839 from mkbel/rise_z
Raise Z axis while loading filament on MMU2
2019-05-15 17:35:38 +02:00
Marek Běl
e0fb5b0e34
Merge pull request #1838 from RakNoel/patch-1
Windows subsystem CRLF issues fix
2019-05-15 16:59:32 +02:00
Marek Bel
dad2065da6 Merge branch 'MK3' into rise_z 2019-05-15 16:37:17 +02:00
Marek Bel
1f3877b221 Extract duplicate code into function. Saves 4B of flash. 2019-05-15 16:31:10 +02:00
Oskar Leirvåg
464d33fa9a
Windows subsystem CRLF issues fix
Add extra tip to linux sbsystem, where users get the error "$'\r': command not found" where windows uses CRLF and linux uses only LF
2019-05-15 16:00:16 +02:00
Marek Běl
fbc0c260b1
Merge pull request #1826 from ondratu/selftest_wizard
Selftest fan improvements
2019-05-15 13:43:48 +02:00
Ondřej Tůma
04ac259938
Merge pull request #1835 from mkbel/fix_compiler_warning
Fix compiler warnings
2019-05-15 10:32:52 +02:00
Ondrej Tuma
ebfc8c1c79 Fan autotest for swapping in Selftest 2019-05-15 10:10:46 +02:00
Ondrej Tuma
c851e158cc Manual fan check menu have default (selected) option 2019-05-15 10:10:46 +02:00
Marek Bel
1a78bd53ba Fix compiler warning
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
2019-05-14 19:11:46 +02:00
Marek Bel
91e72a79f0 Fix compiler warning
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
2019-05-14 19:07:50 +02:00
Marek Bel
acfcd59369 Fix compiler warning:
sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)':
sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type]
2019-05-14 18:32:40 +02:00
Marek Bel
89fc9e7f92 sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive]
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
                                                                                                                   ^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
     MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
2019-05-14 18:25:43 +02:00