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 |
|
PavelSindler
|
b20c66e3b5
|
Merge pull request #999 from MRprusa3d/MK3
Sound
|
2018-08-02 09:16:51 +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 |
|
mkbel
|
5ddf1fce62
|
Merge pull request #997 from mkbel/fix_compiler_warnings
Fix compiler warnings
|
2018-08-01 19:05:00 +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
|
dcd47f76d0
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 18:43:02 +02:00 |
|
Marek Bel
|
b0077182e5
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 17:53:49 +02:00 |
|
Marek Bel
|
441ed5677d
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 17:46:23 +02:00 |
|
Marek Bel
|
1a2d7657dc
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 17:39:54 +02:00 |
|
Marek Bel
|
6f824730af
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 17:37:09 +02:00 |
|
Marek Bel
|
a8f73b3915
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 17:19:34 +02:00 |
|
Marek Bel
|
97ec616dd1
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 17:14:36 +02:00 |
|
Marek Bel
|
ab5593e673
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 16:58:09 +02:00 |
|
PavelSindler
|
54adb0beea
|
missing eol added
|
2018-08-01 16:54:26 +02:00 |
|
Marek Bel
|
b7ba0c5f14
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 16:50:44 +02:00 |
|
Marek Bel
|
9147ae7cf7
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 16:49:45 +02:00 |
|
PavelSindler
|
b35ef498f0
|
comments updated
|
2018-08-01 16:46:46 +02:00 |
|
Marek Bel
|
665a885a21
|
Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings
|
2018-08-01 16:44:17 +02:00 |
|
Marek Bel
|
e4ff8b13cf
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 16:43:25 +02:00 |
|
Marek Bel
|
98e921d456
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 16:24:07 +02:00 |
|
Marek Bel
|
542a91ef9c
|
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
|
2018-08-01 16:02:37 +02:00 |
|
PavelSindler
|
135c4db5da
|
gcode for filemant type initial version: just re-sending information to mmu
|
2018-08-01 15:43:13 +02:00 |
|
Robert Pelnar
|
43cc789602
|
feedrate symbol changed back to double-arrow
|
2018-08-01 15:15:54 +02:00 |
|
PavelSindler
|
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 |
|
PavelSindler
|
0e059f8da6
|
single material fix: remove semicolon, unload_filament() function definition
|
2018-08-01 11:33:58 +02:00 |
|
PavelSindler
|
1f5026eed7
|
Merge pull request #991 from XPila/MK3-new_lang
FSensor improvement
|
2018-08-01 10:43:34 +02:00 |
|
PavelSindler
|
d363bd071d
|
Merge pull request #990 from PavelSindler/snmm_v2
Snmm v2: M600, communication timeouts with mmu
|
2018-08-01 10:43:22 +02:00 |
|
PavelSindler
|
e153a29bdb
|
messages corrected, 5 minutes timeout when communicating with mmu
|
2018-08-01 10:42:09 +02:00 |
|
PavelSindler
|
45ac42caff
|
snmm v2: manage response: wait for nozzle temp only when heating
|
2018-08-01 09:58:07 +02:00 |
|
Robert Pelnar
|
c2fe3b920c
|
FSensor - chunk defined in mm, runout detection distance tunning
|
2018-08-01 01:24:35 +02:00 |
|
Robert Pelnar
|
9509a60549
|
FSensor improovement
autoload sensitivity decreased (false triggering on MK25)
filtering algorithm more robust
additional check - fixed sync with autoload and better condition
|
2018-07-31 20:23:31 +02:00 |
|
PavelSindler
|
be1167fae3
|
M600 for multimaterial: don't check if filament unload was succesfull
|
2018-07-31 19:18:09 +02:00 |
|
PavelSindler
|
b99b73c924
|
missing declaration
|
2018-07-31 19:03:53 +02:00 |
|
PavelSindler
|
40da6deef8
|
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
|
2018-07-31 19:00:42 +02:00 |
|
Robert Pelnar
|
7731898b58
|
FSensor - optical quality meassurement - ignore reflexivity for materials with low data deviation
|
2018-07-31 16:28:11 +02:00 |
|
PavelSindler
|
04d0178150
|
automatic M600 initial version
|
2018-07-31 12:24:22 +02:00 |
|
PavelSindler
|
778840097c
|
Merge pull request #985 from XPila/MK3-new_lang
V 3.4.0 - it translation, live adjust Z fix
|
2018-07-31 10:28:46 +02:00 |
|
Robert Pelnar
|
fa30353646
|
Live adjust Z format fix
|
2018-07-30 19:24:04 +02:00 |
|
Robert Pelnar
|
4b6b2a657d
|
it translation fixed
|
2018-07-30 18:42:56 +02:00 |
|
PavelSindler
|
67f56d3de9
|
merge with upstream
|
2018-07-30 17:24:58 +02:00 |
|
PavelSindler
|
9195167541
|
Merge pull request #984 from MRprusa3d/MK3
Sound
|
2018-07-30 10:55:06 +02:00 |
|