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

2304 Commits

Author SHA1 Message Date
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
Marek Bel
150787efbd Generate menu item texts Cut filament <nr.> during runtime to conserve flash. 2019-05-14 16:25:29 +02:00
Marek Bel
6495a8fa58 Decrease flash reserved for secondary language. 2019-05-14 16:10:04 +02:00
Marek Bel
7c4f66181f Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash. 2019-05-14 15:47:25 +02:00
Marek Běl
dddc1b84e6
Merge pull request #1825 from prusa3d/MK3_3.7.1 
Increase version 3.7.1 final.
 2019-05-13 17:29:30 +02:00
Marek Běl
efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500 
Allow save of uStep resolution with M500
 2019-05-13 17:08:34 +02:00
Marek Bel
e93f043fee Increase version 3.7.1 final. 2019-05-13 15:09:58 +02:00
Marek Běl
bbd1b60229
Merge pull request #1437 from craiglink/memory-overrun 
set array size correctly to 4
 2019-05-11 03:01:52 +02:00
Marek Běl
12b801fa1f
Merge pull request #1397 from jhoblitt/plumbing/sh-chmod 
make all shell scripts executable
 2019-05-11 02:37:09 +02:00
Marek Běl
0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check 
check if firmware is on right type of printer
 2019-05-11 02:11:54 +02:00
Marek Běl
176b28bc83
Merge pull request #1813 from prusa3d/MK3_3.7.1 
Enable watchdog for all variants.
 2019-05-10 17:33:44 +00:00
Marek Bel
a9d6ae296b Enable watchdog for all variants. 2019-05-10 16:30:08 +02:00
Marek Běl
2a39fad400
Merge branch 'MK3' into bugfixes 2019-05-10 13:43:36 +00:00
Marek Běl
084c6f2700
Merge pull request #1805 from DRracer/MK3 
PFW-844
 2019-05-10 13:41:59 +00:00
Marek Bel
5707d4b85c Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications. 2019-05-10 15:27:25 +02:00
DRracer
dc4f30530d Fix a number overflow to last line of LCD when doing large extruder in 
menu Settings -> Move axis -> Extruder
 2019-05-09 13:44:35 +02:00
DRracer
714fb23de6 Merge remote-tracking branch 'upstream/MK3' into MK3 2019-05-09 13:40:28 +02:00
NotaRobotexe
e7dd5c60d3 check if firmware is on right type of printer 2019-05-07 18:10:44 +02:00
Marek Běl
8692565cf0
Merge pull request #1802 from XPila/MK3 
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
 2019-05-07 15:13:02 +00:00
DRracer
f431d24762 Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3 2019-05-07 16:17:14 +02:00
DRracer
0124fbf9ee Fix: display target extruder temperature on the main screen when doing 
PID calibration
 2019-05-07 16:15:42 +02:00
Robert Pelnar
85806a0f38 variable bed pwm frequency fix (input value is 7bit, not 8bit) 2019-05-07 15:35:34 +02:00
Ondrej Tuma
b7fe43bf68 Deleted bad cols/rows definitions for translation. 2019-05-07 12:52:23 +02:00
Robert Pelnar
58683da2fb Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz) 2019-05-06 18:07:42 +02:00
Marek Běl
e56be687bb
Merge pull request #1800 from XPila/MK3 
return with exitcode 1 if any language not generated properly
 2019-05-06 15:58:34 +00:00
Marek Bel
1a0370e1c7 Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P(). 2019-05-06 17:39:00 +02:00
Robert Pelnar
fa1bdd6ab1 Lang - decreased reserved space for secondary language (10496 bytes) 2019-05-06 17:29:47 +02:00
DRracer
ffbdb43881 Remove commented code 2019-05-06 17:26:42 +02:00
Robert Pelnar
41a827fa00 Removed unused texts, increased reserved space to 0x2e00 (11776 bytes) 2019-05-06 17:24:06 +02:00
DRracer
0794430208 Fix for linearity correction not being stored to EEPROM when doing MENU- 
UP
 2019-05-06 15:33:13 +02:00
Robert Pelnar
1c9d134c62 return with exitcode 1 if any language not generated properly 
fix - include system_timer.h
 2019-05-06 15:29:57 +02:00
