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

986 Commits

Author SHA1 Message Date
Alex Voinea
770fcd7c42
Merge branch 'MK3' into MK3-PFW-1024 2019-12-14 10:08:52 +02:00
DRracer
30cee7afca
Merge pull request #2353 from wavexx/lcd_pause_fixes 
Fix the LCD pause (regression)
 2019-12-13 13:53:29 +01:00
DRracer
a1bc4cc5dc
Merge pull request #2332 from leptun/MK3_Octoprint_fIxes 
Do not check for fanError if it is not enabled on resume
 2019-12-13 13:47:56 +01:00
Yuri D'Elia
063d0421ac Call long_pause from the main loop (again) 
After calling stop_and_save_print_to_ram, perform the parking moves
within the main loop as done before PR#1899 to avoid planning within
an interrupted move (which would clear the abort flag too soon).
 2019-12-03 20:37:13 +01:00
Alex Voinea
a413cfbb9a
Merge branch 'MK3' into MK3-PFW-1024 2019-11-29 13:07:45 +02:00
Yuri D'Elia
dbe2ed4150 Fix pause/resume when using M25/M601 
Remove the conflicting and mostly useless card.paused flag (the printing
is either paused, or not) and switch to isPrintPaused only which
accounts for both cases (SD/USB) correctly.

Fix M27/getStatus to show the current real status of the SD print.

Synchronize the queue on M601, as required to precisely pause the print
at the correct instruction.

Alias M25 to M601, which when combined with PR #1899 fixes issue #1614.

Guard against incorrect usage in M601, M602 and M603.
 2019-11-28 17:37:58 +01: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
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
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
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
ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround 
SD Scroll workaround
 2019-11-08 16:48:38 +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
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
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
leptun
1e09f8c003 Wake on certain events 
EEPROM DIM and BRIGHT values swapped!!!
 2019-10-30 21:11:19 +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
d7b12faa95 Add "Brightness" to Tune menu 2019-10-19 18:45:04 +03:00
leptun
0ed4a23ae7 And another compile fix... 2019-10-18 12:42:55 +03:00
leptun
9fc42526e7 Backlight always on during calibration 2019-10-18 12:18:43 +03:00
leptun
91e94aa0e8 Adjustable timeout 2019-10-18 10:32:41 +03:00
leptun
812eafd09c Fix compile for miniRambo 2019-10-17 13:14:32 +03:00
leptun
25e0d23efe Backlight overhaul and UI changes 2019-10-17 13:11:32 +03:00
DRracer
04bfe674df tiny lang fixes, part 1 2019-10-16 16:32:49 +02:00
leptun
3b005ae38f Backlight detection 2019-10-16 14:40:45 +03:00
leptun
5a662413e6 Fix compile for printer without backlight support 2019-10-13 14:34:04 +03:00
leptun
75f389a71d Auto-Dimming initial 2019-10-13 14:31:43 +03:00
leptun
b2a1dc6786 Compile fix for firmware without LCD_BL_PIN 2019-10-11 19:23:38 +03:00
leptun
68491c9d4d First implementation 2019-10-11 19:06:37 +03: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
74a1c9341b Revert "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." 
This reverts commit ca9ef3aba1.
 2019-10-01 22:57:59 +02:00