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
90f85f7128
Merge pull request #2181 from leptun/MK3_fix_lcd_warning
...
Mk3 fix lcd warning
2019-09-10 14:07:28 +02:00
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
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
7cc9fe2e4f
Update 1_75mm_MK3S-EINSy10a-E3Dv6full.h
2019-09-09 02:20:39 +02:00
70de4d58f6
Update 1_75mm_MK3-EINSy10a-E3Dv6full.h
2019-09-09 02:20:14 +02:00
fb561b15ad
Update 1_75mm_MK25S-RAMBo13a-E3Dv6full.h
2019-09-09 02:19:52 +02:00
325e4a3403
Update 1_75mm_MK25S-RAMBo10a-E3Dv6full.h
2019-09-09 02:19:27 +02:00
0b50b2295c
Update 1_75mm_MK25-RAMBo13a-E3Dv6full.h
2019-09-09 02:18:54 +02:00
e581263bf1
Update 1_75mm_MK25-RAMBo10a-E3Dv6full.h
2019-09-09 02:18:22 +02:00
ca6937edaf
Update 1_75mm_MK2-RAMBo13a-E3Dv6full.h
2019-09-09 02:17:42 +02:00
a9a3d9d084
Update 1_75mm_MK2-RAMBo10a-E3Dv6full.h
2019-09-09 02:17:00 +02:00
978ace7fd7
Update Marlin_main.cpp
2019-09-09 02:16:06 +02:00
28c1486df2
Update Configuration.h
2019-09-09 02:14:10 +02:00
eec8e5f8c0
Version changed (3.8.0 build 2684)
2019-09-06 19:47:05 +02:00
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
3ba2197dd3
more space for the second lang
2019-09-06 08:37:59 +02:00
e73b0a88d5
Use same format for all instances where "ok" is send to serial line.
2019-09-05 22:35:01 +02:00
3a5daf1c64
Change default sheet names.
2019-09-05 17:27:21 +02:00
d51b3d6207
Added doxygen todos for missing LCD layout and positioning
2019-09-01 09:51:51 +02:00
339771a5fb
Fixed info screen when selected_sheet hasn't been initialized.
2019-08-31 21:27:08 -04:00
10cdcb3ae3
SD Scroll workaround
2019-08-31 17:00:39 +03:00
795b1d1cf7
Toggle Sound
2019-08-31 16:56:14 +03:00
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
3c4fffef60
Merge branch 'MK3' into MK3_Translations
2019-08-31 15:30:51 +03:00
a5a5f5cf0b
Toggle RPi port
...
Probably works, needs to be tested.
2019-08-31 15:25:00 +03:00
f69035323a
Toggle SD Settings
...
This includes FlashAir support and SD Sorting type
2019-08-31 14:55:51 +03:00
a821002f02
Toggle MMU Mode
2019-08-31 07:38:40 +03:00
d347a36509
Merge branch 'MK3' of https://github.com/prusa3d/Prusa-Firmware into MK3-2093-sheet-display
2019-08-30 19:17:27 -04:00
871e29621f
Fix "stuck" rename cursor
2019-08-30 19:14:22 -04:00
a789a8995f
Merge pull request #2145 from mkbel/fix_sheet_reset
...
Fix sheet reset
2019-08-30 16:49:34 +02:00
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
865484590b
Change default sheet name from "<number>" to "Sheet <number>".
2019-08-30 16:11:41 +02:00
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
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
6c78c2fad5
Fix compiler warning.
2019-08-30 12:03:35 +02:00
90e5f14309
Fix compile error on MK3
2019-08-30 13:02:00 +03:00
50a8c16f27
Use EEPROM update instead of write.
2019-08-30 12:00:33 +02:00
56c949b9af
Fix typo
2019-08-30 12:14:43 +03:00
d8d0069f97
Fix MK2.x Default stepper power out of sync
2019-08-30 12:12:29 +03:00
b86a92a7d6
Toggle Mode (stepper power)
2019-08-30 07:59:58 +03:00
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
db6e2e0525
Toggle Crash det.
2019-08-29 22:31:30 +03:00
8c8619be05
Convert reset sheet sub menu to function.
2019-08-29 20:52:53 +02:00
abf84e36f5
Fix sheet menu back caption to Steel sheets to match parent menu caption.
2019-08-29 20:23:02 +02:00
d647cdc02c
Convert sheet switcher from sub menu to function. Handle null characters in sheet name.
2019-08-29 20:13:10 +02:00
cd7805ba46
Document
2019-08-29 18:26:24 +02:00
0b196da6fc
Migrate old vale of EEPROM_BABYSTEP_Z only if active sheet is not initialized.
2019-08-29 18:07:49 +02:00
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
7f51e0bad8
Move SpoolJoin and Cutter to MSGs
2019-08-29 17:35:26 +03:00
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
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
0b21acec46
Minor fix to Toggle Cutter
2019-08-29 15:49:26 +03:00
d0f9f10ed6
Toggle Cutter
2019-08-29 15:43:41 +03:00
1937cf2074
Toggle SpoolJoin
2019-08-29 15:40:04 +03:00
5eea8d26fe
Merge branch 'MK3' into MK3_Translations
2019-08-29 12:08:48 +03:00
f3bb72be64
Reset calibration status if there is no calibrated sheet after reset.
2019-08-29 03:33:33 +02:00
f64252b59b
Hide sheet switcher from main menu, if there are less than 2 sheets calibrated.
2019-08-28 19:08:53 +02:00
9692f94683
Move sheet menu up to be after Print from SD.
2019-08-28 19:01:48 +02:00
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
33675c6d1e
Change default sheet names.
2019-08-28 18:16:35 +02:00
49bc11037c
Remove statements with no effect.
2019-08-28 18:14:10 +02:00
1d23cc52e9
endstop sound alert fixes
2019-08-28 09:39:28 +02:00
29c8cb2927
Fix bad merge.
2019-08-27 22:22:36 +02:00
3f04c4db87
Merge branch 'MK3' into preheat_menu
2019-08-27 22:20:23 +02:00
07169ad84a
Make file local variable static.
2019-08-27 20:48:53 +02:00
e57fcc04a7
Fix compiler warnings.
2019-08-27 20:23:48 +02:00
d927d5b05d
Port wizard_active to mFilamentItem().
2019-08-27 20:19:03 +02:00
cef7f31b9f
Set FilamentAction to None if mFilamentMenu left by cooldown or menu back action.
2019-08-27 20:13:55 +02:00
ffc5a64154
Remove commented out code.
2019-08-27 20:06:48 +02:00
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
1a1be5c518
Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
...
select filament
2019-08-27 17:10:29 +02:00
bf2097342d
Add ASA preheat into mFilamentMenu();
2019-08-27 17:01:41 +02:00
11ce786aaa
Support for more special characters allowed in file names (^ + = [ ] ;
...
,)
2019-08-27 13:47:58 +02:00
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
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
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
4792559536
Add farm preheat items. Add setWatch() call.
2019-08-26 21:00:30 +02:00
aa13f9e809
Fix formatting.
2019-08-26 20:19:34 +02:00
668e89e5a9
Preheat menu: Add ASA, hide menu item back when in wizard.
2019-08-26 20:18:34 +02:00
52ae62bbba
Fix formatting.
2019-08-26 20:14:00 +02:00
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
b9b0d6049e
Fix formatting.
2019-08-26 19:48:39 +02:00
159a1a70d8
Update documentation.
2019-08-26 17:19:57 +02:00
c27fcf9cff
Increase version to 3.8.0-RC2 and build number to 2639.
2019-08-26 17:03:18 +02:00
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
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
5bb510dd2a
Merge pull request #2129 from DRracer/bed-noise-performance
...
Improve performance of bed PWM automaton
2019-08-22 14:45:01 +02:00
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
d3123a74b0
Updated LCD menu documentation to new form/syntax
2019-08-22 04:58:16 +02:00
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
a7c2aec04c
Code size reduced by almost 5KB
2019-08-21 09:59:51 +02:00
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
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
f07635d08a
Merge pull request #2116 from mkbel/fix_mmu_lay1cal
...
Fix mmu lay1cal
2019-08-19 19:07:10 +02:00
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
0d22f8039e
Toggle FSENSOR and FSENSOR_AUTOLOAD
2019-08-19 11:58:16 +03:00
6e9c44af2d
Fix warning
2019-08-19 11:07:11 +03:00
5a3f14b752
"N/A" toggle support and format update
2019-08-19 10:20:17 +03:00
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
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
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
b10bd8340a
Make local functions static.
2019-08-15 17:57:30 +02:00
0b798767af
Fix preheat ASA.
2019-08-15 17:54:23 +02:00
a6f955b62d
Use unused macros *_PREHEAT_FAN_SPEED.
2019-08-15 17:47:34 +02:00
eb68bb9b43
Add ASA preheat.
2019-08-15 17:46:29 +02:00
36a69281ee
Remove unused functions forward declarations.
2019-08-15 17:36:05 +02:00
469ca6e184
Merge commit 'refs/tags/v3.8.0-RC1^{}' into enable_cutter
2019-08-15 14:48:28 +02:00
0e4e644476
Merge branch 'MK3' into MK3_3.8.0
2019-08-15 10:34:50 +02:00
ba81149afe
Merge branch 'MK3' into MK3_3.7.3
2019-08-15 10:25:51 +02:00
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
32fa8caab8
reinitialize the timestamp to ensure enough time to receive response for 0xFF sent.
2019-08-11 17:57:41 -04:00
596ffe1dc2
Actual fix to the missing first two characters
2019-08-10 21:03:45 +03:00
7ce2fedac7
Fix missing first two characters in multi-lang mode
2019-08-10 09:16:23 +03:00
29dcb1cad3
Toggle FANS_CHECK
2019-08-10 08:43:07 +03:00
505deb28fd
Toggle menu item
2019-08-10 08:42:33 +03:00
720ea49fa3
Merge branch 'MK3' into MK3-fix-sdcard-sorting
2019-08-08 19:48:50 -04:00
4e58a112e8
Fix for Toshiba FlashAir (or other) SD card initialization - add clock cycles between sending CMD0 and CMD8. Redone for MK3 branch)
2019-08-08 15:45:59 -04:00
2ddbd606f2
Version changed (3.8.0 build 2608)
2019-08-08 16:44:16 +02:00
84cf1b83c3
Merge pull request #2083 from DRracer/viper
...
Workaround for the "viper" situation bug.
2019-08-07 17:48:57 +02:00
a28c365bb1
Merge pull request #2075 from MRprusa3d/PFW-873b
...
farm mode update, documentation correction
2019-08-07 17:48:30 +02:00
d9dec38815
Workaround for the "viper" situation bug.
2019-08-07 17:23:19 +02:00
7da2ee5fc3
Version changed (3.7.3 build 2370)
2019-08-06 15:37:23 +02:00
33037d369c
Prevent LCD long-press re-entry ( fixes #1196 )
2019-08-05 19:00:29 +02:00
b471bb7540
farm mode update, documentation correction
2019-08-05 17:51:26 +02:00
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
091cd49ca5
Fw version check disabled in farm mode
2019-08-05 16:59:09 +02:00
9f8590c572
Merge pull request #2072 from kuhnmarek/MK3_PFW-961_blind_sound
...
changed blind sound
2019-08-05 12:47:31 +02:00
f77414be2b
blind alert sound shorter
2019-08-05 12:41:27 +02:00
f1a947af2c
Whole hw settings hidden in farm mode
2019-08-05 10:40:21 +02:00
cb19f0958b
Use _delay() and _micros() for future compatibility
2019-08-05 09:51:06 +02:00
7cae064611
Update EEPROM_LAST_ITEM
2019-08-04 18:39:28 +02:00
18b8dc89e5
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-08-04 17:06:34 +02:00
1435e4a68d
Use the computed direction in fsensor_st_block_begin
2019-08-04 16:53:48 +02:00
5f14e9c2e5
Removed sheet setting when in farm mode
2019-08-03 17:35:39 +02:00
15a095ea76
changed blind sound
2019-08-03 15:37:11 +02:00
7c9d3dd177
Update doxydoc of new G-codes
2019-08-01 13:09:20 +02:00
9214e30f74
Merge pull request #2062 from MRprusa3d/PFW-873
...
UI update
2019-08-01 07:20:09 +02:00
2cb977e4a0
UI update
2019-07-31 20:39:57 +02:00
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
49d2866b48
Add threshold distance to Z calibration
...
Add missing if statement
2019-07-30 19:43:07 -04:00
bca0fd81eb
Fix loading filament 255 instead of 0 in first layer calibration wizard.
2019-07-30 19:15:33 +02:00
0aed59c947
Fix unsigned char overflow cause invalid filament load.
2019-07-30 19:06:57 +02:00
9ff1f6c3ee
Re-enable Tone
2019-07-30 16:05:40 +03:00
5fdaead663
Fix language related warnings in LANG_MODE 0
2019-07-29 15:55:42 +03:00
556b87edec
M350 for all axis - MK3
2019-07-29 09:41:33 +03:00
952a24b45d
Update util.cpp
...
Correct "is_whitespace_or_nl": change 'r' to '\r'.
2019-07-28 19:40:18 -06:00
3ddb853bbd
Fix shifted languages. Use \n and \x0a
2019-07-26 18:53:08 +03:00
0687b8e4a2
Merge pull request #2044 from mkbel/fix_missing_mmu_attention
...
Fix missing mmu attention
2019-07-26 09:07:06 +02:00
3b396fb8bf
Merge branch 'MK3' into fix_missing_mmu_attention
2019-07-25 19:10:07 +02:00
a9e9a9857b
Fix "MMU needs attention screen is missing in case of failed unload filament".
2019-07-25 19:09:52 +02:00
3438c0e411
Merge pull request #2042 from NotaRobotexe/octoprint_bugs
...
fixed redundant OK messages in serial
2019-07-25 12:41:43 +02:00
2820baf016
Merge pull request #2040 from NotaRobotexe/MK3
...
multiple sheets - menu switching bug
2019-07-25 09:56:07 +02:00
64115fb146
fixed redundant OK messages in serial
2019-07-24 18:08:14 +02:00
5021fadd5d
multiple sheets - menu switching bug
2019-07-24 11:20:27 +02:00
33195baf9d
Merge pull request #2035 from mkbel/enable_lin_corr
...
Re-enable linearity correction for MK3.
2019-07-24 09:08:43 +02:00
851aaac053
Merge branch 'MK3' of https://github.com/NotaRobotexe/Prusa-Firmware into MK3
2019-07-23 19:29:36 +02:00
fb35009628
multiple sheets,fix of bug in switching sheets from menu
2019-07-23 19:25:59 +02:00
f9e32c4bf4
Re-enable linearity correction for MK3.
2019-07-23 19:22:54 +02:00
3e60cf4537
enable only for MK3S (out of FLASH on the MK3)
2019-07-23 16:51:02 +02:00
593675c667
delay, micros for the 3.7.x branch
2019-07-23 16:40:21 +02:00
6860a572c2
detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S
2019-07-23 15:55:53 +02:00
c4d5e332c8
Merge branch 'MK3' into MK3
2019-07-23 11:34:42 +02:00
b9f622f8a6
variables to PROGMEM, text formating
2019-07-23 11:31:20 +02:00
b5129ff2ec
Revert "force push"
...
This reverts commit 19e7838c20
2019-07-23 11:12:53 +02:00
19e7838c20
add default names to PROGMEM, text formating edit
2019-07-22 20:35:10 +02:00
ab2eafe175
sheet menu, add hw setting, sheet change in menu, sheet name initialization in eeprom
2019-07-22 18:43:43 +02:00
6f79ef4c9c
resolve hidden conflicts in commented code
2019-07-22 17:29:43 +02:00
65087b89ee
Merge remote-tracking branch 'upstream/MK3' into code_size_optimization
...
and resolve conflicts (ultralcd.cpp)
2019-07-22 17:26:14 +02:00
b96c9700ce
fix prusa_statistics code size optimization according to unit test
...
results
2019-07-22 17:10:04 +02:00
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
9c95f8c015
sheet menu
2019-07-19 18:34:46 +02:00
bd4bfbe586
Added M862 details
2019-07-19 16:15:12 +02:00
94e79806bc
Updated doxygen docs to work better with confluence.
2019-07-19 13:51:55 +02:00
03e80ce4a8
PFW-917 Adjust Z value persists across update to v3.8
2019-07-18 16:50:44 +02:00
b0c41ec979
Merge pull request #2017 from NotaRobotexe/octoprint_fix
...
Octoprint fix
2019-07-18 16:02:38 +02:00
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
121e60655a
Fix lcd not initing after WDT reset
2019-07-18 11:50:18 +03:00
1ae072c332
Merge pull request #2014 from NotaRobotexe/sound_fix
...
crash and filament unload sound change
2019-07-18 09:41:05 +02:00
090ea3145d
Merge pull request #2015 from NotaRobotexe/text_edits
...
small text edit
2019-07-18 09:39:28 +02:00
756ce51b5e
Merge branch 'MK3' into octoprint_fix
2019-07-17 20:06:06 +02:00
b8fec59f21
octoprint fan error fix
2019-07-17 19:59:31 +02:00
2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873
...
GUI updates
2019-07-17 14:49:07 +02:00
1c44eddf81
crash and filament unload sound change
2019-07-17 12:32:27 +02:00
255db28684
merge unit test and upstream changes
2019-07-17 10:30:49 +02:00
eb705b6b17
Merge pull request #2012 from leptun/MK3_LCD_improvements
...
LCD fix status screen lcd_putchar
2019-07-17 08:05:56 +02:00
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
d8ecb2d0c9
Fix status screen
2019-07-16 21:11:27 +03:00
034cbff10a
GUI updates
2019-07-16 20:10:49 +02:00
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
e6255e8451
octoprint fan error work
2019-07-16 19:18:31 +02:00
1dab0f7a04
Merge pull request #2008 from leptun/MK3_LCD_improvements
...
Lcd optimization - 1K of flash saved
2019-07-16 19:15:57 +02:00
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
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
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
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
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
8b806f692e
Merge pull request #1664 from MRprusa3d/PFW-811
...
"disable_z()" for Delta PSU
2019-07-16 16:46:34 +02:00
d65b333664
Merge pull request #2003 from mkbel/heat_hysteresis
...
Heat hysteresis
2019-07-16 13:10:47 +02:00
0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
...
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
8b1c687629
Lcd optimization - 1K of flash saved
2019-07-15 20:32:58 +03:00
f0727214ed
Document
2019-07-15 19:15:15 +02:00
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
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
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
8fb30f886a
octoprint stop fix
2019-07-15 14:30:21 +02:00
759d9f5a2e
small text edits
2019-07-15 11:41:16 +02:00
a3fde091ab
More than 7.5KB saved by slight refactoring of printing to serial line
2019-07-12 10:10:56 +02:00
38ff944b03
Reorder EEPROM items to allow possible future grow for Sheets struct.
2019-07-10 21:03:30 +02:00
8985d2e26c
Fix fix EEPROM conflict.
2019-07-10 18:50:16 +02:00
6ed146c37c
Fix EEPROM conflict.
2019-07-10 18:41:12 +02:00
b8b167d1ca
Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown
2019-07-10 19:26:43 +03:00
d3dd0ad271
Merge pull request #1952 from NotaRobotexe/sound
...
new sound
2019-07-10 18:06:32 +02:00
333ade9aee
Remove non-existing function prototype.
2019-07-10 17:59:04 +02:00
7189f44bcd
Remove commented out defines.
2019-07-10 17:40:33 +02:00
e0f46f128d
Fix indentation.
2019-07-10 17:39:24 +02:00
4e7de776cd
Disable TMC2130 linarity correction for MK3 to save FLASH to enable compilation. Add symlink /Firmware/variants/printers.h to .gitignore.
2019-07-10 17:07:00 +02:00
98bae7af9f
Merge branch 'MK3' into PFW-873
2019-07-10 16:50:14 +02:00
3333d937ed
some improvements
2019-07-10 16:29:40 +02:00
9585789288
Merge pull request #1976 from NotaRobotexe/MK3_3.7.2_PP
...
dont fire power panic at normal power off
2019-07-10 14:19:00 +02:00
4e3bf276ec
Merge pull request #1984 from leptun/MK3_compile_error_fix_multiple_sheets_Windows
...
Fix compile error on Windows when multiple_sheets is merged
2019-07-09 19:28:35 +02:00
712fb1cceb
#undef EEPROM_SHEETS_BASE so this internal define for compile-time checking only is not used outside of eeprom.h
2019-07-09 19:19:59 +02:00
fcfc9ca95c
Merge pull request #1979 from DRracer/heatbed_noise_suppression
...
Heatbed noise suppression
2019-07-09 18:33:27 +02:00
dbc603d5f6
Fix compile error on windows
...
addresses issue #1965
2019-07-09 18:38:24 +03:00
898f6d9d8b
Fix EEPROM_Sheets_base overlay of EEPROM_NOZZLE_DIAMETER_uM.
2019-07-09 13:41:18 +02:00
cd1ea0a655
Move function declaration and structs declarations to top of eeprom.h file.
2019-07-09 13:38:58 +02:00
4d535f1217
... incl. SupportMenu ;-P
2019-07-09 12:31:20 +02:00
8229a45187
pre-production version ;-)
2019-07-09 12:16:51 +02:00
61566f7fb1
Move translated string MSG_V2_CALIBRATION from untranslated section to PROGMEM_I1, add missing ISTR macro. Revert _T(MSG_SELECT) and _T(MSG_RENAME) to _i("Select") and _i("Rename") as it is preferred macro for internationalized strings. Use MSG_V2_CALIBRATION in both occurrences.
2019-07-08 21:18:55 +02:00
a16de83535
heatbed audible noise suppression using short fast PWM pulses with
...
variable duty
2019-07-08 16:42:21 +02:00
9592460281
add old delay
2019-07-04 18:43:59 +02:00
a1a8945bee
more code editing
2019-07-04 15:31:44 +02:00
1f9dce9513
next almost 200B down
2019-07-04 13:36:02 +02:00
e77898d5dc
code edit
2019-07-04 13:21:27 +02:00
81b3b71cca
check eeprom inicialization
2019-07-03 19:37:11 +02:00
4db4f19128
'variant files' update ;-(((
2019-07-03 18:14:48 +02:00
7e3cb98a1f
& MK3S
2019-07-03 17:50:41 +02:00
a3a7f3106e
print parameters checking
2019-07-03 17:21:11 +02:00
ff3c9d1a7c
dont fire power panic at normal power off
2019-06-28 11:25:56 +02:00
a59e7090ea
Increase version.
2019-06-27 17:32:40 +02:00
b6bcb901f3
Correct initialization of eISR_Err
...
Further tweak the initial term to improve the linearity of the resulting
speed after BW filtering.
2019-06-27 13:21:39 +02:00
d344e514c4
Rename functions and macro to match with naming convention - remove 'P' where there is no pointer to progmem.
2019-06-26 15:51:58 +02:00
d879794922
Remove first parameter of macro menu_format_sheet_P_E, of function menu_format_sheet_P_E and menu_item_submenu_P as it was always called with the same parameter. Saves 66B of FLASH.
2019-06-26 15:47:06 +02:00
53dbcdd852
Display sheet name when adjusting Z. Costs 130B of flash.
2019-06-26 15:33:54 +02:00
4a16fe6902
Save z_offset, bed_temp and pinda_temp with sheet calibration.
2019-06-26 14:10:12 +02:00
20dd1110f6
Remove unused parameters of function _lcd_babystep(int axis, chonst char *msg).
...
Saves 24B of flash memory.
2019-06-25 19:43:10 +02:00
ebdeb99134
Add menu to show sheet live adjust Z value.
2019-06-25 18:55:25 +02:00
4058cd144b
add delay_keep_alive without updating lcd
2019-06-25 14:30:11 +02:00
3e9dc91cef
ifdef for mk2
2019-06-24 18:01:49 +02:00
b5168bd6c2
fan error fix
2019-06-24 17:30:56 +02:00
b67ec501b4
Add rename sheet menu.
2019-06-24 17:11:13 +02:00
e6fbac08ed
Move sheet selector to submenu.
2019-06-21 15:44:56 +02:00
19a474eaa5
Fix compiler warnings.
2019-06-20 18:00:29 +02:00
0a48082609
Add steel sheet profile selector.
2019-06-20 16:40:53 +02:00
9a904362e5
code only for TMC2130
2019-06-20 10:17:48 +02:00
e54497d802
added new function belt test under calibration menu
2019-06-20 00:09:55 +02:00
89b578c899
Merge branch 'MK3' into multiple_sheets
2019-06-19 18:40:09 +02:00
524121141a
Remove commented out code. This code is of unknown genesis and purpose. It was added in commit "3.0.10 sync" two years ago and it was already commented out in that moment.
2019-06-19 15:54:24 +02:00
6a272d83b1
Add compile time check for EEPROM stored varibles size.
2019-06-19 15:09:07 +02:00
2e073527fb
Also avoid E direction inversions while coasting
2019-06-19 14:28:04 +02:00
64903e0ae8
Remove unused defines.
2019-06-19 14:27:02 +02:00
4b3af0d2df
Respect minimum direction change delay
2019-06-19 13:22:44 +02:00
181c42fa62
Merge remote-tracking branch 'prusa3d/MK3' into enable_cutter
2019-06-18 20:03:41 +02:00
8b6629ad58
Fix comment grammar.
2019-06-18 20:00:02 +02:00
ae9ae95187
MMU: Filter IR sensor signal when detecting whether filament tip passes to heat break. Increase number of tries when loading filament to 3.
2019-06-18 19:15:16 +02:00
6cb85a455f
Update mmu.cpp
2019-06-18 15:08:47 +02:00
24cec4091b
Merge branch 'MK3' into sound
2019-06-17 17:28:19 +02:00
aff020a6d4
Merge pull request #1897 from NotaRobotexe/farm_mode
...
PFW-571 send PRN:4 instead PRN:1, PFW-874 new firmware version alert with 30s timeout
2019-06-14 20:05:30 +02:00
b1df1fb1f1
Fix formatting. We are never using 2 space indentation. 4 spaces are preferred, tabulator is acceptable if surrounding code uses tabs.
2019-06-14 18:18:27 +02:00
367a28a5a8
Default to "Live Adjust Z" when longpressing during a print ( closes #1604 )
...
- Disable longpress action when homing or calibrating
- Default to Live Adjust during a print
- Retain "Move Z" otherwise
2019-06-14 11:44:06 +02:00
d81970dd3d
Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown
2019-06-14 11:07:08 +03:00
c5d130e763
Merge pull request #1914 from prusa3d/MK3_3.7.2
...
Increase version.
2019-06-14 09:39:41 +02:00
fee67d9451
Increase version.
2019-06-13 16:37:51 +02:00
6717590631
Merge branch 'MK3' into MK3_LA15
2019-06-13 15:39:50 +02:00
55dc78546b
Merge pull request #1913 from mkbel/fix_spelling
...
Fix spelling.
2019-06-13 15:12:30 +02:00
25f0eb9a39
Fix spelling.
2019-06-13 15:01:54 +02:00
72f5e87c61
Merge branch 'MK3' into use_enum_class_2
2019-06-12 19:17:35 +02:00
1390d4e5b9
Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t.
2019-06-12 19:11:41 +02:00
5fcf760954
Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t.
2019-06-12 18:54:43 +02:00
51df6cdfdc
Remove LcdCommands::Unknown3. Remove LcdCommands mapping to numbers, as it is not needed.
2019-06-12 18:54:37 +02:00
cbb92860d0
Use first letter capital camel case for enum class members.
2019-06-12 18:54:32 +02:00
0401490cc1
Use first letter capital camel case for enum class members.
2019-06-12 18:54:25 +02:00
9ceba00426
Use first letter capital camel case for enum class members. Remove dependency of FanCheck values on TestError values as it is not used.
2019-06-12 18:53:09 +02:00
b7d3766ae2
Merge branch 'MK3' into PFW-790
2019-06-12 17:32:13 +02:00
6dd085bcc5
Use first letter capital camel case for enum class members.
2019-06-12 16:44:07 +02:00
e393d91b12
Use first letter capital camel case for enum class members.
2019-06-12 16:20:21 +02:00
cc80bfa020
Merge branch 'MK3' into use_enum_class
2019-06-12 16:04:26 +02:00
c7e1e73880
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 15:41:55 +02:00
94a5175980
Code size reduction - saved almost 2KB
2019-06-12 15:41:34 +02:00
8d388fa03a
Merge pull request #1911 from mkbel/layer1_cal_flash
...
Layer1 cal flash
2019-06-12 15:40:59 +02:00
49f172a7b9
Convert uint8_t cycle control varibles changed in previous commit to uint_least8_t to be potentially more portable.
2019-06-12 15:01:57 +02:00
b15bbaf177
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 14:58:15 +02:00
7ac098a135
Refactor. Put constants needed in functions inside fuctions to limit its scope.
2019-06-12 14:20:20 +02:00
2755a3733d
Document.
2019-06-12 14:15:58 +02:00
342954b88c
Refactor. Make constants producing first layer calibration square more clear. Note layer height discrepancy.
2019-06-12 13:31:17 +02:00
4f8ed7f123
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 10:31:09 +02:00
baa36ce740
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 09:58:42 +02:00
d528a53526
Refactor. Move lcd_commands_func1() to first_lay_cal.cpp and rename it to lay1cal_square(). Remove its constant parameters. Move remaining G1 code to lay1cal_meander(). Saves 6B of FLASH memory.
2019-06-12 01:36:48 +02:00
60cc3d58ec
Use sprintf_P in first layer calibration. Save 30B of FLASH memory.
2019-06-11 20:00:49 +02:00
47a183e96e
Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory.
2019-06-11 19:49:56 +02:00
21f4669600
Make count_e() constexpr.
2019-06-11 19:22:08 +02:00
4effff9e99
Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory.
2019-06-11 18:56:29 +02:00
d21f256cd0
Remove duplicate calls of lcd_timeoutToStatus.start(), move !blocks_queued() && cmd_buffer_empty() condition to outer if, rewrite using switch statement. Save 487B of FLASH memory.
2019-06-11 18:26:59 +02:00
97a5d6b5f4
Make constants const.
2019-06-11 17:30:37 +02:00
9b1e3213ae
Variable lcd_commands_step doesn't need to be global.
2019-06-11 17:30:19 +02:00
58948cffcd
Code size reduction - saved almost 2KB
2019-06-11 17:23:01 +02:00
0c9121e99e
Use loop to enquecommand_P() in first layer calibration.
2019-06-11 17:08:56 +02:00
f20125a3e2
Code size reduction - saved almost 2KB
2019-06-11 16:24:40 +02:00
cb6a3e7e12
Merge pull request #1907 from DRracer/fan_check_error_fix
...
Do not allow resume printing if fans are still not ok
2019-06-11 15:12:48 +02:00
13c3ab14fa
test fan check error only when enabled by #ifdef
2019-06-11 15:05:40 +02:00
3e37150552
Do not allow resume printing if fans are still not ok
2019-06-11 14:53:10 +02:00
27145204ed
Use internationalized M117, but anyway the text is not shown.
2019-06-10 21:40:12 +02:00
4be8fa701e
Use loop to enquecommand_P() in first layer calibration.
2019-06-10 20:41:18 +02:00
c40e3b550d
Remove stubs and live K by default
2019-06-10 19:34:00 +02:00
bb980e2fca
sound edit, delete mute mode, add blind mode
2019-06-10 15:03:52 +02:00
28e7772421
Merge pull request #1886 from leptun/MK3_fix_load_filament_5
...
Fix Load Filament 5 for MMU2
2019-06-10 14:45:55 +02:00
327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix
...
Fan check error fix
2019-06-06 15:52:44 +02:00
0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2
...
Filament runout mk3 2
2019-06-06 15:51:35 +02:00
83578c3389
documentation + minor code cleanup based on code review
2019-06-06 15:50:13 +02:00
0239f4bce1
Update/compute advance steps inside calculate_trapezoid_for_block
...
Do not store the block e_D ratio, store directly the computed
compression factor so that we can recompute the advance steps
quickly and update them in sync with the acceleration rates.
2019-06-05 20:25:26 +02:00
048628083a
Remove clear_current_adv_vars()
...
The pressure state is already reset implicitly at the end of each block,
meaning an extruder switch will never have to reset the internal state
anyway.
We clear the internal backpressure in the following conditions:
- when switching to a non-LA block
- when quickStop is called
- when the scheduler is idling (losing pressure)
2019-06-05 20:25:19 +02:00
7d33089d9a
Remove use_advance_lead
...
The per-step state is kept implicitly using nextAdvanceISR,
while the current pressure is decoupled anyway.
2019-06-05 20:25:12 +02:00
dc436b71fe
Fix position_float after a quickStop condition
2019-06-05 20:25:05 +02:00
fa454f61e4
Drop unused "speed_lookup_table.h" from planner.cpp
2019-06-05 20:24:58 +02:00
1d8c24e8a9
"disable_z()" for Delta PSU IV
...
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
19351df8a7
Extracted computation of z_shift for M600 into a separate function to
...
improve readability. Surprisingly, also the code got shorter.
2019-06-05 18:34:26 +02:00
9c3bb14bae
remove function forward decl: fsensor_restore_print_and_continue_IR
...
revert LCD_BL_PIN change
2019-06-05 18:34:10 +02:00
aeed49a80e
Fix filament runout on optical filament sensors
...
Reworked the IR variant accordingly
Some code-size optimization in related functions
2019-06-05 18:33:41 +02:00
10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic
...
documentation for power panic
2019-06-05 16:10:04 +02:00
0cab2284ea
PFW-874 new firmware alert timeout
2019-06-05 15:48:10 +02:00
14270ac1f6
power panic documentation
2019-06-05 15:10:51 +02:00
d263728c37
documentation
2019-06-05 14:55:59 +02:00
33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic
...
Power panic Z axis fix
2019-06-05 13:34:21 +02:00
2c4e98dc27
power panic improvement
2019-06-05 13:12:08 +02:00
cda9ed4a1d
Reset LA state more carefully during stop conditions
2019-06-04 16:22:40 +02:00
1bed8cfa94
Don't call fsensor_st_next_block repeatedly during the last step
...
Rely on st_block_begin to perform a single call instead of calling
block_chunk for each advance tick in the last step
2019-06-04 16:22:33 +02:00
8ce1c04740
Remove useless "extruder under pressure" flag
...
That's exactly what LA does
2019-06-04 16:22:27 +02:00
bca5618145
Save/restore K during a power panic
2019-06-03 17:33:19 +02:00
84009e1e8e
Do a full fsensor_update() when initializing the sensor
...
This correctly populates the "extruder info" details even when
the menu is entered for the first time after starting a print.
2019-06-03 17:32:57 +02:00
fa7c0fb2c9
Avoid triggering LA during a Z-priming move
...
When recovering from a pause, the nozzle is often primed while
being lowered. If LA is triggered under such a move, the pressure
advance will be wasted.
2019-06-03 17:32:51 +02:00
d2432056bd
Elide fsensor_st_block_begin, saving some cycles/bytes
2019-06-03 17:32:43 +02:00
5985c0608e
Revert changes to pins_Einsy_1_0.h not related to the fan check error
...
fix
2019-06-03 09:02:27 +02:00
5cd0177389
Cleanup fsensor_st_block_begin
2019-06-02 18:17:59 +02:00
b4bf79297f
Remove unneeded includes from fsensor
2019-06-02 01:08:03 +02:00
c50b1c0351
Rework the filament counter logic
...
- Move direction checks out of fsensor: fsensor_counter is now
always in the same direction as e_steps
- Check the filament chunk after e_steps have been physically done,
using the real e_step count so far
2019-06-01 22:08:00 +02:00
09fee4e64d
remove fan error simulation automaton
2019-05-31 11:30:30 +02:00
6755791778
Fix repeated fan error checking
2019-05-31 11:29:11 +02:00
adb5baa12b
Merge remote-tracking branch 'upstream/MK3' into MK3
2019-05-31 11:05:24 +02:00
ebfad55617
Merge pull request #1888 from mkbel/always_cut_independent
...
Always cut independent
2019-05-31 07:00:37 +02:00
00da4640e2
Document.
2019-05-30 23:29:33 +02:00
e79c203c96
Do not always cut if it is not enabled from menu.
2019-05-30 23:04:06 +02:00
ccb649b1f6
Add always cut experimental / for testing feature.
2019-05-30 23:03:59 +02:00
18122049a6
Fix cut filament menu item labels.
2019-05-30 19:36:10 +02:00
878e866401
Fix Load Filament 5 for MMU2
2019-05-30 17:28:02 +03:00
e9c870e7a0
fix of fixof power panic
2019-05-29 20:33:22 +02:00
3b2cbc68d8
PFW-571 send PRN:4 instead PRN:1 while changing filament
2019-05-28 18:22:34 +02:00
1c619133a3
Merge pull request #1880 from NotaRobotexe/power_panic
...
PFW-828 add uvlo tiny z positio back
2019-05-28 14:29:13 +02:00
bcb6129c29
delete comment
2019-05-28 14:11:38 +02:00
8842d16832
add back uvlo tiny z positio
2019-05-28 13:50:21 +02:00
326c061d8c
testing pin 5
2019-05-27 18:27:24 +02:00
2f96badef4
Merge pull request #1870 from NotaRobotexe/power_panic
...
PFW-828 after power panic printer start print in the air
2019-05-27 17:13:08 +02:00
9c3b93f900
Merge pull request #1869 from DRracer/fix_mintemp_and_fsensor
...
Fix MINTEMP errors and fsensor runout
2019-05-27 16:32:22 +02:00
253087a4c5
Code cleanup
2019-05-27 16:18:21 +02:00
4d020d99f6
Code cleanup
2019-05-27 14:57:02 +02:00
51d6904dad
Multiply the step rate when grouping advance steps
2019-05-27 14:44:09 +02:00
f070a10904
edit
2019-05-27 10:10:24 +02:00
a742afcebd
Remove version check
2019-05-26 22:43:06 +02:00
4772532524
Allow Live-K to be used on stock 3.7.1 using a stub
2019-05-26 22:14:31 +02:00
47d2562510
Typos
2019-05-26 21:06:29 +02:00
823f7b069c
Fix filament sensor direction again
2019-05-26 21:06:22 +02:00
9d834925c0
Recalculate LA_phase correctly
2019-05-26 17:06:21 +02:00
3abb2188df
Fixup initial error by defect
2019-05-26 16:59:45 +02:00
ab478ec281
Save another 144b by avoiding a calc_timer copy
2019-05-26 16:42:03 +02:00
20694aeabc
Save 316 bytes by avoiding advance_spread copies
2019-05-26 16:41:56 +02:00
a28fb65bb2
Optimize advance_spread further
2019-05-26 16:41:50 +02:00
daa8007de5
Allow to exclude Live K from the build
2019-05-26 16:41:45 +02:00
6f6cef65b5
Revert "Correctly handle direction for the filament sensor"
...
This reverts commit aae03ad83e
2019-05-26 16:41:37 +02:00
bddc3e84ab
Use WRITE_NC directly in the isr
2019-05-25 21:52:06 +02:00
aae03ad83e
Correctly handle direction for the filament sensor
2019-05-25 21:51:59 +02:00
935a798236
Speedup advance_spread for common divisors
2019-05-25 21:51:52 +02:00
fa7ecfc38e
Check for serial roughtly in the middle of the stepper isr
2019-05-25 18:41:28 +02:00
0a26de1e7f
Allow to live-tune K during a print
2019-05-25 18:41:21 +02:00
55a2d588f1
PFW-828 printing in the air after power panic
2019-05-24 18:30:58 +02:00
69455bfc75
PFW-828 fix printing in the air after power panic
2019-05-24 18:28:16 +02:00
282b502393
Improve the distribution of the advance steps
2019-05-24 17:08:32 +02:00
294bf4068d
Improve debug messages
2019-05-24 17:08:32 +02:00
53b77bab36
Do not operate on the prev block when already in use
2019-05-24 17:08:32 +02:00
aae5cce28f
Use the nominal frequency to merge ticks
2019-05-24 17:08:32 +02:00
c6dbcc494f
Typo
2019-05-24 17:08:32 +02:00
942c38c18b
Minor reformatting
2019-05-24 17:08:32 +02:00
9586d71adb
Mention LA_DEBUG_LOGIC
2019-05-24 17:08:32 +02:00
a1be8b6784
Initialize current_adv_steps correctly
...
Initialize at 0 both on startup and on reset on regular (non-LA)
segments to avoid cumulating errors.
2019-05-24 17:08:32 +02:00
707849e6c4
Use a define instead of hard-coding a divider
2019-05-24 17:08:32 +02:00
a2fa8e5313
Rewrite the advance_isr scheduler
2019-05-24 17:08:32 +02:00
2d3fe3197c
Move calc_timer into speed_lookup_table for planner reuse
2019-05-24 17:08:32 +02:00
9425b6b07a
Planner: do not recalculate max_adv_steps, since it doesn't change
2019-05-24 17:08:32 +02:00
2c8e04bd5f
Planner: use the correct block when updating LA factors
2019-05-24 17:08:32 +02:00
3b528196dd
Fixup prefix echomagic for the LA config report
2019-05-24 17:08:32 +02:00
520cb491b2
Move speed lookup defs into a separate source
2019-05-24 17:08:32 +02:00
ebdc5e35e7
Remove two more OCR1A direct manipulations
...
Use _NEXT_ISR and st_reset_timer to correctly reinitialize and
re-schedule the advance ticks.
2019-05-24 17:08:32 +02:00
cbf1a85ec3
Switch original LA implementation with LA1.5
...
This discards several Prusa optimizations for LA1.0.
We'll re-implement those later if needed.
Debugging is turned on.
2019-05-24 17:08:32 +02:00
bf0c60dd45
Factor-out some repetition into fsensor_step
2019-05-24 17:08:32 +02:00
124540a06f
Adapt LA changes to ConfigurationStore
2019-05-24 17:08:32 +02:00
45563bfdd3
Formatting sanity
2019-05-24 17:08:32 +02:00
eeea2725cb
Partial LA15 support
2019-05-24 17:08:32 +02:00
098c0979ba
Merge pull request #1848 from MRprusa3d/PFW-853
...
recovery from "Stop()"
2019-05-24 09:54:07 +02:00
9cb0bc7bcf
Fix MINTEMP errors and fsensor runout
2019-05-24 08:46:44 +02:00
1399d7dcc8
support only for MK3/MK3S
2019-05-23 15:22:31 +02:00
df02030fe0
Merge pull request #1863 from DRracer/lcd20190523
...
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 14:31:51 +02:00
63235625ab
pause printer by flag
2019-05-23 13:13:11 +02:00
e17f3f8405
change language files accordingly
2019-05-23 11:14:26 +02:00
da98977de3
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 10:45:55 +02:00
a408f90659
recovery from "Stop()"
2019-05-18 21:28:59 +02:00
15ba17f110
Fix translator columns hint for Adjusting Z:
2019-05-16 17:30:15 +02:00
74d8c15b4f
Fix documentation.
2019-05-16 17:23:54 +02:00
dcfc6348ed
Fix documentation.
2019-05-16 17:22:47 +02:00
a453c6fc9d
Save 236B by improving functions in menu.cpp. Beware - the label now has
...
to come with a ':' as its last character. Changed language files along
with this commit too.
2019-05-16 16:43:44 +02:00
dad2065da6
Merge branch 'MK3' into rise_z
2019-05-15 16:37:17 +02:00
1f3877b221
Extract duplicate code into function. Saves 4B of flash.
2019-05-15 16:31:10 +02:00
fbc0c260b1
Merge pull request #1826 from ondratu/selftest_wizard
...
Selftest fan improvements
2019-05-15 13:43:48 +02:00
ebfc8c1c79
Fan autotest for swapping in Selftest
2019-05-15 10:10:46 +02:00
c851e158cc
Manual fan check menu have default (selected) option
2019-05-15 10:10:46 +02:00
1a78bd53ba
Fix compiler warning
...
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
2019-05-14 19:11:46 +02:00
91e72a79f0
Fix compiler warning
...
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
2019-05-14 19:07:50 +02:00
acfcd59369
Fix compiler warning:
...
sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)':
sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type]
2019-05-14 18:32:40 +02:00
89fc9e7f92
sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive]
...
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
2019-05-14 18:25:43 +02:00
66d20f0297
Fix code formatting (indentation).
2019-05-14 16:45:15 +02:00
4de93ca19c
Fix eject filament menu items numbering.
2019-05-14 16:43:33 +02:00
150787efbd
Generate menu item texts Cut filament <nr.> during runtime to conserve flash.
2019-05-14 16:25:29 +02:00
6495a8fa58
Decrease flash reserved for secondary language.
2019-05-14 16:10:04 +02:00
7c4f66181f
Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash.
2019-05-14 15:47:25 +02:00
dddc1b84e6
Merge pull request #1825 from prusa3d/MK3_3.7.1
...
Increase version 3.7.1 final.
2019-05-13 17:29:30 +02:00
efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500
...
Allow save of uStep resolution with M500
2019-05-13 17:08:34 +02:00
e93f043fee
Increase version 3.7.1 final.
2019-05-13 15:09:58 +02:00
bbd1b60229
Merge pull request #1437 from craiglink/memory-overrun
...
set array size correctly to 4
2019-05-11 03:01:52 +02:00
12b801fa1f
Merge pull request #1397 from jhoblitt/plumbing/sh-chmod
...
make all shell scripts executable
2019-05-11 02:37:09 +02:00
0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check
...
check if firmware is on right type of printer
2019-05-11 02:11:54 +02:00
176b28bc83
Merge pull request #1813 from prusa3d/MK3_3.7.1
...
Enable watchdog for all variants.
2019-05-10 17:33:44 +00:00
a9d6ae296b
Enable watchdog for all variants.
2019-05-10 16:30:08 +02:00
2a39fad400
Merge branch 'MK3' into bugfixes
2019-05-10 13:43:36 +00:00
084c6f2700
Merge pull request #1805 from DRracer/MK3
...
PFW-844
2019-05-10 13:41:59 +00:00
5707d4b85c
Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications.
2019-05-10 15:27:25 +02:00
dc4f30530d
Fix a number overflow to last line of LCD when doing large extruder in
...
menu Settings -> Move axis -> Extruder
2019-05-09 13:44:35 +02:00
714fb23de6
Merge remote-tracking branch 'upstream/MK3' into MK3
2019-05-09 13:40:28 +02:00
e7dd5c60d3
check if firmware is on right type of printer
2019-05-07 18:10:44 +02:00
8692565cf0
Merge pull request #1802 from XPila/MK3
...
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-07 15:13:02 +00:00
f431d24762
Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3
2019-05-07 16:17:14 +02:00
0124fbf9ee
Fix: display target extruder temperature on the main screen when doing
...
PID calibration
2019-05-07 16:15:42 +02:00
85806a0f38
variable bed pwm frequency fix (input value is 7bit, not 8bit)
2019-05-07 15:35:34 +02:00
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02:00
58683da2fb
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-06 18:07:42 +02:00
e56be687bb
Merge pull request #1800 from XPila/MK3
...
return with exitcode 1 if any language not generated properly
2019-05-06 15:58:34 +00:00
1a0370e1c7
Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P().
2019-05-06 17:39:00 +02:00
fa1bdd6ab1
Lang - decreased reserved space for secondary language (10496 bytes)
2019-05-06 17:29:47 +02:00
ffbdb43881
Remove commented code
2019-05-06 17:26:42 +02:00
41a827fa00
Removed unused texts, increased reserved space to 0x2e00 (11776 bytes)
2019-05-06 17:24:06 +02:00
0794430208
Fix for linearity correction not being stored to EEPROM when doing MENU-
...
UP
2019-05-06 15:33:13 +02:00
1c9d134c62
return with exitcode 1 if any language not generated properly
...
fix - include system_timer.h
2019-05-06 15:29:57 +02:00
e5911c42da
limit printed menu text to max 18 characters
2019-05-06 12:44:36 +02:00
3852aa4275
Different secondary language reserved space for MK3 and MK25
2019-04-30 12:42:18 +02:00
177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841
...
"stop" immediately after "pause" patch
2019-04-29 14:49:49 +00:00
8fadbf1b44
Do not call watchdog reset from updateTemperaturesFromRawValues().
2019-04-29 16:41:38 +02:00
b93f37ee02
"stop" immediately after "pause" patch
2019-04-29 14:39:19 +02:00
18dec75b56
MK2.5 - watchdog enabled + test (command "D-1")
2019-04-29 13:19:59 +02:00
f16bea26e5
raise the Z axis before filament loading to nozzle on MMU2S
2019-04-25 17:39:09 +02:00
238079fc95
Merge pull request #1763 from mkbel/save_flash_timer2
...
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-24 16:07:17 +02:00
e8e7fa907f
Change comment
2019-04-24 15:52:24 +02:00
1d8b2b3e18
Secondary language reserved space resized
2019-04-24 15:22:17 +02:00
f25f8f1b71
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-23 19:39:49 +02:00
ca449ef517
Merge pull request #1742 from XPila/MK3-bed_pwm_revert
...
Bed high frequency PWM disabled
2019-04-16 21:04:28 +00:00
75fac9dab2
Do not kill printer if External SPI flash W25X20CL is not responding.
...
Remove internationalization macro for this message. It has no sense to be translated as internationalization in most cases doesn't work if it is not responding.
Show this message instead of splash screen if the error is encountered.
There is no additional delay or wait for click, as such functions doesn't work in setup function.
2019-04-16 22:20:53 +02:00
1f9737b4a6
Bed high frequency PWM disabled
2019-04-16 16:48:01 +02:00
863c7158b2
use modification times for sdcard sort
2019-04-16 06:24:47 -04:00
7168c09eec
Merge pull request #1713 from mkbel/fix_octoprint_mmu_load_failed
...
Fix octoprint mmu load failed
2019-04-10 18:21:06 +02:00
b5f196406e
(preliminary) fix @ preHeatError II
2019-04-10 00:29:58 +02:00
0d3e3c506a
Merge remote-tracking branch 'prusa3d/MK3' into fix_octoprint_mmu_load_failed
2019-04-09 20:54:21 +02:00
c7d403733a
Allow load filament retry after button push unlimited times in case mmu_continue_loading() is in blocking mode.
2019-04-09 20:50:29 +02:00
32f3471862
print parameters checking
...
prusa_stat_diameter()
2019-04-09 15:22:08 +02:00
173062295f
Enable print fan while waiting for cooldown
2019-04-06 13:42:21 +03:00
84cabd3836
Change busy_state type, save 340B of flash
2019-04-05 15:20:34 +02:00
bf57a59147
Extract duplicate code into function. Saves 106B flash.
2019-04-05 15:12:35 +02:00
4bfa3d7e0b
Reporty busy: paused for user in case MMU is not responding.
2019-04-04 19:04:15 +02:00
bf1a55ab02
Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed.
...
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
2019-04-04 18:15:37 +02:00
aa0edd09f5
(preliminary) fix @ (bed) preHeatError
2019-04-03 22:48:58 +02:00
4b1fc69088
"disable_z()" for Delta PSU III
...
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
fd96bde69f
Merge pull request #1667 from mkbel/Add_IR_sensor_fail_message
...
Add ir sensor fail message
2019-04-02 14:55:27 +02:00
a8d8d9e4c9
version change
2019-04-01 20:52:24 +02:00
c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz."
2019-04-01 18:44:13 +02:00
469aa10097
Enable MMU cutter.
2019-03-29 07:27:29 +01:00
ae11c1e26f
rename function
2019-03-28 16:39:56 +01:00
97594c83bb
function misleading names changed
2019-03-28 14:58:58 +01:00
96a111119b
document
2019-03-28 14:52:50 +01:00
8f69d5a501
document
2019-03-28 14:48:35 +01:00
1dd486d86d
max length of menu item strings added
2019-03-28 13:18:28 +01:00
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
02faadf0b9
MMU mode renamed
2019-03-28 09:49:08 +01:00
e7900aeaa1
Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing
2019-03-28 08:08:54 +01:00
c1da07bda0
Merge pull request #1653 from XPila/MK3
...
Phase correct PWM for bed, frequency 40KHz.
2019-03-27 21:07:15 +01:00
e259967991
remove / comment debug code
2019-03-27 20:41:45 +01:00
5863297538
if deviation between current Z-probe and avg, value > 50um, enlarge Z-probe movements and repeat measurement
2019-03-27 20:25:00 +01:00
a9ce38df71
Function for decision if we have valid Z-calibration data in eeprom fixed, mesh bed leveling: possible crash fix, temporaty debug info on serial line.
2019-03-26 17:14:05 +01:00
17a534e42b
"disable_z()" for Delta PSU II
2019-03-25 23:28:25 +01:00
baeee5817e
Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash.
2019-03-22 00:24:22 +01:00
966e772702
Fix compile error for non TMC2130 endstops check.
2019-03-22 00:14:29 +01:00
89f1a3bacf
Fix compile error for non TMC2130 pulley check.
2019-03-22 00:11:02 +01:00
8582babddb
Fix compile error for manual fan check.
2019-03-22 00:08:44 +01:00
d1c5c03907
Fix compile error for manual fan check.
2019-03-22 00:03:14 +01:00
c45a7f8641
Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error.
2019-03-21 23:50:01 +01:00
91779a5d04
Add filament sensor false triggering message.
2019-03-21 23:36:59 +01:00
ba23b1b2c5
Remove unused.
2019-03-21 22:50:46 +01:00
6c28ed6349
Convert lcd_selftest_error() first parameter to enum class.
2019-03-21 22:48:57 +01:00
fbe68cb287
variables scope changed
2019-03-21 19:37:34 +01:00
576bfb17c7
whitespace
2019-03-21 18:51:54 +01:00
175f840d16
return statement not used (fixes Pronterface issues)
2019-03-21 18:46:07 +01:00
632781c4a2
"disable_z()" for Delta PSU
2019-03-21 00:45:15 +01:00
0f21ccee3c
Adding the microstepping resolution for all axis to the eprom config which is persisted during M500 for Mk3 and Mk3S
2019-03-19 21:39:59 +00:00
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
cfd185f315
Phase correct PWM for bed, frequency 40KHz.
2019-03-19 14:50:57 +01:00
4100bd33a7
Fix Dcodes compilation errors and warnings.
2019-03-19 13:53:58 +01:00
e37c2e0b2e
version change
2019-03-15 20:01:02 +01:00
7c5e9500a8
version change
2019-03-15 20:00:07 +01:00
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
...
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
0ca52216f3
Revert "variants update"
...
This reverts commit c3a95ab79b
2019-03-15 13:14:32 +01:00
ffe45bdef3
Disable mmu filament cutter feature.
2019-03-15 03:38:37 +01:00
80ef2686ae
mmu mode switching fix
2019-03-14 18:17:40 +01:00
6e26f61726
fixed 7x7 mesh bed leveling vs. Z calibration check
2019-03-14 14:48:01 +01:00
ef198856a4
increase relative movement in Z to work better with higher hysteresis PINDAs
2019-03-14 14:10:52 +01:00
9e0e4198c5
Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update
2019-03-14 01:52:44 +01:00
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
72f51989fa
compare measured Z-value during mesh bed leveling with Z-calibration value even for 7x7 mesh
2019-03-13 19:41:09 +01:00
32138ea09a
menu item alignment
2019-03-13 15:08:09 +01:00
6c70d59810
mbl settings initialization fix
2019-03-13 15:05:10 +01:00
c3a95ab79b
variants update
2019-03-12 11:57:35 +01:00
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749
...
SD card menu enhancement
2019-03-12 11:42:53 +01:00
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament
...
Fix change filament
2019-03-12 11:39:15 +01:00
0aa21c362e
compile error fix
2019-03-11 23:37:30 +01:00
9a83925a97
fixed bug in counting approximate Z coordinate
2019-03-11 23:13:55 +01:00
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
698f81abe0
fix compile error
2019-03-11 15:55:48 +01:00
819a91ab1e
switching stealth/normal mode for mmu in settings menu and tune menu
2019-03-11 12:33:22 +01:00
141b78c048
number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu
2019-03-10 16:03:46 +01:00
091934462d
menu correction
2019-03-08 20:06:30 +01:00
315959c13a
menu update
2019-03-08 20:03:23 +01:00
952e0e1e77
change min. nProbeRetry to 1
2019-03-08 19:49:10 +01:00
f293d61d3d
faster Z probe: move Z 150um relatively to last measurement. If PINDA is triggered at the beginning of measurement, move Z 500um higher and repeat measurement
2019-03-08 18:52:14 +01:00
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
DRracer
leptun
MRprusa3d
3d-gussner
Marek Bel
vintagepc
Yuri D'Elia
Marek Běl
XPila
rhounsell
Paul Bransford
MRprusa3d
Marek Kühn
Simon Benoit
Keith Spitz
NotaRobotexe
Renzo Dani
Renzo
KDanielK
Ondrej Tuma
PavelSindler
PavelSindler
Harpalyke