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

1384 Commits

Author SHA1 Message Date
Marek Bel
7aadb2f660 Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P 2018-08-27 20:57:57 +02:00
Marek Bel
9611401b69 Fix mmu_M600_load_filament increments tmp_extruder, which is not set in case of automatic == true. 2018-08-27 20:23:43 +02:00
Marek Bel
2a00e5d348 Fix loading filament screen hangs if changed automatically. 2018-08-27 20:09:22 +02:00
Marek Bel
b08ae95568 Rename autoDeplete to lcd_autoDeplete and make it global. When filament runs out, call M600 AUTO if lcd_autoDeplete is enabled. Shorten finda polling period to 300 ms. 2018-08-27 19:36:54 +02:00
Marek Bel
1cdb7a48cb Show auto deplete only when mmu unit present. 2018-08-27 16:24:21 +02:00
Marek Bel
8279aba4d7 Add auto deplete setting. 2018-08-27 16:15:46 +02:00
PavelSindler
191e5dfddd mmu M600: dont use change extruder posibility; unload starts always imidiately 2018-08-27 16:12:10 +02:00
Marek Bel
f02b0d80e3 Split settings menu into separate macros. 2018-08-27 15:48:09 +02:00
PavelSindler
2b32b41969 MK2.5 build error hotfix 2018-08-27 05:53:39 +02:00
PavelSindler
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor 
Mmu filament sensor
 2018-08-27 05:26:12 +02:00
PavelSindler
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix 
M600 mmu fix
 2018-08-27 05:26:00 +02:00
PavelSindler
5d3eff6aea
Merge pull request #1072 from PavelSindler/manage_response 
mmu timeout update: no need to press knob on printer
 2018-08-27 05:25:50 +02:00
PavelSindler
c1ce07c463
Merge pull request #1071 from PavelSindler/feedrate_limit 
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
 2018-08-27 05:25:41 +02:00
PavelSindler
03fffae4c3 finda runout sensor can be turned on/off from menu 2018-08-27 05:20:42 +02:00
PavelSindler
ceb49d1262 finda filament runout: initial version 2018-08-27 04:21:43 +02:00
PavelSindler
ac3b92bade commentary fix 2018-08-26 23:55:29 +02:00
PavelSindler
d3ed270a5a single material printer (no mmu unit) M600 hotfix: M600_check_state loop working 2018-08-26 23:52:45 +02:00
PavelSindler
b13ff8e424 Wait for ok after U0 (unload current filament) command. 2018-08-26 22:08:52 +02:00
PavelSindler
4b1f1bc6a6 mmu timeout update: no need to press knob on printer to recover paused print 2018-08-26 21:39:37 +02:00
PavelSindler
5769b758ee max feedrate for stealth mode reduced to 100mm/s (because of loudness) 2018-08-26 16:50:28 +02:00
PavelSindler
2610547a48 Fixed displayed filament after load 2018-08-26 16:39:21 +02:00
PavelSindler
c57fdb11b7 show active extruder: numbers corrected 2018-08-26 14:22:52 +02:00
PavelSindler
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading 
Mmu v2: continue loading command
 2018-08-25 20:03:12 +02:00
PavelSindler
cf83852d22
Merge pull request #1068 from PavelSindler/M600_fix 
M600 fix: remove unretract
 2018-08-25 20:02:30 +02:00
PavelSindler
ddcdfce356
Merge pull request #1069 from PavelSindler/mmu_timeout 
5 minutes mmu timeout
 2018-08-25 20:02:12 +02:00
PavelSindler
0929a35a4f 5 minutes mmu timeout 2018-08-25 17:21:17 +02:00
PavelSindler
815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2 
Fix linearity correction 2
 2018-08-25 16:56:40 +02:00
PavelSindler
255cd2f34e
Merge pull request #1056 from mkbel/prdel 
Reserve space for MENU_ITEM_EDIT_int3_P in shared memory
 2018-08-25 16:55:56 +02:00
