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

3254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leptun
695f938348 Fix conversion warnings 2019-09-14 12:24:45 +03:00
leptun
35b93d17dc Remove merge errors 2019-09-14 08:58:45 +03:00
leptun
95fa81c68f
Merge branch 'MK3' into MK3_Translations 2019-09-14 08:27:09 +03:00
leptun
e828798209 Fixes after merge and line buffer 
General fixes to the lcd_edit_off item and improved way to generate the toggles.
The old process is this: Write '>' if required -> print base -> pad everything before the last character with spaces -> write the eol character -> jump back and print the toggle over the blank characters. This resulted in noticeable flickering when the toggle was redrawn and was showing the same thing. Now the process is similar, except that everything happens in a "line buffer" (a char buffer that holds an entire line) and gets printed in one go, avoiding jump instructions for the lcd and prevents flickering since it doesn't write ' ' and the letters afterwards.
This should get even better when the lcd_buffer gets implemented since the line_buffer will get compared to the existing data on the screen and avoid overwriting what is on the lcd with the same thing.
 2019-09-13 21:21:42 +03:00
leptun
ae839aee31 Merge branch 'MK3' into MK3_Translations 2019-09-12 16:28:36 +03:00
DRracer
521c5eb8ef
Merge pull request #2141 from mkbel/preheat_menu 
Unify preheat menu, add ASA material
 2019-09-12 14:25:38 +02:00
Marek Běl
5a1005e143
Merge pull request #2186 from DRracer/enable-fan-pin-test-MK3 
Enable fan pin test even for MK3
 2019-09-10 18:21:17 +02:00
DRracer
d94356802c
Merge pull request #2187 from prusa3d/MK3_3.8.0 
Mk3 3.8.0
 2019-09-10 18:19:36 +02:00
DRracer
e1e40213b2 Enable fan pin test even for MK3 (was disabled in 3.7.2 due to lack of 
FLASH)
 2019-09-10 16:49:22 +02:00
DRracer
898e85e69f
Merge pull request #2038 from Eriobis/MK3 
Add a threshold distance to Z calibration
 2019-09-10 16:20:24 +02:00
DRracer
76c062b980
Merge pull request #2169 from mkbel/format 
Use same format for all instances where "ok" is send to serial line.
 2019-09-10 14:14:47 +02:00
DRracer
059c6b6cbf
Merge pull request #2148 from leptun/MK3_MK2.x_fix_Default_stepper_power 
Mk3 mk2.x fix default stepper power
 2019-09-10 14:13:51 +02:00
