Commit Graph

3763 Commits

Author SHA1 Message Date
3d-gussner
5eaf6f0133 Merge branch 'MK3' into MK3-Gcode_documentation
Merge with MK3 branch
2019-11-26 12:48:21 +01:00
DRracer
35ce2896bb
Merge pull request #2339 from leptun/PFW-943
PFW-943: IR sensor gen. II - Updated PR
2019-11-25 06:23:24 +01:00
DRracer
abb220ff69
Merge pull request #2323 from Panayiotis-git/MK3_Fix_M603
Add oversighted ‘break’ statement at the M603 command's source
2019-11-25 06:04:41 +01:00
vintagepc
982c4cbf7b
Candidate fix for homing fail hard reset 2019-11-21 18:51:02 -05:00
Alex Voinea
45b89c5728 Fix typo 2019-11-19 13:55:37 +02:00
Alex Voinea
e66574ac5f Updated branch to use TOGGLE 2019-11-19 13:51:10 +02:00
MRprusa3d
6e2793566c
Merge branch 'MK3' into PFW-943 2019-11-18 14:43:46 +01:00
Alex Voinea
b077303156 Fix compile error 2019-11-17 11:10:13 +02:00
Alex Voinea
14104e7bf9 Clear error flag when fanError is disabled 2019-11-17 10:44:11 +02:00
Alex Voinea
2e0034d915 Update Toggles and Translations 2019-11-17 09:53:14 +02:00
Alex Voinea
359c447127 Do not check for fanError if it is not enabled on resume
Fix typos
2019-11-16 22:44:34 +02:00
Alex Voinea
07b6173aaa Merge branch 'MK3' into MK3-PFW-1024 2019-11-16 11:28:29 +02:00
DRracer
e2e32b455a
Merge pull request #2247 from mkbel/reset_live_Z+offset
Show current Z offset in reset dialog before first layer calibration
2019-11-15 17:52:29 +01:00
DRracer
460f6c3b5e
update message 2019-11-15 17:47:39 +01:00
DRracer
86ea24c364
Merge pull request #2273 from wavexx/do_not_wait_for_disabled_heater
Do not wait forever if the heater on the extruder is disabled
2019-11-15 17:19:11 +01:00
DRracer
715794d854
Merge pull request #2092 from leptun/MK3_Translations
PFW-1062: Mk3 Toggle and Translations
2019-11-15 16:53:17 +01:00
DRracer
3a41405f52
Merge pull request #2146 from vintagepc/MK3-2093-sheet-display
PFW-1061: #2093 - Relocate sheet menu, show sheet on info screen
2019-11-15 16:07:51 +01:00
vintagepc
f6c35c5d5f
Removed separate fix for #2089
Per PR fix request
2019-11-15 08:58:58 -05:00
DRracer
8fae50ec79
Merge pull request #2315 from mkbel/finda
PFW-1047: Show FINDA state as N/A if last received response is older than 1s.
2019-11-15 12:53:01 +01:00
DRracer
56251c4f99
Merge pull request #1937 from arons/MK3
added new function belt test under calibration menu
2019-11-15 09:39:42 +01:00
DRracer
9e780f0b2b
remove ESC sequence 2019-11-15 09:26:56 +01:00
Alex Voinea
e559a6b67f Merge branch 'MK3' into MK3_BED_LEVELING_PWM 2019-11-13 14:32:57 +02:00
leptun
28e812d91f Mesh bed leveling testing 2019-11-13 14:32:33 +02:00
Panayiotis-git
23cf076242 Add oversighted ‘break’ statement at the M603 command's source 2019-11-12 21:32:39 +02:00
Alex Voinea
11428388c6 MBL toggle and cleanup 2019-11-09 20:58:56 +02:00
Alex Voinea
20a59f5f40 Temp cal. 2019-11-08 19:44:48 +02:00
3d-gussner
422e7fde4a Merge branch 'MK3' into MK3-Gcode_documentation 2019-11-08 18:16:56 +01:00
Alex Voinea
0de47bf0fd Fix "On" for all languages 2019-11-08 18:19:15 +02:00
DRracer
c82fa07299
Merge pull request #2195 from leptun/MK3-fix-LFN
Fix short filenames scrolling in sdprint menu and status screen
2019-11-08 16:52:53 +01:00
DRracer
21dd8eadd1
Merge pull request #2188 from mkbel/cut_last_try
Use MMU cutter only as last resort.
2019-11-08 16:49:28 +01:00
DRracer
ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround
SD Scroll workaround
2019-11-08 16:48:38 +01:00
DRracer
4cf2f05d1d
Merge pull request #2057 from leptun/MK3_fix_M350
M350 for all axis - MK3
2019-11-08 16:15:15 +01:00
DRracer
a14d7545a5
Update Marlin_main.cpp 2019-11-08 16:06:42 +01:00
DRracer
b33c79e6c7
Merge pull request #1899 from wavexx/fix_lcd_pause_function
Fix the LCD pause function
2019-11-08 14:55:13 +01:00
DRracer
42d70f3dea
Merge pull request #1768 from wavexx/unknown_z_improvements
"Unknown z" improvements
2019-11-08 14:52:56 +01:00
Alex Voinea
1de353dd09 Merge branch 'MK3' into MK3_Translations 2019-11-07 17:02:45 +02:00
vintagepc
cf2d71ae44
Merge pull request #1 from prusa3d/MK3
Synchronize with upstream
2019-11-06 09:39:11 -05:00
3d-gussner
5bd995b21b Added more info to doxygen G-Codes 2019-11-06 11:14:06 +01:00
3d-gussner
e6eeafd20c More M-Commands ... 2019-11-05 15:47:04 +01:00
3d-gussner
ca234a11ed M-Commands to M240 2019-11-05 12:40:51 +01:00
3d-gussner
8114bd5b1c Merge with MK3 and few spaces 2019-11-05 09:05:05 +01:00
3d-gussner
58404b9c9d Merge branch 'MK3' into MK3-Gcode_documentation 2019-11-05 09:04:52 +01:00
DRracer
1a0c248599
Merge pull request #1752 from wavexx/introduce_editorconfig
Introduce an editorconfig file
2019-11-04 17:33:50 +01:00
DRracer
e56cb14bb9
Merge pull request #1739 from draeath/MK3-fix-sdcard-sorting
use modification times for sdcard time sorting. fixes #477
2019-11-04 17:31:38 +01:00
DRracer
3c26f7855b
Merge pull request #1704 from leptun/MK3_Enable_fan_waiting_cooldown
Enable print fan while waiting for cooldown
2019-11-04 16:52:26 +01:00
leptun
459385708e Fix MMU needs user attention Statistics error 2019-11-02 13:15:13 +02:00
leptun
cd5ff783cf General fixes and improvements to code 2019-10-31 19:07:20 +02:00
Marek Bel
76c39ce689 Show FINDA state as N/A if last received response is older than 1s. 2019-10-31 17:45:22 +01:00
3d-gussner
4501f9d760 M commands documentation #2 2019-10-31 15:46:23 +01:00
3d-gussner
c899320590 Fix M81 Turn off Power Supply...
... as it should be active if PS_ON_PIN is defined and assinged to an actual pin.
2019-10-31 15:08:07 +01:00