Commit Graph

2665 Commits

Author SHA1 Message Date
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
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
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
leptun
b86a92a7d6 Toggle Mode (stepper power) 2019-08-30 07:59:58 +03:00
vintagepc
8df6691819 Relocate sheet menu, show sheet on info screen
-Sheet is shown instead of percentage done either if idle, or during
print preheat.
-Relocated sheet menu to below SD menu for additional visibility to
current sheet.
2019-08-29 18:07:24 -04:00
leptun
db6e2e0525 Toggle Crash det. 2019-08-29 22:31:30 +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
leptun
7f51e0bad8 Move SpoolJoin and Cutter to MSGs 2019-08-29 17:35:26 +03: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
leptun
0b21acec46 Minor fix to Toggle Cutter 2019-08-29 15:49:26 +03:00
leptun
d0f9f10ed6 Toggle Cutter 2019-08-29 15:43:41 +03:00
leptun
1937cf2074 Toggle SpoolJoin 2019-08-29 15:40:04 +03:00
leptun
5eea8d26fe Merge branch 'MK3' into MK3_Translations 2019-08-29 12:08:48 +03: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
Marek Bel
33675c6d1e Change default sheet names. 2019-08-28 18:16:35 +02:00
Marek Bel
49bc11037c Remove statements with no effect. 2019-08-28 18:14:10 +02:00
DRracer
1d23cc52e9 endstop sound alert fixes 2019-08-28 09:39:28 +02:00
Marek Bel
29c8cb2927 Fix bad merge. 2019-08-27 22:22:36 +02:00
Marek Běl
3f04c4db87
Merge branch 'MK3' into preheat_menu 2019-08-27 22:20:23 +02:00
Marek Bel
07169ad84a Make file local variable static. 2019-08-27 20:48:53 +02:00
Marek Bel
e57fcc04a7 Fix compiler warnings. 2019-08-27 20:23:48 +02:00
Marek Bel
d927d5b05d Port wizard_active to mFilamentItem(). 2019-08-27 20:19:03 +02:00
Marek Bel
cef7f31b9f Set FilamentAction to None if mFilamentMenu left by cooldown or menu back action. 2019-08-27 20:13:55 +02:00
Marek Bel
ffc5a64154 Remove commented out code. 2019-08-27 20:06:48 +02:00
Marek Bel
269aef1696 Remove unused code guarded by WATCH_TEMP_PERIOD macro as most of the functionality is duplicate to what is implemented in temp_runaway_check(). This will release us from porting setWatch() to unified preheat menu and maintaining it. 2019-08-27 20:05:10 +02:00
DRracer
1a1be5c518 Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
select filament
2019-08-27 17:10:29 +02:00
Marek Bel
bf2097342d Add ASA preheat into mFilamentMenu(); 2019-08-27 17:01:41 +02:00
DRracer
11ce786aaa Support for more special characters allowed in file names (^ + = [ ] ;
,)
2019-08-27 13:47:58 +02:00
DRracer
6aaa40b9a3
Merge pull request #2134 from mkbel/fix_power_panic
Fix repeated power panic restarted print from beginning or jumped at …
2019-08-27 08:13:26 +02:00
DRracer
a1e68c3d7f
Merge pull request #2135 from prusa3d/MK3_3.8.0
Increase version to 3.8.0-RC2 and build number to 2639.
2019-08-27 08:12:27 +02:00
Marek Bel
3da43ae8c2 Do not port print fan preheat speed preset, as it was never used. And it was broken until recently fixed when adding ASA profile. 2019-08-26 21:14:07 +02:00
Marek Bel
4792559536 Add farm preheat items. Add setWatch() call. 2019-08-26 21:00:30 +02:00
Marek Bel
aa13f9e809 Fix formatting. 2019-08-26 20:19:34 +02:00
Marek Bel
668e89e5a9 Preheat menu: Add ASA, hide menu item back when in wizard. 2019-08-26 20:18:34 +02:00
Marek Bel
52ae62bbba Fix formatting. 2019-08-26 20:14:00 +02:00
Marek Bel
3628d893ee Remove duplicate preheat menu.
Known limitations: farm_mode missing, wizard_active missing, cooldown missing, ASA missing, print fan missing.
2019-08-26 20:11:52 +02:00
Marek Bel
b9b0d6049e Fix formatting. 2019-08-26 19:48:39 +02:00
Marek Bel
159a1a70d8 Update documentation. 2019-08-26 17:19:57 +02:00
Marek Bel
c27fcf9cff Increase version to 3.8.0-RC2 and build number to 2639. 2019-08-26 17:03:18 +02:00
Marek Bel
52cb37770b Fix repeated power panic restarted print from beginning or jumped at most 65536 B back in file printed from SD card.
As sdpos_atomic was not updated after printer power up and first power panic recovery, it was equal 0. When the first command from SD card was queued its size on SD card was computed as current SD index position minus sdpos_atomic. This was equal to offset from beginning of the file limited to 16 bit storage type. When next power outage occurred earlier then this command was finished and wiped out of queue, this command size (extraordinarily big) was subtracted from sdpos_atomic and saved to EEPROM. This led to up to 65536 B jump back in file printed after next power panic recovery.
2019-08-23 19:30:20 +02:00
Marek Bel
3eb36ca194 Fix cmdqueue_dump_to_serial.
Header was historically made bigger to contain size of the command on SD card, but those debug functions wasn't updated.
2019-08-23 16:48:30 +02:00
XPila
5bb510dd2a
Merge pull request #2129 from DRracer/bed-noise-performance
Improve performance of bed PWM automaton
2019-08-22 14:45:01 +02:00
DRracer
c6df3fe012
Merge pull request #2127 from DRracer/code-size-reduction-1
Code size reduced by almost 5KB
2019-08-22 14:25:23 +02:00
3d-gussner
d3123a74b0 Updated LCD menu documentation to new form/syntax 2019-08-22 04:58:16 +02:00
3d-gussner
514b062107
Added lcd_menu format description
Added some documentation how the LCD menus look like and added max character values for translations.