DRracer
60de313b8a
Merge pull request #1759 from wavexx/enhanced_longpress 
Default to "Live Adjust Z" when longpressing during a print (closes #1604)
 2019-09-10 14:13:00 +02:00
DRracer
f6f8f5b3b6
Merge pull request #2171 from 3d-gussner/patch-3 
Update reserved space bytes as mentioned in
 2019-09-10 14:07:56 +02:00
DRracer
90f85f7128
Merge pull request #2181 from leptun/MK3_fix_lcd_warning 
Mk3 fix lcd warning
 2019-09-10 14:07:28 +02:00
DRracer
6659348d2f
Merge pull request #2185 from prusa3d/MK3_3.8.0 
Mk3 3.8.0
 2019-09-10 14:06:03 +02:00
leptun
818befb91b Fix compile warning 
function was defined as static in lcd.cpp and redefined in lcd.h
 2019-09-09 14:05:20 +03:00
leptun
2480bd90fc Revert lcd_putchar to type int and retrun 0 
Discussion: https://github.com/prusa3d/Prusa-Firmware/pull/2008#issuecomment-514500738
 2019-09-09 13:59:20 +03:00
MRprusa3d
7cc9fe2e4f
Update 1_75mm_MK3S-EINSy10a-E3Dv6full.h 2019-09-09 02:20:39 +02:00
MRprusa3d
70de4d58f6
Update 1_75mm_MK3-EINSy10a-E3Dv6full.h 2019-09-09 02:20:14 +02:00
MRprusa3d
fb561b15ad
Update 1_75mm_MK25S-RAMBo13a-E3Dv6full.h 2019-09-09 02:19:52 +02:00
MRprusa3d
325e4a3403
Update 1_75mm_MK25S-RAMBo10a-E3Dv6full.h 2019-09-09 02:19:27 +02:00
MRprusa3d
0b50b2295c
Update 1_75mm_MK25-RAMBo13a-E3Dv6full.h 2019-09-09 02:18:54 +02:00
MRprusa3d
e581263bf1
Update 1_75mm_MK25-RAMBo10a-E3Dv6full.h 2019-09-09 02:18:22 +02:00
MRprusa3d
ca6937edaf
Update 1_75mm_MK2-RAMBo13a-E3Dv6full.h 2019-09-09 02:17:42 +02:00
MRprusa3d
a9a3d9d084
Update 1_75mm_MK2-RAMBo10a-E3Dv6full.h 2019-09-09 02:17:00 +02:00
MRprusa3d
978ace7fd7
Update Marlin_main.cpp 2019-09-09 02:16:06 +02:00
MRprusa3d
28c1486df2
Update Configuration.h 2019-09-09 02:14:10 +02:00
DRracer
eec8e5f8c0 Version changed (3.8.0 build 2684) 2019-09-06 19:47:05 +02:00
MRprusa3d
847f50cb62
Merge pull request #2172 from DRracer/lang38 
fine-tuning the translated texts to fit into LCD
 2019-09-06 17:29:07 +02:00
DRracer
0413fe9e0e lang translation finetuning 6 2019-09-06 17:12:19 +02:00
DRracer
61c6e6d257 lang translation finetuning 5 2019-09-06 16:47:55 +02:00
DRracer
3d8b5129da lang translation finetuning 4 2019-09-06 16:04:00 +02:00
DRracer
e8d8e0c9f0 lang translation finetuning 3 2019-09-06 15:58:26 +02:00
3d-gussner
d408fd2f42
Update reserved space bytes as mentioned in 
https://github.com/prusa3d/Prusa-Firmware/pull/2170#pullrequestreview-284810840
 2019-09-06 15:54:04 +02:00
DRracer
da0c4a2fa8 lang translation finetuning 2 2019-09-06 15:51:51 +02:00
DRracer
d182e6fc65 DE,ES,FR translation finetuning 2019-09-06 15:35:21 +02:00
XPila
59a0213329
Merge pull request #2170 from DRracer/lang38 
update translated UI texts
 2019-09-06 13:39:52 +02:00
DRracer
3ba2197dd3 more space for the second lang 2019-09-06 08:37:59 +02:00
DRracer
441e24acbd update translated UI texts 2019-09-06 08:30:10 +02:00
Marek Bel
e73b0a88d5 Use same format for all instances where "ok" is send to serial line. 2019-09-05 22:35:01 +02:00
Marek Běl
9a60dd259b
Merge pull request #2167 from prusa3d/MK3_3.8.0 
Mk3 3.8.0
 2019-09-05 19:03:37 +02:00
DRracer
3aa5637838
Merge pull request #2166 from mkbel/rename_default_sheets 
Change default sheet names.
 2019-09-05 18:28:51 +02:00
Marek Bel
3a5daf1c64 Change default sheet names. 2019-09-05 17:27:21 +02:00
leptun
795b1d1cf7 Toggle Sound 2019-08-31 16:56:14 +03:00
leptun
3c4fffef60 Merge branch 'MK3' into MK3_Translations 2019-08-31 15:30:51 +03:00
leptun
a5a5f5cf0b Toggle RPi port 
Probably works, needs to be tested.
 2019-08-31 15:25:00 +03:00
leptun
f69035323a Toggle SD Settings 
This includes FlashAir support and SD Sorting type
 2019-08-31 14:55:51 +03:00
leptun
a821002f02 Toggle MMU Mode 2019-08-31 07:38:40 +03:00
Marek Běl
a789a8995f
Merge pull request #2145 from mkbel/fix_sheet_reset 
Fix sheet reset
 2019-08-30 16:49:34 +02:00