adde0d3944
Merge branch 'prusa3d_MK3' into MK3_dev
2018-08-28 17:31:12 +02:00
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
2a00e5d348
Fix loading filament screen hangs if changed automatically.
2018-08-27 20:09:22 +02:00
191e5dfddd
mmu M600: dont use change extruder posibility; unload starts always imidiately
2018-08-27 16:12:10 +02:00
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
...
Mmu filament sensor
2018-08-27 05:26:12 +02:00
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix
...
M600 mmu fix
2018-08-27 05:26:00 +02:00
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
d3ed270a5a
single material printer (no mmu unit) M600 hotfix: M600_check_state loop working
2018-08-26 23:52:45 +02:00
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
...
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
e6ac75f6a1
Merge pull request #1061 from mkbel/MK3_dev
...
Merge branch 'MK3' into MK3_dev
2018-08-24 16:27:07 +02:00
0de7668bac
Remove usage of global variable tmp_extruder in M200.
2018-08-23 23:34:50 +02:00
f1c51502fd
Merge branch 'MK3' into MK3_dev
2018-08-23 23:28:20 +02:00
3b3d6ab472
Merge branch 'MK3' into MK3_dev
2018-08-21 17:56:34 +02:00
315bfc43dd
MMU communication fix
2018-08-21 16:41:01 +02:00
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +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
ac62117d6b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-13 19:38:55 +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
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
796079bb08
MMU2 communication - connection after reset, fw versions, state machine
...
+removed debug log from tmc2130
2018-08-09 17:43:43 +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
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
9e09efc9f4
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
conflicts + fix
2018-08-07 20:55:08 +02:00
71f1a1f6db
MMU - communication, check after start, code cleaning
2018-08-07 20:37:59 +02:00
7e19b4adc1
Supress compiler warning sketch/Marlin_main.cpp:3079:6: warning: unused parameter 'e_shift_late' [-Wunused-parameter]. Make function static. Fix indentation.
2018-08-07 19:17:29 +02:00
814d31d70d
Remove factory_reset() unused quiet parameter and make it static. It was tested, that both calls of factory reset (from menu and via PRUSA FR command) works somehow. Fix compiler warning: sketch/Marlin_main.cpp:808:6: warning: unused parameter 'quiet' [-Wunused-parameter]
2018-08-07 18:50:11 +02:00
791b568339
Fix compiler warnings: sketch/uart2.c:19:33: warning: unused parameter 'stream' [-Wunused-parameter]
...
sketch/uart2.c:28:25: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/Marlin_main.cpp:925:5: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/lcd.cpp:224:5: warning: unused parameter 'stream' [-Wunused-parameter]
2018-08-07 17:51:30 +02:00
5f4380cafb
Remove unused function, fix compiler warning: sketch/Marlin_main.cpp:8994:6: warning: unused parameter 'extruder' [-Wunused-parameter]
2018-08-07 12:52:51 +02:00
30438833c6
Fix compiler warning sketch/Marlin_main.cpp:6584:19: warning: comparison is always true due to limited range of data type [-Wtype-limits]
2018-08-07 12:52:51 +02:00
ceac1e07bd
Merge branch 'MK3' into MK3_dev
2018-08-06 16:26:38 +02:00
702a2e1883
Merge pull request #1004 from mkbel/fix_XYhoming_direction
...
Obey defined X and Y homing direction.
2018-08-05 20:18:30 +02:00
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
cf06c5171c
merge with upstream
2018-08-03 18:43:09 +02:00
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
5846707c5a
Remove local variable verbosity_level, which was masking function parameter of the same name. Remove duplicate code to derive verbosity level.
...
Problem manifested itself as compiler warning: sketch/Marlin_main.cpp:2881:6: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
bool gcode_M45(bool onlyZ, int8_t verbosity_level)
2018-08-03 15:49:20 +02:00
5824da8310
add more extrusion to M600 load filament
2018-08-03 15:42:06 +02:00
dd4c4b39b4
Added support for the upstream Marlin interpretation of the M204 code:
...
M204 S.. T..:
T is interpreted the old way (as acceleration when retracting)
only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.
M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.
This change will help us to solve the following Slic3r issue:
https://github.com/prusa3d/Slic3r/issues/1089
2018-08-03 15:33:41 +02:00
ae7561bb27
M600 fix: set hotend temperature to correct value, manage_response function fix: now works in case that user presses button on mmu unit before he is asked to do it, compiler warnings (uninitialized variables) fixed
2018-08-03 15:26:39 +02:00
0638e490c1
Fix compiler warnings: sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::unget' [-Wmissing-field-initializers]
...
FILE _uartout = {0};
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::flags' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::size' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::len' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::put' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::get' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::udata' [-Wmissing-field-initializers]
2018-08-03 15:23:24 +02:00
d3360c6868
Fix compiler warning sketch/Marlin_main.cpp:9099:7: warning: unused variable 'response' [-Wunused-variable].
2018-08-02 21:46:50 +02:00
e13e3a9dc4
Merge remote-tracking branch 'prusa3d/MK3' into fix_compiler_warnings
2018-08-02 21:42:55 +02:00
2e61c0e289
Obey defined X and Y homing direction.
...
Problem manifested itself as sketch/Marlin_main.cpp:2288:13: warning: unused variable 'axis_home_dir' [-Wunused-variable]
2018-08-02 20:47:03 +02:00
Marek Bel
PavelSindler
PavelSindler
Robert Pelnar
bubnikv