josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,528 Commits 31 Branches 140 Tags 71 MiB
Commit Graph

3528 Commits

Author SHA1 Message Date
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
DRracer a5b5c99704
Merge pull request #5 from DRracer/3d-gussner-patch-4 
Added `lcd_menu` format description
 2019-09-10 12:55:41 +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
3d-gussner 875a4ecae2
Merge pull request #7 from 3d-gussner/3d-gussner-patch4 
Added doxygen todos for missing LCD layout and positioning
 2019-09-01 09:54:27 +02:00
3d-gussner d51b3d6207 Added doxygen todos for missing LCD layout and positioning 2019-09-01 09:51:51 +02:00
vintagepc 339771a5fb Fixed info screen when selected_sheet hasn't been initialized. 2019-08-31 21:27:08 -04:00
leptun 10cdcb3ae3 SD Scroll workaround 2019-08-31 17:00:39 +03:00
leptun 795b1d1cf7 Toggle Sound 2019-08-31 16:56:14 +03:00
Yuri D'Elia 2345288d40 Fix the LCD pause function 
Do not call long_pause recursively!

long_pause() is called before resetting the lcd_command_type. As
long_pause uses st_synchronize() internally, there could be time to
schedule another call to long_pause().
 2019-08-31 15:28:31 +02: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
vintagepc d347a36509 Merge branch 'MK3' of https://github.com/prusa3d/Prusa-Firmware into MK3-2093-sheet-display 2019-08-30 19:17:27 -04:00
vintagepc 871e29621f Fix "stuck" rename cursor 2019-08-30 19:14:22 -04: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
leptun 6a8330a43b Toggle "HW Setup"* 
All toggles from "HW Setup" were changed.
This includes:
-"Nozzle d."
-all "Checks"
Also added an option to provide a string from sram (not from progmem) as the toggle argument. This can be useful when toggling numbers or even when toggling sheets in the future.
 2019-08-30 17:36:21 +03: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