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

1688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PavelSindler
f3edd37d11 removing unretract 2018-08-25 16:52:19 +02:00
PavelSindler
1774378f7d
Merge pull request #1063 from mkbel/fix_load_all_2 
Fix load all 2
 2018-08-24 16:24:47 +02:00
Marek Bel
050a7c41d0 Fix "Check MMU. Fix the issue and then press button on MMU unit." shown instead of "Loading filament 1". 2018-08-24 03:49:51 +02:00
Marek Bel
142bf28dc2 Clear communication buffer when sending load filament command to MMU. 
This fixes PFW-517 in the moment, when the problem with not displaying "Loading filament 1" to "Loading filament 5" has appeared for the first time.
 2018-08-23 22:05:56 +02:00
PavelSindler
3477f84143
Merge pull request #1055 from XPila/MK3 
MMU - communication fix + active extruder status
 2018-08-22 16:48:09 +02:00
Robert Pelnar
dfb4bfac5b MMU - display status while switching active extruder [PFW-465] 2018-08-22 16:38:34 +02:00
MRprusa3d
a1190e9a22
Merge pull request #1052 from PavelSindler/mmu_v2 
fixes and improvements for multimaterial
 2018-08-22 14:28:33 +00:00
Robert Pelnar
7836742621 MMU communication fix - WD reset inside manage_response 2018-08-22 16:19:57 +02:00
PavelSindler
9210ab12a9
Merge pull request #1053 from mkbel/MK3 
Hot fix PFW-505 Speed change after tuning (on USB).
 2018-08-22 16:19:08 +02:00
PavelSindler
a81b8dbd61 remove manage_heater 2018-08-22 16:09:38 +02:00
Marek Bel
ef6188cd59 Hot fix PFW-505 Speed change after tuning (on USB). 
When encoder is rotated left and pushed immediately on status screen, after returning to status screen print speed jumps to 345%.
This is caused by downcasting signed lcd_encoder to unsigned position and back to signed lcd_encoder.
 2018-08-22 16:09:19 +02:00
PavelSindler
d2aeb40bee manage response function update 2018-08-22 15:46:36 +02:00
PavelSindler
f99196a7a0 fix reseting during filament change 2018-08-22 11:09:12 +02:00
PavelSindler
3fe9932a53
Merge pull request #1050 from XPila/MK3 
MMU communication fix
 2018-08-21 16:54:53 +02:00
Robert Pelnar
315bfc43dd MMU communication fix 2018-08-21 16:41:01 +02:00
PavelSindler
9fe27c108d
Merge pull request #1045 from XPila/MK3 
Menu lcd_adjust_bed fixed + status screen redesign
 2018-08-21 11:42:59 +02:00
Robert Pelnar
94423e6f7e MMU communication - mmu_ready 2018-08-20 20:53:53 +02:00
Robert Pelnar
1cd0c6cfea Status screen - print active MMU exrtuder (1/2 PFW465) 2018-08-20 00:59:36 +02:00
Robert Pelnar
c4281b0b36 Status screen redesign - fix of flickering and text wraping on status screen 
printf formating, saved flash, reduced code size
 2018-08-20 00:27:45 +02:00
Robert Pelnar
fd9516f520 Status screen - status message logic simplification 
added definitions of custom_message_type values
removed flag custom_message (previous solution maybe caused displaying of empty status line)
fixed in Marlin_main.cpp code "custom_message = _T(MSG_TEMP_CALIBRATION)"
 2018-08-19 18:34:57 +02:00
Robert Pelnar
f1ad1d22ba Menu lcd_adjust_bed fixed (Bed level correction, PFW-499) 2018-08-19 13:59:33 +02:00
XPila
28ff6dfd74
Merge pull request #1033 from XPila/MK3 
XYZ calibration fix (progmem constants declaration) + version changed
 2018-08-13 14:59:31 +02:00
Robert Pelnar
a11ae18f7e XYZ calibration fix (progmem constants declaration) + version changed 2018-08-13 14:55:31 +02:00
XPila
e2c9760448
Merge pull request #1031 from XPila/MK3-new_lang 
Version changed to 3.4.0-RC1
 2018-08-10 20:14:49 +02:00
