MRprusa3d
|
c0a8d87e9e
|
Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795
|
2019-02-22 03:16:23 +01:00 |
|
MRprusa3d
|
be0ed46335
|
preHeat @ filament management
another funcionality III
|
2019-02-22 03:09:50 +01:00 |
|
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 |
|
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 |
|
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 |
|
Marek Bel
|
8b858286ac
|
Document.
|
2019-02-21 02:30:01 +01:00 |
|
Marek Bel
|
326c8492b5
|
Move extruder forth and back after filament detected by sensor to detect bad load.
|
2019-02-21 01:19:26 +01:00 |
|
PavelSindler
|
1e729048dc
|
cmdqueue_reset fix
|
2019-02-21 00:14:49 +01:00 |
|
MRprusa3d
|
da0867cfc5
|
preHeat @ filament management
another funcionality
|
2019-02-20 03:01:33 +01:00 |
|
Laurentiu
|
afc86a1363
|
missing ;
|
2019-02-18 05:50:29 +02: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 |
|
PavelSindler
|
9d76b6912c
|
merge new changes from upstream
|
2019-02-15 17:05:39 +01:00 |
|
PavelSindler
|
2b6668b853
|
merge MK3S branch into MK3
|
2019-02-15 16:42:40 +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
|
4c76393231
|
version change
|
2019-02-12 13:44:50 +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
|
cd692f6be6
|
version change
|
2019-02-07 19:43:08 +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 |
|
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
|
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
|
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 |
|
PavelSindler
|
63c8a36185
|
typo fixed
|
2019-02-06 16:27:44 +01:00 |
|
PavelSindler
|
a220c97f94
|
Revert "variant files"
This reverts commit 850d3316b6.
|
2019-02-06 16:19:30 +01:00 |
|
PavelSindler
|
2fe8e0670a
|
MK2 build fail fixed
|
2019-02-06 16:15:19 +01:00 |
|
PavelSindler
|
850d3316b6
|
variant files
|
2019-02-06 15:18:12 +01:00 |
|
PavelSindler
|
ef86c78f25
|
menu item text changed
|
2019-02-06 14:24:47 +01:00 |
|
PavelSindler
|
1ba046395e
|
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
|
2019-02-06 12:37:18 +01:00 |
|
PavelSindler
|
27d002a46f
|
Merge remote-tracking branch 'robert/MK3-variants' into variants
|
2019-02-06 09:20:21 +01:00 |
|
PavelSindler
|
860e6f9994
|
Merge remote-tracking branch 'upstream/MK3' into variants
|
2019-02-06 09:19:38 +01:00 |
|
PavelSindler
|
fcb7dd90cf
|
Merge pull request #1505 from MRprusa3d/PFW-210
preHeat @ filament load / unload / autoLoad
|
2019-02-06 09:14:03 +01:00 |
|
MRprusa3d
|
a53d150903
|
preHeat @ filament load / unload / autoLoad
autoLoad option added
|
2019-02-06 01:58:05 +01:00 |
|
Robert Pelnar
|
93d4128163
|
Fixed timer2 colission with arduino framework around "tone" function.
|
2019-02-05 19:08:57 +01:00 |
|
PavelSindler
|
62e253edd0
|
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
|
2019-02-05 18:21:44 +01:00 |
|
PavelSindler
|
903028e574
|
fix fan speed measuring for PWM = 255
|
2019-02-05 17:46:31 +01:00 |
|
PavelSindler
|
91b12ff64b
|
bed level correction menu fix (menu_item_edit for negative integers)
|
2019-02-05 16:49:29 +01:00 |
|
PavelSindler
|
f9298b37b8
|
fan check hotfix (selftest, measuring RPM, fan errors)
|
2019-02-05 04:02:38 +01:00 |
|
PavelSindler
|
ea20529945
|
merge changes from upstream
|
2019-02-04 15:23:39 +01:00 |
|
MRprusa3d
|
5a2df47077
|
minTemp
better stability for delay-cutting
|
2019-02-04 14:54:25 +01:00 |
|
PavelSindler
|
9a51a7be29
|
Merge branch 'bed_correction_fix' into variants
|
2019-02-04 12:47:06 +01:00 |
|
PavelSindler
|
0853ef5d06
|
Merge remote-tracking branch 'upstream/MK3' into variants
|
2019-02-04 12:45:28 +01:00 |
|
PavelSindler
|
b4f2dc3b5e
|
Merge remote-tracking branch 'robert/MK3-variants' into variants
|
2019-02-04 12:41:08 +01:00 |
|
PavelSindler
|
6d5a2ae816
|
Merge pull request #1499 from MRprusa3d/PFW-210
preHeat @ filament load / unload
|
2019-02-04 12:37:42 +01:00 |
|
Robert Pelnar
|
d2a4cb4c49
|
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
|
2019-02-04 12:20:07 +01:00 |
|
MRprusa3d
|
fff8fc8a48
|
preHeat @ filament load / unload
filament-list correction (PET missing)
|
2019-02-04 12:12:35 +01:00 |
|
PavelSindler
|
2f9ab7b185
|
Merge branch 'dev' into variants
|
2019-02-04 01:32:24 +01:00 |
|
Robert Pelnar
|
3244c37435
|
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
|
2019-02-04 01:32:04 +01:00 |
|
PavelSindler
|
036bd4eb46
|
Merge branch 'dev' into variants
|
2019-02-04 01:20:14 +01:00 |
|
PavelSindler
|
6bf8611afa
|
mintemp: delay cutting lines removed
|
2019-02-04 01:19:58 +01:00 |
|
PavelSindler
|
71e4459cc9
|
Merge branch 'dev' into variants
|
2019-02-04 01:14:11 +01:00 |
|
PavelSindler
|
fba207e0ec
|
crash detection: don't wait for heater if target temp = 0; new priting type
|
2019-02-04 01:13:46 +01:00 |
|
PavelSindler
|
5324181bf7
|
maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself
|
2019-02-03 20:56:14 +01:00 |
|
PavelSindler
|
454a087fb3
|
Merge branch 'dev' into variants
|
2019-02-01 21:24:38 +01:00 |
|
PavelSindler
|
4444b155f1
|
M600: prevention of blob; massage changed when autoload is active
|
2019-02-01 21:08:34 +01:00 |
|
PavelSindler
|
97aaf919a3
|
Merge remote-tracking branch 'upstream/MK3' into dev
|
2019-02-01 18:12:59 +01:00 |
|
Robert Pelnar
|
79449a8eaf
|
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
|
2019-02-01 13:29:50 +01:00 |
|
PavelSindler
|
2cb3b99981
|
Merge branch 'dev' into variants
|
2019-01-31 18:04:38 +01:00 |
|
PavelSindler
|
4f67a9569c
|
dont show filament sensor in extruder info menu
|
2019-01-31 18:03:56 +01:00 |
|
PavelSindler
|
6342b6032c
|
Merge remote-tracking branch 'upstream/MK3' into variants
|
2019-01-31 10:18:41 +01:00 |
|
PavelSindler
|
491dbf5ebd
|
Merge pull request #1493 from MRprusa3d/PFW-210
preHeat @ filament load / unload
|
2019-01-31 10:15:59 +01:00 |
|
MRprusa3d
|
921b6993ee
|
preHeat @ filament load / unload
|
2019-01-31 05:21:53 +01:00 |
|
PavelSindler
|
9926468c91
|
Merge remote-tracking branch 'upstream/MK3' into variants
|
2019-01-30 17:26:45 +01:00 |
|
PavelSindler
|
b24cd58a50
|
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
HW pwm fix
|
2019-01-30 12:52:44 +01:00 |
|
Robert Pelnar
|
9890c60fe5
|
HW PWM fix
|
2019-01-30 00:06:12 +01:00 |
|
PavelSindler
|
bbdb2c1597
|
Merge branch 'dev' into variants
|
2019-01-29 15:34:56 +01:00 |
|
MRprusa3d
|
19fd05bb46
|
Merge pull request #1490 from PavelSindler/menu_update
menu update
|
2019-01-29 13:29:27 +01:00 |
|
PavelSindler
|
1fa9913029
|
include printers.h
|
2019-01-28 21:54:44 +01:00 |
|
PavelSindler
|
220437316b
|
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
Mk3 bed fast pwm
|
2019-01-28 21:14:01 +01:00 |
|
PavelSindler
|
60acdd23c5
|
variants
|
2019-01-28 21:12:38 +01:00 |
|
PavelSindler
|
29e156b26d
|
printer types updated
|
2019-01-28 19:48:46 +01:00 |
|