54138407dd
Encapsulate MMU internal state.
2018-08-23 23:34:38 +02:00
475641d666
Merge pull request #1054 from mkbel/MK3_dev
...
Mk3 dev
2018-08-22 16:19:21 +02:00
fe43791673
Merge branch 'MK3' into MK3_dev
2018-08-22 16:17:10 +02:00
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
6e88003323
Merge pull request #1051 from mkbel/MK3_dev
...
Mk3 dev
2018-08-22 10:26:58 +02:00
3b3d6ab472
Merge branch 'MK3' into MK3_dev
2018-08-21 17:56:34 +02:00
9fe27c108d
Merge pull request #1045 from XPila/MK3
...
Menu lcd_adjust_bed fixed + status screen redesign
2018-08-21 11:42:59 +02:00
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +02:00
1cd0c6cfea
Status screen - print active MMU exrtuder (1/2 PFW465)
2018-08-20 00:59:36 +02:00
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
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
f1ad1d22ba
Menu lcd_adjust_bed fixed (Bed level correction, PFW-499)
2018-08-19 13:59:33 +02:00
901479ff50
Merge pull request #1041 from mkbel/doc
...
Document fsensor_update, remove disabled code.
2018-08-15 21:38:08 +02:00
cc0249126a
Document fsensor_update, remove disabled code.
2018-08-15 21:36:23 +02:00
0cb72eb0c4
Merge pull request #1027 from mkbel/doc
...
Update README.md.
2018-08-15 15:42:08 +00:00
01e71286f7
Merge pull request #1028 from mkbel/refactor_settings
...
Split settings menu into separate functions.
2018-08-15 15:42:02 +00:00
34a4443170
Fix typo.
2018-08-15 17:34:29 +02:00
1710501f2b
Merge pull request #1035 from mkbel/MK3_dev
...
Merge MK3 into MK3_dev
2018-08-13 19:50:35 +02:00
329b84a82b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-13 19:46:32 +02:00
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
ac62117d6b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-13 19:38:55 +02:00
28ff6dfd74
Merge pull request #1033 from XPila/MK3
...
XYZ calibration fix (progmem constants declaration) + version changed
2018-08-13 14:59:31 +02:00
a11ae18f7e
XYZ calibration fix (progmem constants declaration) + version changed
2018-08-13 14:55:31 +02:00
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
b7f17292ca
Version changed
2018-08-10 20:08:10 +02:00
e6c80eaa0e
Merge pull request #1030 from XPila/MK3-new_lang
...
3.4.0 RC1 finalization
2018-08-10 19:57:08 +02:00
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
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
95e7536955
Split settings menu into separate functions.
2018-08-10 15:19:35 +02:00
923a06c164
menu data shared memory re-design
...
+code cleaning
2018-08-10 02:59:49 +02:00
ecb2a6e02c
Update README.md.
2018-08-10 01:00:02 +02:00
4f190c010e
Update README.md.
2018-08-10 00:34:17 +02:00
59882e4c0b
Update README.md.
2018-08-10 00:18:37 +02:00
f25cad4ba5
Merge pull request #1026 from mkbel/MK3_dev
...
Merge 'MK3' into MK3_dev
2018-08-09 23:10:51 +02:00
d94a1c5952
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-09 21:26:33 +02:00
9ee7a2124b
removed unused code
2018-08-09 18:43:07 +02:00
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
796079bb08
MMU2 communication - connection after reset, fw versions, state machine
...
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
a88d64f195
Merge pull request #1022 from XPila/MK3-new_lang
...
mmu_enabled = true removed
2018-08-08 21:07:00 +02:00
10cc077ee4
mmu_enabled = true removed
2018-08-08 21:05:25 +02:00
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
4e32fb7181
removed '!' signalization when accel/feedrate limits reached
2018-08-08 20:23:13 +02:00
310751397c
line endings + fixed declaration
2018-08-08 20:11:57 +02:00
990a5c9119
PFW489 (github issue 1008) - time remaining variables declared as uint32
2018-08-08 19:51:50 +02:00
2f17997622
reset safety timer everytime lcd clicked
2018-08-08 19:33:44 +02:00
ca25ec90bd
Disabled timeouts in support and failstats menus
2018-08-08 19:28:34 +02:00
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
290328445a
Merge pull request #1019 from mkbel/MK3_fix6
...
Mk3 fix6
2018-08-08 18:38:20 +02:00
c2f098e263
Merge pull request #1015 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-08-08 18:37:57 +02:00
3147e6b3d8
Merge pull request #1020 from XPila/MK3-new_lang
...
Mk3 new lang
2018-08-07 20:56:10 +02:00
Marek Bel
PavelSindler
Robert Pelnar
mkbel
MRprusa3d