Robert Pelnar
b7f17292ca Version changed 2018-08-10 20:08:10 +02:00
XPila
e6c80eaa0e
Merge pull request #1030 from XPila/MK3-new_lang 
3.4.0 RC1 finalization
 2018-08-10 19:57:08 +02:00
Robert Pelnar
8409a26594 Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep) 2018-08-10 19:55:50 +02:00
Robert Pelnar
b16fec956c Enabled pullup for RX2 pin (it prevents uart2 from rx buffer overflow in case of disconnected MMU) 2018-08-10 16:20:53 +02:00
Robert Pelnar
923a06c164 menu data shared memory re-design 
+code cleaning
 2018-08-10 02:59:49 +02:00
Robert Pelnar
9ee7a2124b removed unused code 2018-08-09 18:43:07 +02:00
XPila
b2d734e93c
Merge pull request #1025 from XPila/MK3-new_lang 
MMU2 communication - connection after reset, fw versions, state machine
 2018-08-09 17:45:08 +02:00
Robert Pelnar
796079bb08 MMU2 communication - connection after reset, fw versions, state machine 
+removed debug log from tmc2130
 2018-08-09 17:43:43 +02:00
XPila
a88d64f195
Merge pull request #1022 from XPila/MK3-new_lang 
mmu_enabled = true removed
 2018-08-08 21:07:00 +02:00
Robert Pelnar
10cc077ee4 mmu_enabled = true removed 2018-08-08 21:05:25 +02:00
XPila
cb379707af
Merge pull request #1021 from XPila/MK3-new_lang 
MM support and 3.4 RC1 finalization
 2018-08-08 20:26:34 +02:00
Robert Pelnar
4e32fb7181 removed '!' signalization when accel/feedrate limits reached 2018-08-08 20:23:13 +02:00
Robert Pelnar
310751397c line endings + fixed declaration 2018-08-08 20:11:57 +02:00
Robert Pelnar
990a5c9119 PFW489 (github issue 1008) - time remaining variables declared as uint32 2018-08-08 19:51:50 +02:00
Robert Pelnar
2f17997622 reset safety timer everytime lcd clicked 2018-08-08 19:33:44 +02:00
Robert Pelnar
ca25ec90bd Disabled timeouts in support and failstats menus 2018-08-08 19:28:34 +02:00
Robert Pelnar
23e5cea5d0 MMU - code cleaning (modularity) 
M403 set filament type
hardware reset
 2018-08-08 18:58:03 +02:00
XPila
3147e6b3d8
Merge pull request #1020 from XPila/MK3-new_lang 
Mk3 new lang
 2018-08-07 20:56:10 +02:00
Robert Pelnar
9e09efc9f4 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 
conflicts + fix
 2018-08-07 20:55:08 +02:00
Robert Pelnar
71f1a1f6db MMU - communication, check after start, code cleaning 2018-08-07 20:37:59 +02:00
mkbel
4cc127feac
Merge pull request #817 from 3d-gussner/MK3_fix6 
Fix MK3 compilation issue with Arduino 1.8.x
 2018-08-07 20:02:52 +02:00
XPila
cc37ef4390
Merge pull request #1010 from PavelSindler/snmm_v2 
PRUSA Fir reports also buildnumber
 2018-08-06 15:18:20 +02:00
PavelSindler
d21e527c73 PRUSA Fir reports also buildnumber 2018-08-05 20:17:04 +02:00
PavelSindler
2097ef8485
Merge pull request #1006 from PavelSindler/snmm_v2 
merge with upstream fix
 2018-08-03 19:15:00 +02:00
PavelSindler
0c2d0bebce merge with upstream fix 2018-08-03 19:14:17 +02:00
XPila
8de1bd6a6c
Merge pull request #1005 from PavelSindler/snmm_v2 
M600 fix; manage_response fix
 2018-08-03 18:57:51 +02:00