62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
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
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
eea755496b
Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.
...
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
2019-01-27 22:48:51 +01:00
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
da2c963893
conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed
2019-01-24 16:00:52 +01:00
e0c1e4a02d
version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus
2019-01-24 01:12:30 +01:00
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
927898151a
fix - tmc2130 conditional translation
2018-12-14 15:46:50 +01:00
cfe83daf4a
Meshbed leveling fail - move 1mm outside of colission with disabled endstop
2018-12-14 15:32:47 +01:00
df71398066
statistics fix
2018-12-13 00:43:27 +01:00
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +01:00
29ecd4ec7a
duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu
2018-12-12 22:32:47 +01:00
3d4cb8a994
Document gcode T.
2018-12-12 20:30:28 +01:00
c256af0a1c
unknown filament added; the same T-code will be not executed twice in a row; continue loading
2018-12-12 14:50:55 +01:00
e52e53d1eb
send continue loading commands periodically if initial load fails
2018-12-12 13:54:17 +01:00
6157c3ab32
New filament sensor
2018-12-06 15:41:53 +01:00
41b78187ca
LCD backlight - full brightnes at start
2018-12-06 15:27:05 +01:00
d1d4a8c58c
whitespace
2018-11-29 17:33:36 +01:00
8e239ce76f
changed M220
2018-11-29 17:02:38 +01:00
929e1de253
special variable for saving/restoring feedmultiply using M220
2018-11-29 17:02:10 +01:00
839de141a3
resolving conflicts
2018-11-29 16:26:49 +01:00
abf20ef6a2
merged changes from public upstream (Prusa-Firmware repository)
2018-11-29 13:46:58 +01:00
b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5
...
Lang - final corrections
2018-11-22 19:03:30 +01:00
42f2a61416
Lang - text "TRIGGERED" removed from dictionary
2018-11-22 18:46:02 +01:00
e9131542ca
Lang - text "Sleep..." removed from dictionary
2018-11-22 18:43:21 +01:00
72c7810641
Lang - text "Resend" removed from dictionary
2018-11-22 18:38:20 +01:00
7426efac9b
Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary
2018-11-22 18:36:38 +01:00
123bef636a
Lang - text "Printer halted. kill() called!" removed from dictionary
2018-11-22 18:33:15 +01:00
123725edd1
Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed
2018-11-22 18:30:53 +01:00
0fceade481
Lang - text "PowerUp" removed from dictionary
2018-11-22 18:24:21 +01:00
1cbb261707
Lang - text "open" removed from dictionary
2018-11-22 18:18:25 +01:00
72d47eaeba
Lang - text "ok" removed from dictionary
2018-11-22 18:12:19 +01:00
fd3cd9b551
Lang - texts "Mxxx Invalid extruder " removed from dictionary
2018-11-22 18:06:10 +01:00
60e567b660
Lang - text " Last Updated: " removed from dictionary
2018-11-22 17:48:12 +01:00
a1f03e9531
Lang - text " Free Memory: " removed from dictionary
2018-11-22 17:46:44 +01:00
104353c0c5
Lang - text " PlannerBufferBytes: " removed from dictionary
2018-11-22 17:43:11 +01:00
099fe216b6
Lang - text "KILLED. " removed from dictionaries
2018-11-22 17:26:01 +01:00
e5dd4d757a
progress bar fix
2018-11-16 15:45:55 +01:00
ffe906c733
MeshBed Levelling Fail V
2018-11-14 16:45:49 +01:00
51b4858a87
Merge pull request #1334 from XPila/V3_5
...
PFW658 - disable extruder motor while changing filament with mmu2 (pr…
2018-11-13 16:10:24 +01:00
bfc343c7c5
PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating)
2018-11-13 16:04:46 +01:00
15d0b083ed
whitespace
2018-11-13 15:58:21 +01:00
17a1049f23
T-codes fix
2018-11-13 15:56:19 +01:00
3d97d81734
Merge pull request #1329 from PavelSindler/M600_load_fil_message
...
M600 filament load progress bar changes
2018-11-12 20:52:06 +01:00
41b885c537
M907 fix - value in mA (PFW)
2018-11-12 20:39:25 +01:00
32da5bc039
progress bar time counted from feedrate and E - distance
2018-11-12 19:55:53 +01:00
f4c1e7924f
M600: show progress bar during first filament load
2018-11-12 18:35:06 +01:00
c991c8b314
resume print fix: wait for heater() never disable steppers
2018-11-09 18:29:35 +01:00
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +01:00
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
...
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
ccb58ae7c9
Revert "MeshBed Levelling Fail IV"
...
This reverts commit bd554df02e
2018-11-08 04:02:32 +01:00
bd554df02e
MeshBed Levelling Fail IV
2018-11-08 03:54:05 +01:00
b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
...
Fix long press modal
2018-11-07 10:28:24 +01:00
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
9a68501039
MK2 variants compilable
2018-11-06 14:17:43 +01:00
c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
46b2c93d60
MeshBed Leveling Fail III
2018-11-06 01:44:53 +01:00
9953518681
MeshBed Leveling Fail II
2018-11-06 01:28:47 +01:00
d6b5f5a1c7
PFW643 - removed M910-M918, implemented M907
2018-11-05 16:15:27 +01:00
7e43b15b54
Merge pull request #1303 from PavelSindler/m600_idler
...
M600: move extruder to the left to make space for idler opening
2018-11-05 10:38:51 +01:00
78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
...
Wizard improvements
2018-11-05 10:38:41 +01:00
0a2ad97bc6
Merge pull request #1290 from PavelSindler/mmu_improvements
...
mmu improvements: load to nozzle, gcodes for single material mode, M600 fix
2018-11-05 10:38:05 +01:00
2619c6f7a1
Merge pull request #1283 from PavelSindler/crashdet_cancel
...
canceling print after crash detection sets saved_priting flag to false
2018-11-05 10:37:51 +01:00
aeeb2af0a4
whitespace
2018-11-05 00:15:36 +01:00
b058ec7120
whitespace
2018-11-05 00:14:16 +01:00
934b76ade3
wait message added
2018-11-05 00:12:46 +01:00
e2d2fb58aa
Z calibraion: always ask user to clean nozzle
2018-11-04 18:47:08 +01:00
73794b56cf
MeshBed Leveling Fail
...
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
aaf65051f9
M600: "is color clear?" menu synchronization
2018-11-01 18:28:52 +01:00
1342c312a0
use feedrate 200mm/min for final feed (faster and better filament sensor function), show default welcome message when load is finished
2018-11-01 16:51:18 +01:00
96ce324b7c
load to nozzle improved, unified feedrate and E-distance for final feed used in load filament function, M600 etc.
2018-11-01 16:29:09 +01:00
e80af46503
load to nozzle and Tx and Tc codes: intial version
2018-10-31 21:48:05 +01:00
f445b6018e
canceling print after crash detection sets saved_priting flag to false
2018-10-28 11:06:10 +01:00
4ecc00e4e3
M600: move extruder 100mm to the left to make space for opening idler
2018-10-26 18:19:00 +02:00
cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging
...
3_4_2 branch merging into MK3
2018-10-25 21:45:51 +02:00
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
d005005e22
Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging
2018-10-22 20:33:38 +02:00
940f436a5f
merge MK3_dev into MK3
2018-10-22 20:25:29 +02:00
bc247ca02c
MK2.5 sw reset at setup function
2018-10-19 17:54:48 +02:00
ac18eb67c0
New lang, arduino 1.8.5 - boot_app debug output
...
+ variable _uartout linkage fix
+ DEBUG_DCODE5
2018-10-18 16:20:14 +02:00
PavelSindler
Robert Pelnar
PavelSindler
Marek Bel
MRprusa3d
mkbel