Commit Graph

2976 Commits

Author SHA1 Message Date
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
PavelSindler
065d56b2c6 version change 2019-02-06 23:58:30 +01:00
PavelSindler
38b0e5439b version change 2019-02-06 23:52:24 +01:00
PavelSindler
3fd66d0b13
Merge pull request #1511 from MRprusa3d/MK25S
MK2.5S
2019-02-06 23:44:30 +01:00
MRprusa3d
b17a961241 MK2.5S
pin definition for filament sensor connection
2019-02-06 23:31:48 +01:00
PavelSindler
e028db7bf9 version change 2019-02-06 23:30:01 +01:00
PavelSindler
9ad453bb2b
Merge pull request #1509 from PavelSindler/dev2
message change
2019-02-06 23:24:30 +01:00
PavelSindler
ff52499bdc extr fan RPM measuring fix 2019-02-06 23:05:13 +01:00
PavelSindler
e432e258dc extr fan RPM measuring fix 2019-02-06 22:56:10 +01:00
PavelSindler
22217a42f7 message change 2019-02-06 21:37:39 +01:00
PavelSindler
a85d8e7f97 message change 2019-02-06 21:36:21 +01:00
PavelSindler
8d74f580d2
Merge pull request #1508 from prusa3d/revert-1507-MK3
Revert "Dictionaries and po files updated"
2019-02-06 20:36:05 +01:00
PavelSindler
22493c6a3c
Revert "Dictionaries and po files updated" 2019-02-06 20:35:47 +01:00
PavelSindler
2c11391159
Merge pull request #1507 from XPila/MK3
Dictionaries and po files updated
2019-02-06 20:13:36 +01:00
Robert Pelnar
f9d6d0802a po files updated 2019-02-06 20:08:29 +01:00
Robert Pelnar
00ab95179f Dictionaries updated 2019-02-06 19:58:07 +01:00
PavelSindler
166f886203
Merge pull request #1506 from PavelSindler/dev2
sw pwm for print fan, bed hw pwm, fsensor changes...
2019-02-06 19:46:00 +01:00
PavelSindler
d19c92bca8 welcome message changed 2019-02-06 19:41:17 +01:00
PavelSindler
de9c87c592 welcome message changed 2019-02-06 19:38:52 +01:00
Marek Bel
c704a4b7ab Fix menu stack overrun. 2019-02-06 18:25:45 +01:00
PavelSindler
726d5aa3c3 typo fixed 2019-02-06 16:29:10 +01:00