DRracer
e5911c42da limit printed menu text to max 18 characters 2019-05-06 12:44:36 +02:00
Robert Pelnar
3852aa4275 Different secondary language reserved space for MK3 and MK25 2019-04-30 12:42:18 +02:00
Marek Běl
177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841 
"stop" immediately after "pause" patch
 2019-04-29 14:49:49 +00:00
Marek Bel
8fadbf1b44 Do not call watchdog reset from updateTemperaturesFromRawValues(). 2019-04-29 16:41:38 +02:00
MRprusa3d
b93f37ee02 "stop" immediately after "pause" patch 2019-04-29 14:39:19 +02:00
Robert Pelnar
18dec75b56 MK2.5 - watchdog enabled + test (command "D-1") 2019-04-29 13:19:59 +02:00
NotaRobotexe
f16bea26e5 raise the Z axis before filament loading to nozzle on MMU2S 2019-04-25 17:39:09 +02:00
XPila
238079fc95
Merge pull request #1763 from mkbel/save_flash_timer2 
Do not compile timer02.c if not used. Saves 148B flash.
 2019-04-24 16:07:17 +02:00
mkbel
e8e7fa907f
Change comment 2019-04-24 15:52:24 +02:00
Robert Pelnar
1d8b2b3e18 Secondary language reserved space resized 2019-04-24 15:22:17 +02:00
Marek Bel
f25f8f1b71 Do not compile timer02.c if not used. Saves 148B flash. 2019-04-23 19:39:49 +02:00
mkbel
ca449ef517
Merge pull request #1742 from XPila/MK3-bed_pwm_revert 
Bed high frequency PWM disabled
 2019-04-16 21:04:28 +00:00
Marek Bel
75fac9dab2 Do not kill printer if External SPI flash W25X20CL is not responding. 
Remove internationalization macro for this message. It has no sense to be translated as internationalization in most cases doesn't work if it is not responding.
Show this message instead of splash screen if the error is encountered.
There is no additional delay or wait for click, as such functions doesn't work in setup function.
 2019-04-16 22:20:53 +02:00
Robert Pelnar
1f9737b4a6 Bed high frequency PWM disabled 2019-04-16 16:48:01 +02:00
PavelSindler
7168c09eec
Merge pull request #1713 from mkbel/fix_octoprint_mmu_load_failed 
Fix octoprint mmu load failed
 2019-04-10 18:21:06 +02:00
MRprusa3d
b5f196406e (preliminary) fix @ preHeatError II 2019-04-10 00:29:58 +02:00
Marek Bel
0d3e3c506a Merge remote-tracking branch 'prusa3d/MK3' into fix_octoprint_mmu_load_failed 2019-04-09 20:54:21 +02:00
Marek Bel
c7d403733a Allow load filament retry after button push unlimited times in case mmu_continue_loading() is in blocking mode. 2019-04-09 20:50:29 +02:00
MRprusa3d
32f3471862 print parameters checking 
prusa_stat_diameter()
 2019-04-09 15:22:08 +02:00
Marek Bel
84cabd3836 Change busy_state type, save 340B of flash 2019-04-05 15:20:34 +02:00
Marek Bel
bf57a59147 Extract duplicate code into function. Saves 106B flash. 2019-04-05 15:12:35 +02:00
Marek Bel
4bfa3d7e0b Reporty busy: paused for user in case MMU is not responding. 2019-04-04 19:04:15 +02:00
Marek Bel
bf1a55ab02 Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed. 
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
 2019-04-04 18:15:37 +02:00
MRprusa3d
aa0edd09f5 (preliminary) fix @ (bed) preHeatError 2019-04-03 22:48:58 +02:00
PavelSindler
fd96bde69f
Merge pull request #1667 from mkbel/Add_IR_sensor_fail_message 
Add ir sensor fail message
 2019-04-02 14:55:27 +02:00
PavelSindler
a8d8d9e4c9 version change 2019-04-01 20:52:24 +02:00
PavelSindler
c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz." 2019-04-01 18:44:13 +02:00
PavelSindler
ae11c1e26f rename function 2019-03-28 16:39:56 +01:00
PavelSindler
97594c83bb function misleading names changed 2019-03-28 14:58:58 +01:00
PavelSindler
96a111119b document 2019-03-28 14:52:50 +01:00
PavelSindler
8f69d5a501 document 2019-03-28 14:48:35 +01:00
PavelSindler
1dd486d86d max length of menu item strings added 2019-03-28 13:18:28 +01:00
PavelSindler
d22793f276 Z-probe nr. states reduced to 1; 3; 5 2019-03-28 12:02:46 +01:00
PavelSindler
02faadf0b9 MMU mode renamed 2019-03-28 09:49:08 +01:00
PavelSindler
e7900aeaa1 Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing 2019-03-28 08:08:54 +01:00
PavelSindler
c1da07bda0
Merge pull request #1653 from XPila/MK3 
Phase correct PWM for bed, frequency 40KHz.
 2019-03-27 21:07:15 +01:00
