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

2128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marek Bel
54138407dd Encapsulate MMU internal state. 2018-08-23 23:34:38 +02:00
Marek Bel
f1c51502fd Merge branch 'MK3' into MK3_dev 2018-08-23 23:28:20 +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
MRprusa3d
5dc2af961b ShippingPrepare & M600 
message after ShippingPrepare
M600 :: better filament (un)retraction
 2018-08-23 00:08:14 +02:00
Marek Bel
3780516f74 PFW-512 Reserve space for MENU_ITEM_EDIT_int3_P in shared memory in lcd_tune_menu(). 2018-08-22 19:47:29 +02:00
Marek Bel
07d07831f1 Add portability note. 2018-08-22 19:40:12 +02:00
Marek Bel
bb5ac93921 Add missing compile time check for ShortTimer fitting into menu_data. Convert preprocessor checks to shorter and more accurate static_assert. Remove redundant macro MENU_DATA_EDIT_SIZE. Decrease scope of menu_stack and asociated macro. No functional change. 2018-08-22 18:55:42 +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
475641d666
Merge pull request #1054 from mkbel/MK3_dev 
Mk3 dev
 2018-08-22 16:19:21 +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
Marek Bel
fe43791673 Merge branch 'MK3' into MK3_dev 2018-08-22 16:17:10 +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
6e88003323
Merge pull request #1051 from mkbel/MK3_dev 
Mk3 dev
 2018-08-22 10:26:58 +02:00
Marek Bel
3b3d6ab472 Merge branch 'MK3' into MK3_dev 2018-08-21 17:56:34 +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
mkbel
901479ff50
Merge pull request #1041 from mkbel/doc 
Document fsensor_update, remove disabled code.
 2018-08-15 21:38:08 +02:00
Marek Bel
cc0249126a Document fsensor_update, remove disabled code. 2018-08-15 21:36:23 +02:00
MRprusa3d
0cb72eb0c4
Merge pull request #1027 from mkbel/doc 
Update README.md.
 2018-08-15 15:42:08 +00:00
MRprusa3d
01e71286f7
Merge pull request #1028 from mkbel/refactor_settings 
Split settings menu into separate functions.
 2018-08-15 15:42:02 +00:00
Marek Bel
34a4443170 Fix typo. 2018-08-15 17:34:29 +02:00
mkbel
1710501f2b
Merge pull request #1035 from mkbel/MK3_dev 
Merge MK3 into MK3_dev
 2018-08-13 19:50:35 +02:00
Marek Bel
329b84a82b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-08-13 19:46:32 +02:00
Marek Bel
6c387384c7 Fix compiler warnings: sketch/Marlin.h:366:35: warning: large integer implicitly truncated to unsigned type [-Woverflow] 
#define PRINT_TIME_REMAINING_INIT 0xffffffff
sketch/Marlin_main.cpp:8814:21: note: in expansion of macro 'PRINT_TIME_REMAINING_INIT'
  uint16_t print_t = PRINT_TIME_REMAINING_INIT;
sketch/Marlin_main.cpp:8817:15: warning: comparison is always true due to limited range of data type [-Wtype-limits]
  if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100 * print_t / feedmultiply;
 2018-08-13 19:43:37 +02:00
Marek Bel
ac62117d6b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-08-13 19:38:55 +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
Marek Bel
95e7536955 Split settings menu into separate functions. 2018-08-10 15:19:35 +02:00
Robert Pelnar
923a06c164 menu data shared memory re-design 
+code cleaning
 2018-08-10 02:59:49 +02:00
Marek Bel
ecb2a6e02c Update README.md. 2018-08-10 01:00:02 +02:00
Marek Bel
4f190c010e Update README.md. 2018-08-10 00:34:17 +02:00
Marek Bel
59882e4c0b Update README.md. 2018-08-10 00:18:37 +02:00
mkbel
f25cad4ba5
Merge pull request #1026 from mkbel/MK3_dev 
Merge 'MK3' into MK3_dev
 2018-08-09 23:10:51 +02:00