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

2745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XPila
ca965aba7b
Merge pull request #1784 from XPila/MK3 
Different secondary language reserved space for MK3 and MK25
 2019-04-30 12:46:50 +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 Běl
95beb33924
Merge pull request #1778 from XPila/MK3 
MK2.5 - watchdog enabled + test (command "D-1")
 2019-04-29 14:48:16 +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
Marek Běl
af6b9a2597
Merge pull request #1766 from mkbel/update_readme 
Update readme
 2019-04-25 05:49:32 +00:00
Marek Běl
f17af8c7bf
Update README.md 
Remove spaces in the end of line.
 2019-04-25 07:48:24 +02:00
Marek Bel
6dce7413b6 Merge branch 'MK3' into update_readme 2019-04-25 07:43:51 +02:00
Marek Běl
a8e62007ca Make platform.txt location more clear. Do not mention Windows, as it is already in Windows section. 2019-04-25 07:40:22 +02:00
cimoalpacino
3274794908 Add filepath to platform.txt for windows users 2019-04-25 07:39:39 +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
e9b5e4cb28
Merge pull request #1762 from XPila/MK3 
Secondary language reserved space resized
 2019-04-24 13:53:00 +00: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
MRprusa3d
7f2d366ff0
Merge pull request #1743 from mkbel/no_kill_spi_flash_err 
Do not kill printer if External SPI flash W25X20CL is not responding.
 2019-04-16 22:40:41 +02: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
mkbel
8a33663f64
Update README.md 2019-04-15 02:47:25 +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
PavelSindler
0960d234aa
Merge pull request #1693 from MRprusa3d/666 
(preliminary) fix @ (bed) preHeatError
 2019-04-10 13:30:07 +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
PavelSindler
85f380a92e
Merge pull request #1692 from 3d-gussner/MK3_fix_SD_card_menu_enhancement 
Translation fix for https://github.com/prusa3d/Prusa-Firmware/pull/1601
 2019-04-08 21:02:04 +02:00
PavelSindler
d8c990c0b7
Merge pull request #1701 from andrewluebke/MK3 
Fixed spelling errors in PF-build.sh
 2019-04-08 21:00:07 +02:00
Andrew Luebke
a6f10625c5 Found another mistake 2019-04-05 15:44:52 -07:00
Andrew Luebke
99d6c74999 Fixed spelling errors in PF-build.sh 2019-04-05 14:53:33 -07: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
3d-gussner
b0566b2bc9 Translation fix for https://github.com/prusa3d/Prusa-Firmware/pull/1601 2019-04-03 16:45:34 +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
7157f911a9
Merge pull request #1684 from PavelSindler/MK3_for_merging 
version change
 2019-04-01 20:53:11 +02:00
PavelSindler
a8d8d9e4c9 version change 2019-04-01 20:52:24 +02:00
PavelSindler
791bcdc1a9
Merge pull request #1683 from prusa3d/revert-1653-MK3 
Revert "Phase correct PWM for bed, frequency 40KHz."
 2019-04-01 20:19:34 +02:00
PavelSindler
c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz." 2019-04-01 18:44:13 +02:00
mkbel
a60a1cbef4
Merge pull request #1678 from PavelSindler/7x7_review_feedback 
7x7: document and rename some functions
 2019-03-28 16:46:38 +01:00
PavelSindler
4bc0b616c5 Merge remote-tracking branch 'upstream/MK3' into 7x7_review_feedback 2019-03-28 16:46:09 +01:00
PavelSindler
ae11c1e26f rename function 2019-03-28 16:39:56 +01:00
mkbel
ad7a7bb01c
Merge pull request #1677 from PavelSindler/7x7_polishing 
7x7 polishing
 2019-03-28 16:35:52 +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