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
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
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
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
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
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
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
0d22f8039e
Toggle FSENSOR and FSENSOR_AUTOLOAD
2019-08-19 11:58:16 +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
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
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
d9dec38815
Workaround for the "viper" situation bug.
2019-08-07 17:23:19 +02:00
33037d369c
Prevent LCD long-press re-entry ( fixes #1196 )
2019-08-05 19:00:29 +02:00
f1a947af2c
Whole hw settings hidden in farm mode
2019-08-05 10:40:21 +02:00
18b8dc89e5
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-08-04 17:06:34 +02:00
5f14e9c2e5
Removed sheet setting when in farm mode
2019-08-03 17:35:39 +02:00
bca0fd81eb
Fix loading filament 255 instead of 0 in first layer calibration wizard.
2019-07-30 19:15:33 +02:00
5fdaead663
Fix language related warnings in LANG_MODE 0
2019-07-29 15:55:42 +03:00
3ddb853bbd
Fix shifted languages. Use \n and \x0a
2019-07-26 18:53:08 +03:00
5021fadd5d
multiple sheets - menu switching bug
2019-07-24 11:20:27 +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
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
9c95f8c015
sheet menu
2019-07-19 18:34:46 +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
255db28684
merge unit test and upstream changes
2019-07-17 10:30:49 +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
034cbff10a
GUI updates
2019-07-16 20:10:49 +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
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
8fb30f886a
octoprint stop fix
2019-07-15 14:30:21 +02:00
a3fde091ab
More than 7.5KB saved by slight refactoring of printing to serial line
2019-07-12 10:10:56 +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
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
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
a1a8945bee
more code editing
2019-07-04 15:31:44 +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
a3a7f3106e
print parameters checking
2019-07-03 17:21:11 +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
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
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
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
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
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
6717590631
Merge branch 'MK3' into MK3_LA15
2019-06-13 15:39:50 +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
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
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
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
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
ebfad55617
Merge pull request #1888 from mkbel/always_cut_independent
...
Always cut independent
2019-05-31 07:00:37 +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
3b2cbc68d8
PFW-571 send PRN:4 instead PRN:1 while changing filament
2019-05-28 18:22:34 +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
daa8007de5
Allow to exclude Live K from the build
2019-05-26 16:41:45 +02:00
0a26de1e7f
Allow to live-tune K during a print
2019-05-25 18:41:21 +02:00
9cb0bc7bcf
Fix MINTEMP errors and fsensor runout
2019-05-24 08:46:44 +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
15ba17f110
Fix translator columns hint for Adjusting Z:
2019-05-16 17:30:15 +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
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
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
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
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
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
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02: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
ffbdb43881
Remove commented code
2019-05-06 17:26:42 +02:00
0794430208
Fix for linearity correction not being stored to EEPROM when doing MENU-
...
UP
2019-05-06 15:33:13 +02:00
b93f37ee02
"stop" immediately after "pause" patch
2019-04-29 14:39:19 +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
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
ae11c1e26f
rename function
2019-03-28 16:39:56 +01:00
97594c83bb
function misleading names changed
2019-03-28 14:58:58 +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
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
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
...
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
ffe45bdef3
Disable mmu filament cutter feature.
2019-03-15 03:38:37 +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
32138ea09a
menu item alignment
2019-03-13 15:08:09 +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
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
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
2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
...
Fix compiler warning
2019-03-06 19:55:18 +01:00
6217329d50
SD card menu enhancement
2019-03-06 19:51:26 +01:00
101453b674
mbl submenu
2019-03-06 13:27:31 +01:00
1eab058ad4
Fix uninitialized variable used.
2019-03-05 18:08:35 +01:00
7fcecabd5f
Fix compiler warning: variable 'previous_millis_cmd' set but not used
2019-03-05 18:04:58 +01:00
484259cbb2
Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used
2019-03-05 18:00:16 +01:00
f1031d2302
new farm statuses for pause (14) and wait for user (15)
2019-03-05 16:00:50 +01:00
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
1051b7c39f
Merge pull request #1583 from mkbel/fix_cut
...
Fix unable to cut filament, if nozzle is already preheated.
2019-03-04 15:29:54 +01:00
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
9e38b1e101
Add missing message "Preheating to cut".
2019-03-01 18:17:08 +01:00
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
83e07b5cdf
Fix compiler warnings:
...
sketch/ultralcd.cpp: In function 'void mFilamentPrompt()':
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)':
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
2019-03-01 18:07:19 +01:00
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
22217a42f7
message change
2019-02-06 21:37:39 +01:00
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
5324181bf7
maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself
2019-02-03 20:56:14 +01:00
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
eea755496b
Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.
...
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
2019-01-27 22:48:51 +01:00
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
1c4f3259ea
Increase heater check minimum expected temperature rises.
...
Bed increased from 3 to 10 K.
Nozzle increased from 10 to 30 K.
Measured rises with my MK3 printer:
Bed 26K,
Nozzle 73K.
2019-01-24 21:02:04 +01:00
305598d7f6
Fix bed / nozzle test order and progress bar.
...
Known limitation:
Z progress shown in bed progress.
2019-01-24 20:03:37 +01:00
22859800f0
Rearrange tests. Move hot end test to the end, to spare time in IR sensor test.
...
Known problems, hot end and bed is swapped. Bed progress indicator is painted to X axis test.
2019-01-24 19:22:36 +01:00
b2b65475df
SD card menu
...
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +01:00
e0c1e4a02d
version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus
2019-01-24 01:12:30 +01:00
1d71c1a5d1
Update IR sensor selftest progress bar more frequently.
2019-01-22 19:02:42 +01:00
97a4623800
Fix lcd_selftest_screen for small _progress_scale.
2019-01-22 19:01:55 +01:00
9cda0b69b8
Update IR sensor selftest progress bar.
2019-01-22 18:23:00 +01:00
3ff8a7c740
Unload filament by MMU unit in selftest_irsensor().
...
Known limitation:
If filament was not loaded to nozzle it is sticked completely out of MMU. To be fixed in MMU, as this problem can be reproduced also from printer menu - unload filament.
2019-01-22 14:54:06 +01:00
c371a5ea65
Document.
2019-01-22 14:05:08 +01:00
a92d9c782b
Add IR sensor test.
2019-01-22 11:29:55 +01:00
Marek Bel
leptun
Marek Běl
DRracer
3d-gussner
Yuri D'Elia
Marek Kühn
NotaRobotexe
MRprusa3d
MRprusa3d
Renzo Dani
Renzo
Ondrej Tuma
PavelSindler
PavelSindler
Robert Pelnar