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

3404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Voinea
20a59f5f40 Temp cal. 2019-11-08 19:44:48 +02:00
Alex Voinea
0de47bf0fd Fix "On" for all languages 2019-11-08 18:19:15 +02:00
Alex Voinea
1de353dd09 Merge branch 'MK3' into MK3_Translations 2019-11-07 17:02:45 +02: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
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
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
Marek Bel
aabf7655dc Do all text formatting in first layer calibration reset dialog in one line. 2019-10-01 19:20:36 +02:00
leptun
6bd35bfa2f Increase MENU_DEPTH_MAX to 7 to allow sheet calibration with MMU 2019-10-01 19:43:30 +03:00
Marek Bel
7c3f397a62 Print sheet name and Z offset in first layer calibration reset dialog. 2019-10-01 18:22:12 +02:00
leptun
b39f09b68e Merge branch 'MK3' into MM_lay1_cal 2019-10-01 19:20:50 +03:00
DRracer
d044d3b7b5
Merge pull request #2244 from MRprusa3d/PFW-1008 
EEPROM_BABYSTEP_Z using removal
 2019-10-01 18:04:09 +02:00
DRracer
f3c3526aa5 fix the knob long-press causing hang in modal dialogs 2019-10-01 17:13:36 +02:00
MRprusa3d
ed13788e0c EEPROM_BABYSTEP_Z using removal 2019-10-01 16:57:37 +02:00
DRracer
9ae75612b5 Fixes after first feature tests 2019-10-01 15:31:01 +02:00
DRracer
06187f52f3
Merge pull request #2230 from leptun/MK3_Octoprint_fIxes 
Mk3 Fan error fix
 2019-10-01 11:34:55 +02:00
DRracer
72aed3c544 Allow knob-long-press only in listed menus 2019-10-01 10:51:02 +02:00
Marek Bel
543ad6eb41 Ask to reset Z offset before first layer calibration. 2019-09-30 19:58:09 +02:00
leptun
9d57f9c365 Fix fan_error_selftest() mistake 2019-09-30 20:30:09 +03:00