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
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
cc37ef4390
Merge pull request #1010 from PavelSindler/snmm_v2
...
PRUSA Fir reports also buildnumber
2018-08-06 15:18:20 +02:00
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
2097ef8485
Merge pull request #1006 from PavelSindler/snmm_v2
...
merge with upstream fix
2018-08-03 19:15:00 +02:00
0c2d0bebce
merge with upstream fix
2018-08-03 19:14:17 +02:00
8de1bd6a6c
Merge pull request #1005 from PavelSindler/snmm_v2
...
M600 fix; manage_response fix
2018-08-03 18:57:51 +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
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
90ee05a036
Merge pull request #1002 from XPila/MK3-new_lang
...
MMU2
2018-08-02 19:01:17 +02:00
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
282ff6c577
removed unused union
2018-08-02 17:09:02 +02:00
d378575a68
SNMM_V2 - default retraction declared as variable
2018-08-02 17:07:09 +02:00
10af023eae
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-08-02 16:32:59 +02:00
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
b20c66e3b5
Merge pull request #999 from MRprusa3d/MK3
...
Sound
2018-08-02 09:16:51 +02:00
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
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
bafd290141
Sound
...
& TuneMenu
2018-08-01 22:34:58 +02:00
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
...
M600 updated
2018-08-01 19:39:08 +02:00
618aea25d6
Merge pull request #995 from PavelSindler/filament_type
...
snmm v2: send filament type to mmu
2018-08-01 19:33:44 +02:00
24e7f0d0ec
mmures fix
2018-08-01 19:29:50 +02:00
5ddf1fce62
Merge pull request #997 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-08-01 19:05:00 +02:00
06063118bd
M600 updated
2018-08-01 18:47:28 +02:00
ca97e2232f
Merge remote-tracking branch 'ledvinap/MK3' into fix_compiler_warnings
2018-08-01 18:44:05 +02:00
dcd47f76d0
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 18:43:02 +02:00
b0077182e5
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:53:49 +02:00
441ed5677d
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:46:23 +02:00
1a2d7657dc
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:39:54 +02:00
6f824730af
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:37:09 +02:00
a8f73b3915
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:19:34 +02:00
97ec616dd1
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:14:36 +02:00
ab5593e673
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:58:09 +02:00
54adb0beea
missing eol added
2018-08-01 16:54:26 +02:00
b7ba0c5f14
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:50:44 +02:00
9147ae7cf7
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:49:45 +02:00
b35ef498f0
comments updated
2018-08-01 16:46:46 +02:00
665a885a21
Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings
2018-08-01 16:44:17 +02:00
e4ff8b13cf
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:43:25 +02:00
98e921d456
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:24:07 +02:00
542a91ef9c
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:02:37 +02:00
135c4db5da
gcode for filemant type initial version: just re-sending information to mmu
2018-08-01 15:43:13 +02:00
43cc789602
feedrate symbol changed back to double-arrow
2018-08-01 15:15:54 +02:00
1b120bf500
Merge pull request #994 from PavelSindler/MK3_for_merging
...
single material fix: remove semicolon, unload_filament() function def…
2018-08-01 11:35:01 +02:00
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +02:00
1f5026eed7
Merge pull request #991 from XPila/MK3-new_lang
...
FSensor improvement
2018-08-01 10:43:34 +02:00
Robert Pelnar
mkbel
PavelSindler
PavelSindler
bubnikv
Marek Bel
MRprusa3d