There are more things needed and also the placement in the code is an open task. Depending on the decision if we use `messages.c/h`
2019-08-21 10:28:28 +02:00
DRracer
a7c2aec04c Code size reduced by almost 5KB 2019-08-21 09:59:51 +02:00
Marek Bel
3ed6d0637c Re-enable tmc2130_sg_stop_on_crash only if crash detection enabled from menu.
This fixes bug, that disabling crash detection from menu doesn't work during recovery from crash detection.
2019-08-20 19:32:39 +02:00
Marek Bel
f204cdea81 Refactor
Remove variable CrashDetectMenu. Read this state from EEPROM_CRASH_DET instead in bool lcd_crash_detect_enabled().
Rename crashdet_enable() to lcd_crash_detect_enable() and move it to ultralcd.cpp.
Rename crashdet_disable() to lcd_crash_detect_disable() and move it to ultralcd.cpp.
Rename lcd_crash_mode_set() to crash_mode_switch().
Remove forward function declarations from *.cpp file.

Saves 34B of FLASH and 2B of RAM.
2019-08-20 17:22:27 +02:00
DRracer
f07635d08a
Merge pull request #2116 from mkbel/fix_mmu_lay1cal
Fix mmu lay1cal
2019-08-19 19:07:10 +02:00
Marek Bel
f0642f88f1 Fix power panic broken when PSU_Delta defined.
Remove disable_z() call from uvlo_() and uvlo_tiny() power panic interrupt handlers. As historically this function was empty. And in case PSU_Delta macro defined it switches Z trinamic to silent mode, which could take some time and is not needed. Remove alignment to to full step from disable_force_z(), as it is not needed when switching to silent mode.
2019-08-19 17:37:23 +02:00
leptun
0d22f8039e Toggle FSENSOR and FSENSOR_AUTOLOAD 2019-08-19 11:58:16 +03:00
leptun
6e9c44af2d Fix warning 2019-08-19 11:07:11 +03:00
leptun
5a3f14b752 "N/A" toggle support and format update 2019-08-19 10:20:17 +03:00
Marek Bel
170c1ea866 Split first layer calibration load filament and intro line into separate steps. If load fails, pause print apparently flushes command buffer and intro line is not printed after issue is resolved. 2019-08-16 20:47:55 +02:00
Marek Bel
e53734895f Make MMU load failed blocking to workaround lack of resume print menu item.
The same workaround used as for USB print (Octoprint).
2019-08-16 20:20:17 +02:00
Marek Bel
1036c4f755 Do not precede first layer calibration without filament if print is paused due to MMU load failed. 2019-08-16 19:00:45 +02:00
Marek Bel
b10bd8340a Make local functions static. 2019-08-15 17:57:30 +02:00
Marek Bel
0b798767af Fix preheat ASA. 2019-08-15 17:54:23 +02:00
Marek Bel
a6f955b62d Use unused macros *_PREHEAT_FAN_SPEED. 2019-08-15 17:47:34 +02:00
Marek Bel
eb68bb9b43 Add ASA preheat. 2019-08-15 17:46:29 +02:00
Marek Bel
36a69281ee Remove unused functions forward declarations. 2019-08-15 17:36:05 +02:00
DRracer
0e4e644476
Merge branch 'MK3' into MK3_3.8.0 2019-08-15 10:34:50 +02:00
DRracer
ba81149afe
Merge branch 'MK3' into MK3_3.7.3 2019-08-15 10:25:51 +02:00
DRracer
dc78bc7362 Improve performance of bed PWM automaton - proof of concept
There are still some artefacts on the output pin - work in progress.
2019-08-14 17:53:08 +02:00
leptun
596ffe1dc2 Actual fix to the missing first two characters 2019-08-10 21:03:45 +03:00
leptun
7ce2fedac7 Fix missing first two characters in multi-lang mode 2019-08-10 09:16:23 +03:00
leptun
29dcb1cad3 Toggle FANS_CHECK 2019-08-10 08:43:07 +03:00
leptun
505deb28fd Toggle menu item 2019-08-10 08:42:33 +03:00
Paul Bransford
720ea49fa3 Merge branch 'MK3' into MK3-fix-sdcard-sorting 2019-08-08 19:48:50 -04:00
DRracer
2ddbd606f2 Version changed (3.8.0 build 2608) 2019-08-08 16:44:16 +02:00
DRracer
84cf1b83c3
Merge pull request #2083 from DRracer/viper
Workaround for the "viper" situation bug.
2019-08-07 17:48:57 +02:00
DRracer
a28c365bb1
Merge pull request #2075 from MRprusa3d/PFW-873b
farm mode update, documentation correction
2019-08-07 17:48:30 +02:00
DRracer
d9dec38815 Workaround for the "viper" situation bug. 2019-08-07 17:23:19 +02:00
Robert Pelnar
7da2ee5fc3 Version changed (3.7.3 build 2370) 2019-08-06 15:37:23 +02:00
Yuri D'Elia
33037d369c Prevent LCD long-press re-entry (fixes #1196) 2019-08-05 19:00:29 +02:00
MRprusa3d
b471bb7540 farm mode update, documentation correction 2019-08-05 17:51:26 +02:00
DRracer
5cb86a7e8f
Merge pull request #2074 from kuhnmarek/MK3_PFW-967_filament_sensor_check
Fw version check disabled in farm mode
2019-08-05 17:41:16 +02:00
Marek Kühn
091cd49ca5 Fw version check disabled in farm mode 2019-08-05 16:59:09 +02:00
DRracer
9f8590c572
Merge pull request #2072 from kuhnmarek/MK3_PFW-961_blind_sound
changed blind sound
2019-08-05 12:47:31 +02:00
Marek Kühn
f77414be2b blind alert sound shorter 2019-08-05 12:41:27 +02:00
Marek Kühn
f1a947af2c Whole hw settings hidden in farm mode 2019-08-05 10:40:21 +02:00
DRracer
cb19f0958b Use _delay() and _micros() for future compatibility 2019-08-05 09:51:06 +02:00
Marek Kühn
5f14e9c2e5 Removed sheet setting when in farm mode 2019-08-03 17:35:39 +02:00
Marek Kühn
15a095ea76 changed blind sound 2019-08-03 15:37:11 +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
Simon Benoit
49d2866b48 Add threshold distance to Z calibration
Add missing if statement
2019-07-30 19:43:07 -04: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
leptun
556b87edec M350 for all axis - MK3 2019-07-29 09:41:33 +03:00
Keith Spitz
952a24b45d
Update util.cpp
Correct "is_whitespace_or_nl": change 'r' to '\r'.
2019-07-28 19:40:18 -06:00
leptun
3ddb853bbd Fix shifted languages. Use \n and \x0a 2019-07-26 18:53:08 +03: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
2820baf016
Merge pull request #2040 from NotaRobotexe/MK3
multiple sheets - menu switching bug
2019-07-25 09:56:07 +02:00
NotaRobotexe
64115fb146 fixed redundant OK messages in serial 2019-07-24 18:08:14 +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
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
3e60cf4537 enable only for MK3S (out of FLASH on the MK3) 2019-07-23 16:51:02 +02:00
DRracer
593675c667 delay, micros for the 3.7.x branch 2019-07-23 16:40:21 +02:00
DRracer
6860a572c2 detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S 2019-07-23 15:55:53 +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
NotaRobotexe
19e7838c20 add default names to PROGMEM, text formating edit 2019-07-22 20:35:10 +02:00
NotaRobotexe
ab2eafe175 sheet menu, add hw setting, sheet change in menu, sheet name initialization in eeprom 2019-07-22 18:43:43 +02:00
DRracer
6f79ef4c9c resolve hidden conflicts in commented code 2019-07-22 17:29:43 +02:00
DRracer
65087b89ee Merge remote-tracking branch 'upstream/MK3' into code_size_optimization
and resolve conflicts (ultralcd.cpp)
2019-07-22 17:26:14 +02:00
DRracer
b96c9700ce fix prusa_statistics code size optimization according to unit test
results
2019-07-22 17:10:04 +02:00
DRracer
79c326cdaa
Merge pull request #2022 from kuhnmarek/gcodes_doxygen
Updated doxygen docs to work better with confluence.
2019-07-22 12:52:27 +02:00
NotaRobotexe
9c95f8c015 sheet menu 2019-07-19 18:34:46 +02:00
Marek Kühn
bd4bfbe586 Added M862 details 2019-07-19 16:15:12 +02:00
Marek Kühn
94e79806bc Updated doxygen docs to work better with confluence. 2019-07-19 13:51:55 +02:00
Marek Kühn
03e80ce4a8 PFW-917 Adjust Z value persists across update to v3.8 2019-07-18 16:50:44 +02:00
DRracer
b0c41ec979
Merge pull request #2017 from NotaRobotexe/octoprint_fix
Octoprint fix
2019-07-18 16:02:38 +02:00
DRracer
14b39b0094
Merge pull request #2019 from leptun/MK3_fix_LCD_WDT_RESET
Fix lcd not initing after WDT reset
2019-07-18 13:27:32 +02:00
leptun
121e60655a Fix lcd not initing after WDT reset 2019-07-18 11:50:18 +03:00
DRracer
1ae072c332
Merge pull request #2014 from NotaRobotexe/sound_fix
crash and filament unload sound change
2019-07-18 09:41:05 +02:00
DRracer
090ea3145d
Merge pull request #2015 from NotaRobotexe/text_edits
small text edit
2019-07-18 09:39:28 +02:00
NotaRobotexe
756ce51b5e
Merge branch 'MK3' into octoprint_fix 2019-07-17 20:06:06 +02:00
NotaRobotexe
b8fec59f21 octoprint fan error fix 2019-07-17 19:59:31 +02:00
NotaRobotexe
2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873
GUI updates
2019-07-17 14:49:07 +02:00
NotaRobotexe
1c44eddf81 crash and filament unload sound change 2019-07-17 12:32:27 +02:00
DRracer
255db28684 merge unit test and upstream changes 2019-07-17 10:30:49 +02:00
DRracer
eb705b6b17
Merge pull request #2012 from leptun/MK3_LCD_improvements
LCD fix status screen lcd_putchar
2019-07-17 08:05:56 +02:00
Yuri D'Elia
3a87ff56f6 Default to "Move Z" above a certain height even when printing
This speeds-up the ability to manually get the carriage out of the way
just after a print has finished
2019-07-16 22:04:32 +02:00
leptun
d8ecb2d0c9 Fix status screen 2019-07-16 21:11:27 +03:00
MRprusa3d
034cbff10a GUI updates 2019-07-16 20:10:49 +02:00
Marek Bel
0c660a6fb1 Revert "Fix sketch/lcd.cpp:196:1: warning: no return statement in function returning non-void [-Wreturn-type]."
This reverts commit a54fd29fa4.
2019-07-16 21:10:11 +03:00
NotaRobotexe
e6255e8451 octoprint fan error work 2019-07-16 19:18:31 +02:00
DRracer
1dab0f7a04
Merge pull request #2008 from leptun/MK3_LCD_improvements
Lcd optimization - 1K of flash saved
2019-07-16 19:15:57 +02:00
Marek Bel
a54fd29fa4 Fix sketch/lcd.cpp:196:1: warning: no return statement in function returning non-void [-Wreturn-type]. 2019-07-16 20:02:01 +03:00
Marek Bel
fecccf50e5 Remove duplicate prototypes from ultralcd.h. Make functions unreferenced outside lcd.cpp static. Disable unused functions by preprocessor to suppress warnings. 2019-07-16 20:01:49 +03:00
Marek Bel
3e292fd6b0 Fix compiler warnings:
sketch/Marlin.h:178:17: warning: extra tokens at end of #undef directive
sketch/Marlin.h:181:24: warning: extra tokens at end of #undef directive
sketch/Marlin.h:182:0: warning: "enable_z" redefined
2019-07-16 18:16:28 +02:00
Marek Bel
cee875fc6a Fix compiler warnings:
warning: enumeration value '_None' not handled in switch [-Wswitch]
warning: enumeration value '_Undef' not handled in switch [-Wswitch]
2019-07-16 17:40:28 +02:00
Marek Bel
6b8a5bc3ac Fix compiler warnings
sketch/tmc2130.cpp:146:42: warning: default argument given for parameter 1 of 'void tmc2130_init(bool)' [-fpermissive]
sketch/tmc2130.cpp:146:24: warning: unused parameter 'bSupressFlag' [-Wunused-parameter]
2019-07-16 17:31:56 +02:00
DRracer
8b806f692e
Merge pull request #1664 from MRprusa3d/PFW-811
"disable_z()" for Delta PSU
2019-07-16 16:46:34 +02:00
DRracer
d65b333664
Merge pull request #2003 from mkbel/heat_hysteresis
Heat hysteresis
2019-07-16 13:10:47 +02:00
DRracer
0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
leptun
8b1c687629 Lcd optimization - 1K of flash saved 2019-07-15 20:32:58 +03:00
Marek Bel
f0727214ed Document 2019-07-15 19:15:15 +02:00
Marek Bel
9083d151b2 wait_for_heater() in restore_print_from_ram_and_continue() only if saved_extruder_temperature differs from target hot-end temperature.
This fixes problem, that restore_print_from_ram_and_continue() blocked for heating for at least TEMP_RESIDENCY_TIME (3 seconds) even if temperature was resumed by M600 command.
2019-07-15 18:07:05 +02:00
Marek Bel
ab4e789688 Partially revert "aeed49a Fix filament runout on optical filament sensors"
Revert plan move to filament change position before enqued M600.
This was workaround to problem that restore_print_from_ram_and_continue() did 3s heating pause before resuming print. This problem will be fixed properly in restore_print_from_ram_and_continue() in next commit.

Save 166B of FLASH.
2019-07-15 17:22:39 +02:00
Marek Bel
549a8a1a6b Restore print fan speed earlier then nozzle temperature.
Avoids nozzle temperature dip when fan is turned on.
2019-07-15 16:25:21 +02:00
NotaRobotexe
8fb30f886a octoprint stop fix 2019-07-15 14:30:21 +02:00
NotaRobotexe
759d9f5a2e small text edits 2019-07-15 11:41:16 +02:00
DRracer
a3fde091ab More than 7.5KB saved by slight refactoring of printing to serial line 2019-07-12 10:10:56 +02:00
Marek Bel
38ff944b03 Reorder EEPROM items to allow possible future grow for Sheets struct. 2019-07-10 21:03:30 +02:00