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

1762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
XPila
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
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
XPila
a88d64f195
Merge pull request #1022 from XPila/MK3-new_lang 
mmu_enabled = true removed
 2018-08-08 21:07:00 +02:00
Robert Pelnar
10cc077ee4 mmu_enabled = true removed 2018-08-08 21:05:25 +02:00
XPila
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
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
XPila
3147e6b3d8
Merge pull request #1020 from XPila/MK3-new_lang 
Mk3 new lang
 2018-08-07 20:56:10 +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
XPila
cc37ef4390
Merge pull request #1010 from PavelSindler/snmm_v2 
PRUSA Fir reports also buildnumber
 2018-08-06 15:18:20 +02:00
PavelSindler
d21e527c73 PRUSA Fir reports also buildnumber 2018-08-05 20:17:04 +02:00
PavelSindler
2097ef8485
Merge pull request #1006 from PavelSindler/snmm_v2 
merge with upstream fix
 2018-08-03 19:15:00 +02:00
PavelSindler
0c2d0bebce merge with upstream fix 2018-08-03 19:14:17 +02:00
XPila
8de1bd6a6c
Merge pull request #1005 from PavelSindler/snmm_v2 
M600 fix; manage_response fix
 2018-08-03 18:57:51 +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
PavelSindler
90ee05a036
Merge pull request #1002 from XPila/MK3-new_lang 
MMU2
 2018-08-02 19:01:17 +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
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