PavelSindler
e259967991 remove / comment debug code 2019-03-27 20:41:45 +01:00
PavelSindler
5863297538 if deviation between current Z-probe and avg, value > 50um, enlarge Z-probe movements and repeat measurement 2019-03-27 20:25:00 +01:00
PavelSindler
a9ce38df71 Function for decision if we have valid Z-calibration data in eeprom fixed, mesh bed leveling: possible crash fix, temporaty debug info on serial line. 2019-03-26 17:14:05 +01:00
Marek Bel
baeee5817e Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash. 2019-03-22 00:24:22 +01:00
Marek Bel
966e772702 Fix compile error for non TMC2130 endstops check. 2019-03-22 00:14:29 +01:00
Marek Bel
89f1a3bacf Fix compile error for non TMC2130 pulley check. 2019-03-22 00:11:02 +01:00
Marek Bel
8582babddb Fix compile error for manual fan check. 2019-03-22 00:08:44 +01:00
Marek Bel
d1c5c03907 Fix compile error for manual fan check. 2019-03-22 00:03:14 +01:00
Marek Bel
c45a7f8641 Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error. 2019-03-21 23:50:01 +01:00
Marek Bel
91779a5d04 Add filament sensor false triggering message. 2019-03-21 23:36:59 +01:00
Marek Bel
ba23b1b2c5 Remove unused. 2019-03-21 22:50:46 +01:00
Marek Bel
6c28ed6349 Convert lcd_selftest_error() first parameter to enum class. 2019-03-21 22:48:57 +01:00
PavelSindler
fbe68cb287 variables scope changed 2019-03-21 19:37:34 +01:00
PavelSindler
576bfb17c7 whitespace 2019-03-21 18:51:54 +01:00
PavelSindler
175f840d16 return statement not used (fixes Pronterface issues) 2019-03-21 18:46:07 +01:00
Harpalyke
0f21ccee3c Adding the microstepping resolution for all axis to the eprom config which is persisted during M500 for Mk3 and Mk3S 2019-03-19 21:39:59 +00:00
MRprusa3d
7d98177716 farmMode updates 2019-03-19 19:48:40 +01:00
Robert Pelnar
cfd185f315 Phase correct PWM for bed, frequency 40KHz. 2019-03-19 14:50:57 +01:00
Marek Bel
4100bd33a7 Fix Dcodes compilation errors and warnings. 2019-03-19 13:53:58 +01:00
PavelSindler
e37c2e0b2e version change 2019-03-15 20:01:02 +01:00
PavelSindler
7c5e9500a8 version change 2019-03-15 20:00:07 +01:00
PavelSindler
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7 
7x7 mbl and switching mmu modes
 2019-03-15 19:55:15 +01:00
PavelSindler
0ca52216f3 Revert "variants update" 
This reverts commit c3a95ab79b.
 2019-03-15 13:14:32 +01:00
Marek Bel
ffe45bdef3 Disable mmu filament cutter feature. 2019-03-15 03:38:37 +01:00
PavelSindler
80ef2686ae mmu mode switching fix 2019-03-14 18:17:40 +01:00
PavelSindler
6e26f61726 fixed 7x7 mesh bed leveling vs. Z calibration check 2019-03-14 14:48:01 +01:00
PavelSindler
ef198856a4 increase relative movement in Z to work better with higher hysteresis PINDAs 2019-03-14 14:10:52 +01:00
PavelSindler
9e0e4198c5 Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update 2019-03-14 01:52:44 +01:00
MRprusa3d
1f131f66e0 print parameters checking 
nozzle diameter
 2019-03-14 00:36:56 +01:00
PavelSindler
72f51989fa compare measured Z-value during mesh bed leveling with Z-calibration value even for 7x7 mesh 2019-03-13 19:41:09 +01:00