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

3151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri D'Elia
18b8dc89e5 Merge remote-tracking branch 'upstream/MK3' into MK3_LA15 2019-08-04 17:06:34 +02:00
Yuri D'Elia
1435e4a68d Use the computed direction in fsensor_st_block_begin 2019-08-04 16:53:48 +02:00
DRracer
6f3844cc00
Merge pull request #1650 from padarom/patch-1 
Fix a single MK3 language typo
 2019-08-02 07:47:13 +02:00
Marek Kühn
aecc343c44
Merge pull request #2065 from DRracer/M862-docs 
Update doxydoc of new G-codes
 2019-08-01 13:18:02 +02:00
DRracer
7c9d3dd177 Update doxydoc of new G-codes 2019-08-01 13:09:20 +02:00
DRracer
9214e30f74
Merge pull request #2062 from MRprusa3d/PFW-873 
UI update
 2019-08-01 07:20:09 +02:00
MRprusa3d
2cb977e4a0 UI update 2019-07-31 20:39:57 +02:00
DRracer
e43e89421c
Merge pull request #2056 from BoCoKeith/patch-1 
Correct bug in util.cpp is_whitespace_or_nl function.
 2019-07-31 17:00:49 +02:00
DRracer
d2ff98c643
Merge pull request #2059 from mkbel/fix_wizard_lay1_cal 
Fix wizard lay1 cal
 2019-07-31 16:48:04 +02:00
Marek Bel
bca0fd81eb Fix loading filament 255 instead of 0 in first layer calibration wizard. 2019-07-30 19:15:33 +02:00
Marek Bel
0aed59c947 Fix unsigned char overflow cause invalid filament load. 2019-07-30 19:06:57 +02:00
Keith Spitz
952a24b45d
Update util.cpp 
Correct "is_whitespace_or_nl": change 'r' to '\r'.
 2019-07-28 19:40:18 -06:00
DRracer
da7ce65bb4
Merge pull request #2050 from leptun/MK3_fix_languages_lcd3 
Fix shifted languages. Use \n and \x0a
 2019-07-26 21:52:26 +02:00
leptun
3ddb853bbd Fix shifted languages. Use \n and \x0a 2019-07-26 18:53:08 +03:00
DRracer
be598687d0
Merge pull request #2048 from kuhnmarek/MK3_prusastat_test 
Prusa statistics test shows only errors
 2019-07-26 14:27:45 +02:00
DRracer
c9bb4f39b1
Merge pull request #2047 from 3d-gussner/patch-2 
Download JSON file from Prusa3d repository
 2019-07-26 14:26:59 +02:00
Marek Kühn
6e26c18df4 Prusa statistics test shows only errors 2019-07-26 10:52:42 +02:00
3d-gussner
5799b0b8ee
Added comment 2019-07-26 10:35:11 +02:00
3d-gussner
302355b0f3
Download JSON file from Prusa3d repository 
As the PR https://github.com/prusa3d/Arduino_Boards/pull/1 is merged it makes sense to switch also in PF-build.sh to prusa3d Arduino_Boards repository.
 2019-07-26 10:32:14 +02:00
DRracer
0eaa998ba2
Merge pull request #2043 from kuhnmarek/MK3_PFW-913_manual 
MK3 PFW-913 updated readme for new buildscripts
 2019-07-26 09:13:52 +02:00
DRracer
0687b8e4a2
Merge pull request #2044 from mkbel/fix_missing_mmu_attention 
Fix missing mmu attention
 2019-07-26 09:07:06 +02:00
Marek Bel
3b396fb8bf Merge branch 'MK3' into fix_missing_mmu_attention 2019-07-25 19:10:07 +02:00
Marek Bel
a9e9a9857b Fix "MMU needs attention screen is missing in case of failed unload filament". 2019-07-25 19:09:52 +02:00
DRracer
3438c0e411
Merge pull request #2042 from NotaRobotexe/octoprint_bugs 
fixed redundant OK messages in serial
 2019-07-25 12:41:43 +02:00
