3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,976 Commits 3 Branches 78 Tags 40 MiB
549a8a1a6b
Commit Graph

2300 Commits

Author SHA1 Message Date
Marek Běl
aff020a6d4
Merge pull request #1897 from NotaRobotexe/farm_mode 
PFW-571 send PRN:4 instead PRN:1, PFW-874 new firmware version alert with 30s timeout
 2019-06-14 20:05:30 +02:00
Marek Bel
b1df1fb1f1 Fix formatting. We are never using 2 space indentation. 4 spaces are preferred, tabulator is acceptable if surrounding code uses tabs. 2019-06-14 18:18:27 +02:00
DRracer
c5d130e763
Merge pull request #1914 from prusa3d/MK3_3.7.2 
Increase version.
 2019-06-14 09:39:41 +02:00
Marek Bel
fee67d9451 Increase version. 2019-06-13 16:37:51 +02:00
DRracer
55dc78546b
Merge pull request #1913 from mkbel/fix_spelling 
Fix spelling.
 2019-06-13 15:12:30 +02:00
Marek Bel
25f0eb9a39 Fix spelling. 2019-06-13 15:01:54 +02:00
Marek Bel
72f5e87c61 Merge branch 'MK3' into use_enum_class_2 2019-06-12 19:17:35 +02:00
Marek Bel
1390d4e5b9 Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t. 2019-06-12 19:11:41 +02:00
Marek Bel
5fcf760954 Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t. 2019-06-12 18:54:43 +02:00
Marek Bel
51df6cdfdc Remove LcdCommands::Unknown3. Remove LcdCommands mapping to numbers, as it is not needed. 2019-06-12 18:54:37 +02:00
Marek Bel
cbb92860d0 Use first letter capital camel case for enum class members. 2019-06-12 18:54:32 +02:00
Marek Bel
0401490cc1 Use first letter capital camel case for enum class members. 2019-06-12 18:54:25 +02:00
Marek Bel
9ceba00426 Use first letter capital camel case for enum class members. Remove dependency of FanCheck values on TestError values as it is not used. 2019-06-12 18:53:09 +02:00
MRprusa3d
b7d3766ae2
Merge branch 'MK3' into PFW-790 2019-06-12 17:32:13 +02:00
Marek Bel
6dd085bcc5 Use first letter capital camel case for enum class members. 2019-06-12 16:44:07 +02:00
Marek Bel
e393d91b12 Use first letter capital camel case for enum class members. 2019-06-12 16:20:21 +02:00
Marek Bel
cc80bfa020 Merge branch 'MK3' into use_enum_class 2019-06-12 16:04:26 +02:00
DRracer
c7e1e73880 another almost 200B down by proper usage of smaller data types and enum 
classes
 2019-06-12 15:41:55 +02:00
DRracer
94a5175980 Code size reduction - saved almost 2KB 2019-06-12 15:41:34 +02:00
DRracer
8d388fa03a
Merge pull request #1911 from mkbel/layer1_cal_flash 
Layer1 cal flash
 2019-06-12 15:40:59 +02:00
Marek Bel
49f172a7b9 Convert uint8_t cycle control varibles changed in previous commit to uint_least8_t to be potentially more portable. 2019-06-12 15:01:57 +02:00
DRracer
b15bbaf177 for cycles' variables: int -> uint8_t where appropriate, part1 2019-06-12 14:58:15 +02:00
Marek Bel
7ac098a135 Refactor. Put constants needed in functions inside fuctions to limit its scope. 2019-06-12 14:20:20 +02:00
Marek Bel
2755a3733d Document. 2019-06-12 14:15:58 +02:00
Marek Bel
342954b88c Refactor. Make constants producing first layer calibration square more clear. Note layer height discrepancy. 2019-06-12 13:31:17 +02:00
Marek Bel
d528a53526 Refactor. Move lcd_commands_func1() to first_lay_cal.cpp and rename it to lay1cal_square(). Remove its constant parameters. Move remaining G1 code to lay1cal_meander(). Saves 6B of FLASH memory. 2019-06-12 01:36:48 +02:00
Marek Bel
60cc3d58ec Use sprintf_P in first layer calibration. Save 30B of FLASH memory. 2019-06-11 20:00:49 +02:00
Marek Bel
47a183e96e Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory. 2019-06-11 19:49:56 +02:00
Marek Bel
21f4669600 Make count_e() constexpr. 2019-06-11 19:22:08 +02:00
Marek Bel
4effff9e99 Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory. 2019-06-11 18:56:29 +02:00
Marek Bel
d21f256cd0 Remove duplicate calls of lcd_timeoutToStatus.start(), move !blocks_queued() && cmd_buffer_empty() condition to outer if, rewrite using switch statement. Save 487B of FLASH memory. 2019-06-11 18:26:59 +02:00
Marek Bel
97a5d6b5f4 Make constants const. 2019-06-11 17:30:37 +02:00
Marek Bel
9b1e3213ae Variable lcd_commands_step doesn't need to be global. 2019-06-11 17:30:19 +02:00
DRracer
58948cffcd Code size reduction - saved almost 2KB 2019-06-11 17:23:01 +02:00
Marek Bel
0c9121e99e Use loop to enquecommand_P() in first layer calibration. 2019-06-11 17:08:56 +02:00
Marek Běl
cb6a3e7e12
Merge pull request #1907 from DRracer/fan_check_error_fix 
Do not allow resume printing if fans are still not ok
 2019-06-11 15:12:48 +02:00