PavelSindler
f3edd37d11 removing unretract 2018-08-25 16:52:19 +02:00
PavelSindler
1f5bece0db check for required mmu2 firmware buildnr 2018-08-25 16:15:35 +02:00
Marek Bel
5fe6a3ed1c Place similar functions together. 2018-08-24 22:04:48 +02:00
Marek Bel
ea88dea432 Fix memory overwrite. 2018-08-24 21:24:14 +02:00
Marek Bel
085c77effb Fix when value edited, other values appeard as +1.000 instead of [off]. 2018-08-24 20:38:07 +02:00
Marek Bel
df61172984 Fix linearity correction not saved and applied when menu was left by timeout. 2018-08-24 20:31:49 +02:00
PavelSindler
32723d8d6f whitespace 2018-08-24 20:30:44 +02:00
Marek Bel
46a3baac57 Add menu_item_edit_P<uint8_t*> specialization to be used for linearity correction. Works well, but costs about 600..700B of FLASH, needs to be optimized. 2018-08-24 20:06:09 +02:00
PavelSindler
0c80eca648 merge with upstream 2018-08-24 18:30:03 +02:00
PavelSindler
68f2e22dad continue loading command 2018-08-24 18:28:05 +02:00
Marek Bel
5a7c9e3ffd Make local functions static. Saves 30B of flash with Arduino 1.6.9. No difference with Arduino 1.8.5. 2018-08-24 18:00:05 +02:00
Marek Bel
5daae818e1 Convert menu_item_edit to template function. 2018-08-24 17:40:40 +02:00
Marek Bel
ac5cb0989e Uncomment linearity correction menu. Fix return from linearity correction menu. 2018-08-24 16:00:51 +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
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
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
Robert Pelnar
315bfc43dd MMU communication fix 2018-08-21 16:41:01 +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
Robert Pelnar
a11ae18f7e XYZ calibration fix (progmem constants declaration) + version changed 2018-08-13 14:55:31 +02:00
Robert Pelnar
b7f17292ca Version changed 2018-08-10 20:08:10 +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
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
Robert Pelnar
10cc077ee4 mmu_enabled = true removed 2018-08-08 21:05:25 +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
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
PavelSindler
d21e527c73 PRUSA Fir reports also buildnumber 2018-08-05 20:17:04 +02:00
PavelSindler
0c2d0bebce merge with upstream fix 2018-08-03 19:14:17 +02:00
PavelSindler
cf06c5171c merge with upstream 2018-08-03 18:43:09 +02:00
PavelSindler
a1f69e0924 manage response update 2018-08-03 18:37:52 +02:00
PavelSindler
5824da8310 add more extrusion to M600 load filament 2018-08-03 15:42:06 +02:00
bubnikv
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
PavelSindler
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
Robert Pelnar
468873ec68 MMU2 - removed conditional translation for SNMM_V2, new module mmu 2018-08-02 18:54:00 +02:00
Robert Pelnar
282ff6c577 removed unused union 2018-08-02 17:09:02 +02:00
Robert Pelnar
d378575a68 SNMM_V2 - default retraction declared as variable 2018-08-02 17:07:09 +02:00
Robert Pelnar
10af023eae Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-08-02 16:32:59 +02:00
PavelSindler
1685f83020
Merge pull request #971 from mkbel/fix_menuData_compiler_warnings 
Fix 98 compiler warnings of type: warning: dereferencing type-punned …
 2018-08-02 09:42:54 +02:00
Marek Bel
ef8921d45e Fix 10 compiler warnings of type: sketch/menu.cpp: In function 'void _menu_edit_int3()': 
sketch/menu.cpp:272:51: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
 #define _menu_data (*((menu_data_edit_t*)menu_data))
 2018-08-01 22:43:36 +02:00
Marek Bel
93d2b37b5c Fix 98 compiler warnings of type: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 2018-08-01 22:43:27 +02:00
MRprusa3d
bafd290141 Sound 
& TuneMenu
 2018-08-01 22:34:58 +02:00
PavelSindler
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2 
M600 updated
 2018-08-01 19:39:08 +02:00
XPila
618aea25d6
Merge pull request #995 from PavelSindler/filament_type 
snmm v2: send filament type to mmu
 2018-08-01 19:33:44 +02:00
PavelSindler
24e7f0d0ec mmures fix 2018-08-01 19:29:50 +02:00
PavelSindler
06063118bd M600 updated 2018-08-01 18:47:28 +02:00
Marek Bel
ca97e2232f Merge remote-tracking branch 'ledvinap/MK3' into fix_compiler_warnings 2018-08-01 18:44:05 +02:00
Marek Bel
b0077182e5 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:53:49 +02:00