Commit Graph

2593 Commits

Author SHA1 Message Date
Laurentiu
afc86a1363 missing ; 2019-02-18 05:50:29 +02: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
Laurentiu
4835b9b220 7x7 points mesh bed leveling 2019-02-14 10:57:58 +02: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
PavelSindler
62500f0b55 version changed 2019-02-12 10:39:09 +01:00
Marek Bel
6c8d9c6fb4 Retry filament load on MMU load failure once. 2019-02-11 23:43:42 +01:00
Marek Bel
d33b24c281 Unload filament after MMU load failed so MMU unit can be controlled by its buttons. 2019-02-11 23:24:55 +01:00
PavelSindler
b85661309f configuration change 2019-02-11 16:38:36 +01:00
PavelSindler
ccc542d74a MK2.5 IR_SENSOR_PIN modified 2019-02-11 14:32:21 +01:00
PavelSindler
ef4f24e819
Merge pull request #1518 from XPila/MK3
New translation
2019-02-08 17:07:28 +01:00
Robert Pelnar
cc78c616ab Dictionaries updated 2019-02-08 16:42:22 +01:00
Robert Pelnar
0069e8971b French po - fixed nonasci character. 2019-02-08 16:32:09 +01:00
Robert Pelnar
11b6c8d5f2 Po files returned from translators. 2019-02-08 16:28:20 +01:00
PavelSindler
26509b9a56
Merge pull request #1515 from PavelSindler/MK3_for_merging
version change
2019-02-07 19:43:51 +01:00
PavelSindler
cd692f6be6 version change 2019-02-07 19:43:08 +01:00
PavelSindler
fe75e9d1ae
Merge pull request #1513 from XPila/MK3
Localization (script fix + new texts + updated .po and .pot)
2019-02-07 15:44:44 +01:00
Robert Pelnar
6309efcd00 .po and .pot updated 2019-02-07 14:54:48 +01:00
Robert Pelnar
c72103b135 Dictionaries updated (added 16 new texts) 2019-02-07 14:41:20 +01:00
Robert Pelnar
851ac07941 Fixed script lang-add.sh (adding texts with spaces at end) 2019-02-07 14:36:03 +01:00