3d-gussner
|
049cca297b
|
Merge branch 'MK3' into MK3_Dutch
Merge with MK3 and fix merge issues
|
2019-09-21 11:54:31 +02:00 |
|
DRracer
|
139c37c744
|
allow only one string translation constraint defintion per line
|
2019-09-20 13:01:07 +02: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 |
|
D.R.racer
|
17cca89993
|
Merge remote-tracking branch 'upstream/MK3' into translations-doc
|
2019-09-18 15:17:28 +02:00 |
|
DRracer
|
e7273ea505
|
Fix [French translation] Wrong display during mesh bed calibration #2218
minor code/doc improvements
|
2019-09-18 12:49:44 +02:00 |
|
DRracer
|
c1bf4a6288
|
Merge pull request #2216 from michalrudolf/MK3-miniopravy
Mk3 miniopravy
|
2019-09-18 11:34:17 +02:00 |
|
DRracer
|
9ff0b7c3a5
|
Merge pull request #2199 from leptun/MK3_MK2.x_fix_Default_stepper_power
Mk3 mk2.x fix default stepper power
|
2019-09-18 11:05:23 +02:00 |
|
DRracer
|
14933f6b0e
|
Fix. Sound [assist], Z-probe [5], menu_fmt_float13off format for last
string parameter from PROGMEM
|
2019-09-17 16:50:51 +02:00 |
|
michalrudolf
|
b660cb3908
|
ultralcd.cpp
|
2019-09-17 11:46:29 +02:00 |
|
D.R.racer
|
77c4720c8b
|
Merge remote-tracking branch 'upstream/MK3' into translations-doc
|
2019-09-17 11:32:27 +02:00 |
|
michalrudolf
|
b4e0c2f455
|
Update ultralcd.cpp
Menu Support -> XYZ calibration details -> 3. obrazovka "point offset"
X value is no longer moved to the left if there’s no negative sign
|
2019-09-17 10:51:43 +02:00 |
|
3d-gussner
|
9a7a909c6f
|
Prepare adding new language
|
2019-09-14 15:49:33 +02:00 |
|
DRracer
|
4423106fad
|
dialogs' layouts fixes (support menu dlgs, statistics etc.)
French translation polished
|
2019-09-13 16:55:05 +02: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 |
|
leptun
|
444daceca3
|
Move define as requested
|
2019-09-12 13:39:04 +03:00 |
|
leptun
|
78708903e8
|
Also update eeprom value
|
2019-09-12 07:16:31 +03: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 |
|
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 |
|
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
|
3ba2197dd3
|
more space for the second lang
|
2019-09-06 08:37:59 +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 Bel
|
3a5daf1c64
|
Change default sheet names.
|
2019-09-05 17:27:21 +02:00 |
|
3d-gussner
|
d51b3d6207
|
Added doxygen todos for missing LCD layout and positioning
|
2019-09-01 09:51:51 +02: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 |
|
Marek Bel
|
865484590b
|
Change default sheet name from "<number>" to "Sheet <number>".
|
2019-08-30 16:11:41 +02:00 |
|
Marek Bel
|
3d292350d4
|
Do not activate selected_sheet in lcd_v2_calibration() as this leads to calibrating random sheet if activated from calibration menu.
selected_sheet is initialized to 0 and contains index of last Sheet menu visited.
|
2019-08-30 14:45:25 +02:00 |
|
Marek Bel
|
26423f98bc
|
Switch to next sheet if currently selected sheet is not initialized. Move next_initialized_sheet() and change_sheet_from_menu() to eeprom.cpp, rename it to eeprom_next_initialized_sheet() and eeprom_switch_to_next_sheet(). Rename default_sheet_name() to eeprom_default_sheet_name().
|
2019-08-30 12:24:13 +02:00 |
|
Marek Bel
|
6c78c2fad5
|
Fix compiler warning.
|
2019-08-30 12:03:35 +02:00 |
|