DRracer
38285c242a
Update README.md 2019-07-25 11:07:57 +02:00
Marek Kühn
68c4349d6a
Updated board definition link + minor formatting 2019-07-25 10:59:30 +02:00
DRracer
2820baf016
Merge pull request #2040 from NotaRobotexe/MK3 
multiple sheets - menu switching bug
 2019-07-25 09:56:07 +02:00
Marek Kühn
2aace256cb Updated readme for win build 2019-07-24 18:59:40 +02:00
NotaRobotexe
64115fb146 fixed redundant OK messages in serial 2019-07-24 18:08:14 +02:00
Marek Kühn
63677dfb55
Merge pull request #2028 from 3d-gussner/MK3_PF-build_106 
Mk3 pf build 106
 2019-07-24 14:24:11 +02:00
3d-gussner
004eb3d299 Merge remote-tracking branch 'upstream/MK3' into MK3_PF-build_106 2019-07-24 13:54:27 +02:00
3d-gussner
68f0a4a3f9
Merge pull request #59 from kuhnmarek/3d-gussner/MK3_PF-build_106 
Linux 32-bit recognition fixed
 2019-07-24 13:53:01 +02:00
Marek Kühn
df00bc9bb5 Linux 32-bit recognition fixed 2019-07-24 13:14:59 +02:00
NotaRobotexe
5021fadd5d multiple sheets - menu switching bug 2019-07-24 11:20:27 +02:00
DRracer
33195baf9d
Merge pull request #2035 from mkbel/enable_lin_corr 
Re-enable linearity correction for MK3.
 2019-07-24 09:08:43 +02:00
DRracer
f60eaa2c71
Merge pull request #2034 from NotaRobotexe/MK3 
multiple sheets - bug in switching sheets from menu
 2019-07-24 09:08:17 +02:00
3d-gussner
396621c12d Changed Folders and Finding OS version 
- Changed Build-env path to "PF-build-dl" as requested in PR https://github.com/prusa3d/Prusa-Firmware/pull/2028
- Changed Hex-files folder to PF-build-hex as requested in PR
- Added Finding OS version routine so supporting new OS should get easier
 2019-07-24 00:10:32 +02:00
3d-gussner
93c098c8f0 Merge remote-tracking branch 'upstream/MK3' into MK3_PF-build_106 2019-07-24 00:08:11 +02:00
NotaRobotexe
851aaac053 Merge branch 'MK3' of https://github.com/NotaRobotexe/Prusa-Firmware into MK3 2019-07-23 19:29:36 +02:00
NotaRobotexe
fb35009628 multiple sheets,fix of bug in switching sheets from menu 2019-07-23 19:25:59 +02:00
Marek Bel
f9e32c4bf4 Re-enable linearity correction for MK3. 2019-07-23 19:22:54 +02:00
DRracer
717b710abe
Merge pull request #2031 from NotaRobotexe/MK3 
Sheet menu
 2019-07-23 11:47:13 +02:00
NotaRobotexe
c4d5e332c8
Merge branch 'MK3' into MK3 2019-07-23 11:34:42 +02:00
NotaRobotexe
b9f622f8a6 variables to PROGMEM, text formating 2019-07-23 11:31:20 +02:00
NotaRobotexe
b5129ff2ec Revert "force push" 
This reverts commit 19e7838c20.
 2019-07-23 11:12:53 +02:00
3d-gussner
f4fcc2bc08 Merge remote-tracking branch 'upstream/MK3' into MK3_PF-build_106 2019-07-23 08:51:14 +02:00
NotaRobotexe
19e7838c20 add default names to PROGMEM, text formating edit 2019-07-22 20:35:10 +02:00
NotaRobotexe
45f3f1439b
Merge pull request #2029 from DRracer/code_size_optimization 
Code size optimization
 2019-07-22 19:12:05 +02:00
DRracer
00d3f0b297
Merge pull request #2030 from kuhnmarek/update_readme 
Updated linux build manual
 2019-07-22 18:50:47 +02:00
Marek Kühn
23ed612efe Updated linux build manual 2019-07-22 18:45:41 +02:00