Commit Graph

2557 Commits

Author SHA1 Message Date
PavelSindler
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging
version change
2019-02-21 19:17:03 +01:00
PavelSindler
da28773480 version change 2019-02-21 19:16:24 +01:00
PavelSindler
286e68597e
Merge pull request #1564 from MRprusa3d/PFW-795
Pfw 795
2019-02-21 15:55:52 +01:00
MRprusa3d
e422cc1c26
Merge branch 'MK3' into PFW-795 2019-02-21 15:43:56 +01:00
MRprusa3d
ed93f1b7f0 preHeat @ filament management
another funcionality IIb
2019-02-21 15:27:22 +01:00
PavelSindler
16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix
comments
2019-02-21 14:29:04 +01:00
PavelSindler
6ad5c07e6d comments 2019-02-21 14:28:05 +01:00
PavelSindler
278bf0d9bb
Merge pull request #1561 from PavelSindler/MK3_for_merging
preHeat @ filament management
2019-02-21 13:21:27 +01:00
MRprusa3d
323071f50a preHeat @ filament management
another funcionality II
2019-02-21 13:20:29 +01:00
MRprusa3d
a54c68b874 preHeat @ filament management
another funcionality II
2019-02-21 04:45:44 +01:00
PavelSindler
078e003d60
Merge pull request #1558 from PavelSindler/mmu_stop_print_fix
cmdqueue_reset fix
2019-02-21 00:31:11 +01:00
PavelSindler
1e729048dc cmdqueue_reset fix 2019-02-21 00:14:49 +01:00
mkbel
def7fc7278
Merge pull request #1543 from 3d-gussner/MK3-winbuild
Build Prusa-Firmware on Linux 64-bit and Windows 64-bit
2019-02-20 13:36:27 +01:00
PavelSindler
fcfcce5be5
Merge pull request #1557 from prusa3d/PFW-795
preHeat @ filament management
2019-02-20 09:15:11 +01:00
MRprusa3d
da0867cfc5 preHeat @ filament management
another funcionality
2019-02-20 03:01:33 +01:00
mkbel
a4cf31b104
Update README.md
Reorder sections, update table of content, add notes and issue tracker link for Windows Linux subsystem and Git-bash builds.
2019-02-19 23:57:24 +01:00
mkbel
902f85e8ba
Merge pull request #1544 from 3d-gussner/MKxS-travis-fix
Add MK25S and MK3S to travis check
2019-02-18 22:57:11 +01:00
3d-gussner
ce12e022e2
Changes to PF-build.sh 2019-02-16 23:02:23 +01:00
3d-gussner
3726936b41 Added arguments to run PF-build.sh without user input
maybe an otion to use travis
2019-02-16 08:04:45 +01:00
3d-gussner
4d556c8bed added MK25S and MK3S to travis check 2019-02-16 06:39:57 +01:00
3d-gussner
b8ba7f8400 Merge branch 'MK3' into MK3-winbuild 2019-02-16 06:37:41 +01:00
3d-gussner
4ab4e4da4c Updated README 2019-02-16 06:07:31 +01:00
3d-gussner
6c9353dc26 Merge branch 'MK3-winbuild' of https://github.com/3d-gussner/Prusa-Firmware into MK3-winbuild 2019-02-16 06:06:29 +01:00
3d-gussner
a608b0d26e Fix travis fail 2019-02-16 06:05:43 +01:00
3d-gussner
038e4d3fdf
fixed some typos 2019-02-16 04:32:20 +01:00
PavelSindler
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
XPila
dca67e11de
Merge pull request #1540 from PavelSindler/idler_issue
Fix for "Idler didn't disengage after mmu needs attention"
2019-02-15 17:44:39 +01:00
PavelSindler
9d76b6912c merge new changes from upstream 2019-02-15 17:05:39 +01:00
PavelSindler
2dde898b3f
Merge pull request #1539 from PavelSindler/MK3S_merge
Merge MK3S branch to MK3 branch
2019-02-15 17:01:07 +01:00
PavelSindler
2b6668b853 merge MK3S branch into MK3 2019-02-15 16:42:40 +01:00
3d-gussner
d0e3e9d2e2 Build firmware under Windows 10 64-bit ...
using Linux subsystem Ubuntu or git-bash
2019-02-15 16:26:47 +01:00
PavelSindler
fec64a9d5e
Merge pull request #1525 from mkbel/improve_mmu_load_failed_2
Improve mmu load failed 2
2019-02-15 15:52:35 +01:00
PavelSindler
69ff37729e whitespace 2019-02-15 14:19:30 +01:00
PavelSindler
0f791ce47f mmu needs attention: idler error fix 2019-02-15 14:17:47 +01:00
MRprusa3d
0c1f9b5100 preHeat @ filament management
target temperature keeping
2019-02-15 02:25:44 +01:00
MRprusa3d
80c3420a12
Merge branch 'MK3' into PFW-210 2019-02-14 00:05:50 +01:00
MRprusa3d
ef1f82627e preHeat @ filament load / unload / autoLoad / MMU
MMU options added
2019-02-13 23:53:00 +01:00
Marek Bel
a5437cb15b Resend MMU T commands only.
This solves problem with unload repeated if unload takes too long, second ok reply then triggers Wait end and resumes print.
2019-02-13 22:29:29 +01:00
Marek Bel
a4032e437e Add MMU wait command after MMU load failed. Resume print when MMU wait command returns OK. 2019-02-13 21:28:21 +01:00
Marek Bel
daaec0ef04 Convert MmuCmd to enum class. 2019-02-13 17:12:35 +01:00
Marek Bel
8e23e7f322 Save some flash by using smaller type for filament. 2019-02-13 16:37:54 +01:00
Marek Bel
9e873ac0f7 Use enum for mmu_cmd instead of plain integer type. 2019-02-13 01:51:39 +01:00
Marek Bel
bb7eeef1f4 Define debug printf and puts functions to make code more readable. 2019-02-12 23:24:23 +01:00
Marek Bel
e1216934ef Save flash by defining underlying type and omitting number value. 2019-02-12 21:53:11 +01:00
Marek Bel
3379fb4866 Convert mmu_state to enum. 2019-02-12 21:43:26 +01:00
PavelSindler
b4660bac95
Merge pull request #1529 from PavelSindler/variants_MK3S
version change
2019-02-12 13:45:54 +01:00
PavelSindler
4c76393231 version change 2019-02-12 13:44:50 +01:00
PavelSindler
38af553d92
Merge pull request #1528 from PavelSindler/variants_MK3S
Variant files mk3s
2019-02-12 13:39:19 +01:00
PavelSindler
af77db321b merge changes from upstream 2019-02-12 13:38:02 +01:00
PavelSindler
6bb892cad9
Merge pull request #1527 from PavelSindler/MK3_for_merging
version changed
2019-02-12 10:39:53 +01:00