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

3401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
DRracer
ba0362b7d5
Merge pull request #2293 from mkbel/increment_version 
Version 3.8.1 final.
 2019-10-24 16:26:50 +02:00
Marek Bel
023ce01f9d Version 3.8.1 final. 2019-10-24 16:12:46 +02:00
Marek Běl
f3b696a243
Merge pull request #2292 from mkbel/de_lang_fix 
Shorten "Automatisches Laden Filament nur bei einge schaltetem Filame…
 2019-10-24 16:01:37 +02:00
Marek Bel
726b4156d1 Shorten "Automatisches Laden Filament nur bei einge schaltetem Filament- sensor verfuegbar..." to fit on single screen. 2019-10-24 15:56:25 +02:00
XPila
b603528bfd
Merge pull request #2291 from DRracer/lang-381-fixes-4 
Lang 381 fixes 4
 2019-10-23 15:04:39 +02:00
DRracer
5c2b573415 Skipped one translated sentence, because total translation size was > 
65535B.
 2019-10-23 13:54:15 +02:00
DRracer
939957aa52 translations for new text messages 2019-10-23 12:44:11 +02:00
DRracer
46c74f84b6
Merge pull request #2279 from leptun/MK3_Octoprint_fIxes 
Additional fanError fixes
 2019-10-23 09:47:00 +02:00
Yuri D'Elia
e25befa175 Fix include guard to silence duplicate declaration warnings 2019-10-22 15:49:10 +02:00
Yuri D'Elia
50231b76da Improved handling of unknown Z position 
- Introduce raise_z_above to move Z carefully when the current position
  is potentially unknown, using stallguard
- Use raise_z_above for:
  * filament loading/unloading clearance
  * extruder spacing when preheating (to avoid buildplate marks on PEI)
  * before homing to avoid damaging the build plate and to avoid
    repeated Z moves as well

Since raise_z_above is conditional, it will only raise when needed.

Calling raise_z_above when the extruder position is unknown and already
at maximum travel is safe and will prevent further vertical moves.
 2019-10-22 15:49:10 +02:00
DRracer
d32fd1d893 Better EN for new messages 2019-10-22 09:11:47 +02:00
leptun
d432c3644d Enable beeping after fan error is fixed 2019-10-18 09:13:19 +03:00
leptun
ea8d9ae49d Merge branch 'MK3' into MK3_Octoprint_fIxes 2019-10-18 08:45:22 +03:00
leptun
ace1d7049a Reenable command processing when issue is fixed if printer not active 2019-10-17 17:49:15 +03:00
Marek Běl
32befed255
Merge pull request #2277 from DRracer/lang-381-fixes-3 
tiny lang fixes, part 1
 2019-10-16 16:43:41 +02:00
DRracer
04bfe674df tiny lang fixes, part 1 2019-10-16 16:32:49 +02:00
DRracer
5a4126e00c
Merge pull request #2263 from leptun/MK3-Fix_PSU_DELTA_SILENT 
PSU_DELTA fix force_high_power_mode()
 2019-10-16 13:22:22 +02:00
DRracer
441a208420
Merge pull request #2256 from mkbel/unify_silent_mode 
Initialize EEPROM_SILENT in one place both for MK3 and MK25 printers …
 2019-10-16 13:21:45 +02:00
leptun
e3ac2e2509 PSU_DELTA fix force_high_power_mode() 2019-10-10 19:01:57 +03:00
Marek Bel
219a5e0625 Initialize EEPROM_SILENT in one place both for MK3 and MK25 printers and make it more clear. 2019-10-03 21:25:52 +02:00
Marek Běl
3aa380e348
Merge pull request #2253 from mkbel/increase_version 
Increase version.
 2019-10-03 17:39:21 +02:00
Marek Bel
0dde5e3167 Increase version. 2019-10-03 17:37:22 +02:00
Marek Běl
c0aa3956b5
Merge pull request #2252 from mkbel/increase_version 
Increase version and commit number.
 2019-10-03 17:34:14 +02:00
Marek Bel
4fc4cf9c11 Increase version and commit number. 2019-10-03 17:30:14 +02:00
Marek Běl
9f73250772
Merge pull request #2251 from DRracer/lang-381-fixes-2 
tiny lang fixes for 3.8.1
 2019-10-03 15:52:03 +02:00
D.R.racer
90c2c65566 tiny lang fixes for 3.8.1 2019-10-03 15:43:58 +02:00
DRracer
bd544a25da
Merge pull request #2250 from mkbel/fix_MK25_wizzard 
Move check for clear EEPROM just after factory_reset() to ensure noth…
 2019-10-03 08:05:26 +02:00
Marek Bel
7feb763643 Move check for clear EEPROM just after factory_reset() to ensure nothing is written to EEPROM before check. 
Fix wizard not starting after Factory RESET / All Data on MK25 printer.

This was broken by:

Author:      leptun <voinea.dragos.alexandru@gmail.com>
Date:        3 weeks ago (9/12/2019 6:16:31 AM)
Commit hash: 78708903e8

Also update eeprom value
 2019-10-02 18:38:46 +02:00
DRracer
d68ad6f8c6
Merge pull request #2217 from mkbel/MM_lay1_cal 
Mm lay1 cal
 2019-10-02 08:44:24 +02:00
Marek Běl
05e23d1468
Merge branch 'MK3' into MM_lay1_cal 2019-10-01 23:08:11 +02:00
DRracer
ff7260dc6e
Merge pull request #2246 from mkbel/reset_live_Z 
Reset live z
 2019-10-01 23:02:40 +02:00
Marek Bel
ca9ef3aba1 Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset. 2019-10-01 22:57:15 +02:00
Marek Běl
210d7f6bf1
Merge pull request #2245 from DRracer/knob-long-press 
Knob long press fixes
 2019-10-01 22:33:26 +02:00
Marek Bel
087d3cb250 Continue to lcd_v2_calibration() after selection is made in lcd_first_layer_calibration_reset(). Do not ask for selection if sheet is not calibrated, it is calibrated to zero offset or no first layer calibration was ever made. 2019-10-01 21:04:00 +02:00