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

2477 Commits

Author SHA1 Message Date
Marek Bel 608aa6ff3c Increase number of MMU load tries, so the same number of retries are done without cutter as before enabling cutter. 2019-09-10 18:49:23 +02:00
Marek Bel 0fda4e5594 Merge branch 'cut_last_try' into enable_cutter 2019-09-10 18:37:09 +02:00
Marek Bel bb1fb49894 Use MMU cutter only as last resort. Cut filament only before last load retry. 2019-09-10 18:36:14 +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
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
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
leptun 90e5f14309 Fix compile error on MK3 2019-08-30 13:02:00 +03:00
Marek Bel 50a8c16f27 Use EEPROM update instead of write. 2019-08-30 12:00:33 +02:00
leptun 56c949b9af Fix typo 2019-08-30 12:14:43 +03:00
leptun d8d0069f97 Fix MK2.x Default stepper power out of sync 2019-08-30 12:12:29 +03:00
Marek Bel 8c8619be05 Convert reset sheet sub menu to function. 2019-08-29 20:52:53 +02:00
Marek Bel abf84e36f5 Fix sheet menu back caption to Steel sheets to match parent menu caption. 2019-08-29 20:23:02 +02:00
Marek Bel d647cdc02c Convert sheet switcher from sub menu to function. Handle null characters in sheet name. 2019-08-29 20:13:10 +02:00
Marek Bel cd7805ba46 Document 2019-08-29 18:26:24 +02:00
Marek Bel 0b196da6fc Migrate old vale of EEPROM_BABYSTEP_Z only if active sheet is not initialized. 2019-08-29 18:07:49 +02:00
Marek Bel 32f435d1a0 Increase number of configurable steel sheets to 8. Move sheets into sub menu of HW setup. 2019-08-29 17:21:08 +02:00
Marek Běl 3413d5d486
Merge pull request #2139 from DRracer/assist-mode-fixes 
Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
 2019-08-29 15:55:49 +02:00
Marek Běl fec92b33ae
Merge pull request #2137 from DRracer/illegal-fat-characters-revised 
Support for more special characters allowed in file names (^ + = [ ] ;
 2019-08-29 15:55:36 +02:00
Marek Bel f3bb72be64 Reset calibration status if there is no calibrated sheet after reset. 2019-08-29 03:33:33 +02:00
Marek Bel f64252b59b Hide sheet switcher from main menu, if there are less than 2 sheets calibrated. 2019-08-28 19:08:53 +02:00
Marek Bel 9692f94683 Move sheet menu up to be after Print from SD. 2019-08-28 19:01:48 +02:00
Marek Bel 3903dc819a Extract function next_initialized_sheet from change_sheet_from_menu(). Make it more general to depend on sizeof(Sheets::s) instead of hard coded value of 2. 2019-08-28 18:59:48 +02:00