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

2348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Pelnar
c4d5b58c37 Merge remote-tracking branch 'upstream/MK3' into MK3-bed_fast_pwm 
# Conflicts:
#	Firmware/temperature.cpp
resolved
 2019-01-23 17:04:41 +01:00
PavelSindler
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723 
Pfw 723
 2019-01-23 14:12:19 +01:00
Robert Pelnar
50bcfae183 Fast PWM for bed - newer set HEATER_BED_PIN to 1 2019-01-21 18:21:17 +01:00
MRprusa3d
2c0d62fbf7 PID / manage_heater 
some small corrections
 2019-01-21 18:20:40 +01:00
Robert Pelnar
e612eb2a17 Fast PWM for bed - set pwm value from soft_pwm_bed variable. 2019-01-21 18:14:19 +01:00
Robert Pelnar
0963c889f0 Fast PWM for bed - timer2 used as system timer 2019-01-21 17:57:07 +01:00
MRprusa3d
d7ac459da7 PID / manage_heater 
build-warnings elimination
 2019-01-20 01:23:15 +01:00
mkbel
05d841ed39
Merge pull request #1468 from mkbel/build_output 
Echo variant if variant build failed.
 2019-01-18 21:31:44 +01:00
Marek Bel
0b3337d5df Echo variant if variant build failed. 2019-01-18 21:14:50 +01:00
mkbel
f2f9e67bd3
Merge pull request #1467 from mkbel/build_output 
Comment is not shown in travis output, try echo.
 2019-01-18 20:58:52 +01:00
Marek Bel
412ffc5fdf Comment is not shown in travis output, try echo. 2019-01-18 20:54:42 +01:00
mkbel
f6bbe7fd3a
Merge pull request #1466 from mkbel/build_output 
Fix mark build variants in travis - comment on the same line instead …
 2019-01-18 20:48:01 +01:00
Marek Bel
ccde850303 Fix mark build variants in travis - comment on the same line instead of separate echo command. As echo is not executed in case of previous command failure. 2019-01-18 20:46:10 +01:00
mkbel
39bc211d38
Merge pull request #1465 from mkbel/build_output 
Mark build variants in travis build output.
 2019-01-18 20:27:25 +01:00
Marek Bel
ee35ca011c Mark build variants in travis build output. 2019-01-18 20:21:14 +01:00
PavelSindler
1abc5303f9
Merge pull request #1464 from mkbel/decrease_build_verbosity 
Do not list build environment files being extracted on standard output.
 2019-01-18 17:15:30 +01:00
Marek Bel
2e1d576ccf Do not list build environment files being extracted on standard output. 2019-01-18 17:11:53 +01:00
MRprusa3d
d9f8e4eb9e PID / manage_heater 
PSD regulator improvement
 2019-01-17 02:57:08 +01:00
PavelSindler
ca8cb3784c
Merge pull request #1456 from mkbel/Fix_load_fail_current 
Do not disable motor currents when print is paused due to mmu load er…
 2019-01-16 12:49:38 +01:00
Marek Bel
3af1f81269 Do not disable motor currents when print is paused due to mmu load error. 2019-01-15 21:40:02 +01:00
PavelSindler
9424b4c50c
Merge pull request #1449 from prusa3d/mkbel-build-instructions 
Update README.md
 2019-01-15 20:37:04 +01:00
PavelSindler
2f4e859da9
Merge pull request #1442 from mkbel/auto_deplete_2 
Auto deplete 2
 2019-01-15 20:36:37 +01:00
mkbel
a0904f39e4
Update README.md 2019-01-08 22:25:32 +01:00
Marek Bel
2db42c8577 Merge branch 'MK3' into auto_deplete_2 2019-01-07 21:39:46 +01:00
mkbel
b145074589
Merge pull request #1404 from PavelSindler/idler_sensor 
Printer with idler sensor
 2019-01-04 23:36:04 +01:00
Marek Bel
c080b899c3 Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled(). 2019-01-04 22:32:48 +01:00
PavelSindler
7946cd7250 eeprom write nr. limitation 2019-01-04 22:23:11 +01:00
PavelSindler
02262ff7ca mmu load fail: possibility to unload/eject filament from menu 2019-01-04 21:37:19 +01:00
Marek Bel
d89c03a0f1 Documentation. 2019-01-04 21:26:13 +01:00
Marek Bel
1a219b2372 Mark filament as depleted when detected by MMUv2 FINDA. Do not try to load filament if it is marked depleted, load next filament instead. Force user action when all filaments are marked as depleted. 2019-01-04 21:11:42 +01:00
PavelSindler
b7b7e9387f do resend attempts before pausing print (mmu needs attention state) so the print would not be paused if T-code is not received correctly by mmu; prevent infinite loading 2019-01-04 21:07:52 +01:00
Marek Bel
a7128ffa04 Comment. 2019-01-04 19:56:15 +01:00
Marek Bel
92ff284f82 Remove redundant code. 2019-01-04 19:35:33 +01:00
Marek Bel
360a977520 Fix allDepleted(). Add tests. 2019-01-04 19:34:42 +01:00
Marek Bel
a309ec1b0b Add filament auto deplete engine for multi-material prints with MMUv2. 2019-01-03 22:58:25 +01:00
MRprusa3d
4e300fd552 minTemp 
safety heaters management during/after minTemp
 2019-01-02 18:25:41 +01:00
PavelSindler
3ab1daf722 MMU_DEBUG temporarily enabled 2018-12-21 23:17:32 +01:00
PavelSindler
88441f7f2f scan power failures fix 2018-12-21 23:07:39 +01:00
PavelSindler
6ba86acebc send A (abort) command to mmu only when loading phase of T-code 2018-12-21 22:33:01 +01:00
PavelSindler
e36e58f385 show sensor on/off temporarily changed to unlocalized strings 2018-12-21 21:28:57 +01:00
PavelSindler
688d4a8a82 missing defines in variant files 2018-12-21 21:05:54 +01:00
PavelSindler
ba57986b72 merge changes from upstream 2018-12-21 20:58:38 +01:00
PavelSindler
5462d451e1 show power failures in fail stats menu, shorter load to nozzle if idler sensor detected 2018-12-21 20:56:45 +01:00
PavelSindler
d1ca73597b
Merge pull request #1412 from XPila/V3_5 
Repeat last MMU command after timeout
 2018-12-21 20:53:24 +01:00
PavelSindler
d292e877df load to nozzle shortened, sensor menu moved to support 2018-12-21 18:51:13 +01:00
PavelSindler
3c64bad1cb initial version which works on old and new hw, initial version of idler sensor detection 2018-12-21 17:12:16 +01:00
PavelSindler
75523b1497
Merge pull request #1417 from PavelSindler/z_cal_endstops 
version changed
 2018-12-19 20:08:22 +01:00
PavelSindler
acbfe89f04 version changed 2018-12-19 20:07:18 +01:00
PavelSindler
b0fce9122e
Merge pull request #1416 from PavelSindler/z_cal_endstops 
Z cal endstops and stop paused print fix
 2018-12-19 19:46:27 +01:00
Robert Pelnar
f79137898a Fix - move down after calibrate Z (PFW718) 2018-12-19 19:22:03 +01:00