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

3488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
leptun
61c7479579 Code cleanup: Move texts to messages.c/h 2019-09-30 20:16:01 +03:00
leptun
30f325c81d Extract fan_error_selftest to function for readability 2019-09-30 20:01:31 +03:00
DRracer
aa50479da5
Merge pull request #2231 from MRprusa3d/PFW-873c 
default nozzle diameter for farm mode
 2019-09-30 18:36:25 +02:00
Marek Bel
aba9d1c360 Merge branch 'MK3' into MM_lay1_cal 2019-09-30 18:13:57 +02:00
DRracer
d31abd4bce
Merge pull request #2240 from leptun/MK3_fix_SD_workDirDepth 
fix workDirDepth not reset after card init.
 2019-09-30 17:32:46 +02:00
DRracer
12a0b229d3
Merge pull request #2239 from mkbel/document_currents 
Document set current command.
 2019-09-30 11:14:54 +02:00
leptun
bf09eb943d fix workDirDepth not reset after card init. 2019-09-29 21:09:11 +03:00
Marek Bel
8c7015df53 Document set current command. 2019-09-27 15:42:31 +02:00
leptun
ff9a6c8177 Prevent fan error while checking fan functionality 2019-09-26 20:52:29 +03:00
leptun
dfd3f34351 Check for minimum fan speed. Should be achievable by both fans in 1s. 2019-09-25 22:35:35 +03:00
leptun
9c22692827 Fix Cancel Print command processing 2019-09-25 22:34:31 +03:00
leptun
4d149f0dfa Do not send useless keepalive messages after print is canceled from lcd 2019-09-25 18:50:29 +03:00
leptun
532d1fc4ae Fix "Resume Print" missing when doing a normal pause 2019-09-25 18:32:35 +03:00
leptun
14b72d2b46 Prevent timeout when printing from SD with USB host connected 2019-09-25 18:12:19 +03:00
leptun
c3b7b5ebb5 Check fans before resuming 2019-09-25 15:58:07 +03:00
3d-gussner
28edd5a80b Prepare PF-build.sh for Prusa Arduino_Boards V1.0.2 
As I am planning to add new Prusa Arduino_Boards definition version 1.0.2 which contains few changes which interfere withthe existing PF-build.sh using Arduino_Boards v1.0.1,
i had to add an additional variable.

I have tested PF-build.sh with Arduino_Boards v1.0.1 and v1.0.2

It creates identical firmware hex files, if I manage it to run in the same minute.
If one of the runs is off by a minute compared to the other there is just one line in the hex code different,
which is showing the compiling date, time and firmware version.
 2019-09-23 19:22:45 +02:00
MRprusa3d
89de5aac77 default nozzle diameter for farm mode 2019-09-23 17:13:33 +02:00
DRracer
ddc9cf6336
Merge pull request #2227 from 3d-gussner/patch-5 
Fix few translation files inconsistencies
 2019-09-23 08:55:45 +02:00
3d-gussner
0a4b16a7e7 I run two lang scripts to show an issue 
which i will report as well
- ran `/lang/lang-export.sh`
- copied `/lang/po/Firmware_xx.po` files to `/lang/po/new` as `xx.po` files
- ran `/lang/lang-import.sh`
- cleandup `/lang/po/new` folder
 2019-09-22 14:45:59 +02:00
leptun
3c17f7e145 No need to check the fan in the menu 2019-09-22 14:04:58 +03:00
3d-gussner
df2eced5e0
Polish translation is missing a LF compared to 
English `lang_en.txt` file.
 2019-09-22 12:58:20 +02:00
3d-gussner
903ab3a192
Czech translation is missing : compared to 
English `lang_en.txt` file at `#MSG_SELFTEST_PRINT_FAN_SPEED c=18`
 2019-09-22 12:55:43 +02:00
3d-gussner
5edbc66aac
French translation has different c= value 
than the English `lang_en.txt` file.
 2019-09-22 12:52:02 +02:00
leptun
2363f19a62 Minor tweaks for usb printing 2019-09-20 21:07:20 +03:00
DRracer
a2703510ac
Merge pull request #2221 from DRracer/translations-doc 
Doc. of the lang. translation process + code docs
 2019-09-20 17:26:59 +02:00
DRracer
139c37c744 allow only one string translation constraint defintion per line 2019-09-20 13:01:07 +02:00
DRracer
92f9ef2a73
Merge pull request #2219 from 3d-gussner/patch-4 
Documentation update for git-bash ...
 2019-09-20 12:23:45 +02:00
leptun
fd01942db8 FAN Error fix - Initial 2019-09-19 20:48:59 +03:00
D.R.racer
2afeb65811 return failStatsFmt that fell out in merge 2019-09-19 18:39:25 +02:00
D.R.racer
f50cef8361 Merge remote-tracking branch 'upstream/MK3' into translations-doc 
and resolve ultralcd.cpp conflicts
 2019-09-19 18:10:20 +02:00
Marek Běl
68359687f8
Merge pull request #2202 from DRracer/lang-381-fixes 
dialogs' layouts fixes + FR polished
 2019-09-19 16:33:26 +02:00