DRracer
13c3ab14fa test fan check error only when enabled by #ifdef 2019-06-11 15:05:40 +02:00
DRracer
3e37150552 Do not allow resume printing if fans are still not ok 2019-06-11 14:53:10 +02:00
Marek Bel
27145204ed Use internationalized M117, but anyway the text is not shown. 2019-06-10 21:40:12 +02:00
Marek Bel
4be8fa701e Use loop to enquecommand_P() in first layer calibration. 2019-06-10 20:41:18 +02:00
NotaRobotexe
bb980e2fca sound edit, delete mute mode, add blind mode 2019-06-10 15:03:52 +02:00
Marek Běl
28e7772421
Merge pull request #1886 from leptun/MK3_fix_load_filament_5 
Fix Load Filament 5 for MMU2
 2019-06-10 14:45:55 +02:00
Marek Běl
327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix 
Fan check error fix
 2019-06-06 15:52:44 +02:00
DRracer
0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2 
Filament runout mk3 2
 2019-06-06 15:51:35 +02:00
DRracer
83578c3389 documentation + minor code cleanup based on code review 2019-06-06 15:50:13 +02:00
Marek Bel
19351df8a7 Extracted computation of z_shift for M600 into a separate function to 
improve readability. Surprisingly, also the code got shorter.
 2019-06-05 18:34:26 +02:00
Marek Bel
9c3bb14bae remove function forward decl: fsensor_restore_print_and_continue_IR 
revert LCD_BL_PIN change
 2019-06-05 18:34:10 +02:00
DRracer
aeed49a80e Fix filament runout on optical filament sensors 
Reworked the IR variant accordingly
Some code-size optimization in related functions
 2019-06-05 18:33:41 +02:00
DRracer
10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic 
documentation for power panic
 2019-06-05 16:10:04 +02:00
NotaRobotexe
0cab2284ea PFW-874 new firmware alert timeout 2019-06-05 15:48:10 +02:00
NotaRobotexe
14270ac1f6 power panic documentation 2019-06-05 15:10:51 +02:00
NotaRobotexe
d263728c37 documentation 2019-06-05 14:55:59 +02:00
DRracer
33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic 
Power panic Z axis fix
 2019-06-05 13:34:21 +02:00
NotaRobotexe
2c4e98dc27 power panic improvement 2019-06-05 13:12:08 +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
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
Voinea
878e866401 Fix Load Filament 5 for MMU2 2019-05-30 17:28:02 +03:00
NotaRobotexe
e9c870e7a0 fix of fixof power panic 2019-05-29 20:33:22 +02:00
NotaRobotexe
3b2cbc68d8 PFW-571 send PRN:4 instead PRN:1 while changing filament 2019-05-28 18:22:34 +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
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
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 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 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
Marek Běl
fbc0c260b1
Merge pull request #1826 from ondratu/selftest_wizard 
Selftest fan improvements
 2019-05-15 13:43:48 +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
Marek Bel
66d20f0297 Fix code formatting (indentation). 2019-05-14 16:45:15 +02:00
Marek Bel
4de93ca19c Fix eject filament menu items numbering. 2019-05-14 16:43:33 +02:00