Commit Graph

345 Commits

Author SHA1 Message Date
XPila 28a767b460
Merge pull request #760 from PavelSindler/safety_timer_fixes
Safety timer not active during filament runout procedure
2018-05-28 13:28:24 +02:00
PavelSindler 58ae70c4e1
Merge branch 'MK3' into MK3-new_lang 2018-05-28 13:22:14 +02:00
Robert Pelnar 15207e4d5e Linearity correction fix - (eeprom storage changed to byte instead of word)
+enabled for XYZ axes
2018-05-28 01:47:08 +02:00
Robert Pelnar 2cf20c8c99 New ML support - migration - fix_source_1.sh script (replace 'MSG_xx' with '_T(MSG_xx)')
+ output + fixed source
2018-05-23 16:37:08 +02:00
PavelSindler 8c9b670c76
Merge pull request #746 from MRprusa3d/MK3
menu returns corrections
2018-05-22 16:08:08 +02:00
PavelSindler 137e1c5027 whitespace 2018-05-22 13:33:31 +02:00
PavelSindler d63a17c696 Safety timer not active during filament runout detection 2018-05-22 13:31:21 +02:00
Robert Pelnar bd587faab9 New ML support - migration - replaced source, removed original ML support files (backup) 2018-05-22 03:20:03 +02:00
PavelSindler 3eb21b65ed wizard fix: don't reset calibration status when repeating first layer cal. 2018-05-15 23:19:23 +02:00
MRprusa3d 83aa710da6 menu returns corrections
Settings::FilamentSensor & FilamentAutoload

removing Calibration::ShowEndStops @ MK3
2018-05-15 20:23:22 +02:00
Marek Bel b71a29ad96 Use ShortTimer instead of long_press_timer global variable. 2018-05-11 17:05:12 +02:00
Marek Bel 02ecd08786 Convert Time class to template, instantiate LongTimer for longer and ShortTimer for shorter periods. 2018-05-11 16:31:42 +02:00
Marek Bel 07a7ce1acf Remove unused lcd_ping_allert(). 2018-05-11 15:09:27 +02:00
Marek Bel e8730c2899 Merge branch 'MK3' into read_xyz_cal
# Conflicts:
#	Firmware/ultralcd.cpp
2018-05-10 18:31:31 +02:00
Marek Bel 329ea199ec Show measured bed offset from expected position even if not homed. Remove redundant lcd_quick_feedback() calls. 2018-05-10 18:24:49 +02:00
MRprusa3d 80efafd7b9 menu returns corrections
Statistics

Calibration::ShowEndStops

Support::ExtruderInfo
Support::BeltStatus
Support::Temperatures
Support::Voltages
2018-05-09 00:27:32 +02:00
Marek Bel 1d7b3ea2de Set calibration status to calibrated also by using live adjust Z.
This fixes problem, that if the first layer calibration is never done, live adjusting Z during printing is not applied after printer reset. Also repeatedly using live adjust Z on uncalibrated printer leads to steadily decreasing meaningless stored live adjust Z value.
2018-05-03 22:03:38 +02:00
PavelSindler cd3851e175
Merge pull request #715 from MRprusa3d/MK3
Mk3
2018-05-03 14:54:43 +02:00
MRprusa3d d02333918f MaR::180501 2018-05-02 22:13:47 +02:00
Marek Bel 72364648dd Hot fix: Can not move X and Y axis in stealth mode, when the printer is not homed.
Disable endstops in move axis menu.
2018-05-02 20:50:47 +02:00
PavelSindler 986f9fd3a6 selftest correction 2018-04-27 14:49:37 +02:00
PavelSindler 254804cc8d MK3 selftest: move Z axis higher before calibrating autohome 2018-04-27 09:23:56 +02:00
Marek Bel ab68221976 Always show XYZ cal. details menu. 2018-04-26 16:36:03 +02:00
Marek Bel 1a80fc28e8 Add zero point offset information support menu.
Note: XYZ menu is shown only if not printing and printer must me homed to show non-zero value.
2018-04-26 16:36:03 +02:00
Marek Bel b6888470cf Save 42 bytes of flash by removing duplicate string "--------------------". 2018-04-26 16:36:02 +02:00
Marek Bel c1dd269a92 Fix missing degree symbol after returning to status screen. Those lcd_set_custom_characters* calls were redundant. 2018-04-26 16:36:02 +02:00
Marek Bel d6aa149cfa Conserve 58 bytes of flash by returning by reference. 2018-04-26 16:36:02 +02:00
Marek Bel ae08788c99 Split lcd_service_mode_show_result screens to separate functions. Make them non blocking. Remove global array distance_from_min, pass it as function return value. Make Support submenus returning to Support menu. 2018-04-26 16:36:02 +02:00
Robert Pelnar f64d266c89 Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1) 2018-04-26 14:50:01 +02:00
MRprusa3d 7e462b3224
Merge branch 'MK3' into MK3 2018-04-25 19:15:36 +00:00
MRprusa3d 0b6644915a
Add files via upload 2018-04-25 18:47:19 +00:00
Marek Bel f207145752 Return from Autoload filament and Load filament menu item to parent menu.
Exception is Load filament, when temperature is sufficient to load filament, in such case, load filament is started and GUI returns to status screen.
2018-04-25 16:51:35 +02:00
PavelSindler 010ceceff9 add another homing after steel sheet is removed; added timeout for pinda cooling; if PINDA doesn't trigger before reaching Z = -1mm, temp. calibration fails 2018-04-24 13:43:51 +02:00
PavelSindler 043c8c66be waiting for pinda probe cooling 2018-04-19 16:55:00 +02:00
PavelSindler c5af3aaaf2
Merge pull request #622 from mkbel/fix_menu_return_fail_stats
Fix returning from Fail stats menu.
2018-04-13 18:35:03 +02:00
Marek Bel 6f985d23d6 Fix returning from Fail stats menu. 2018-04-13 17:20:30 +02:00
Marek Bel 03d03aeac4 Return to main menu from filament unloading. 2018-04-13 16:51:47 +02:00
mkbel e4a4c88be9
Merge pull request #615 from PavelSindler/selftest_MK25_fix
selftest for MK2.5: fan error fix
2018-04-13 13:59:15 +02:00
PavelSindler 5f3fed33cf
Merge pull request #613 from MRprusa3d/MK3
Add files via upload
2018-04-13 10:02:44 +02:00
PavelSindler 591cb881cc selftest: false fan error fix, added message in case that manual fan error fails 2018-04-12 18:24:30 +02:00
MRprusa3d d09f190c2b
Add files via upload 2018-04-11 18:48:50 +00:00
PavelSindler e150d502ac removed configuration_prusa 2018-04-11 18:49:42 +02:00
PavelSindler 53d903e600
Merge pull request #610 from MRprusa3d/MK3
Add files via upload
2018-04-11 18:46:18 +02:00
PavelSindler 52de4891fe typo fixed 2018-04-11 18:32:27 +02:00
MRprusa3d c8f1c55ec0
Add files via upload 2018-04-11 14:41:41 +00:00
PavelSindler 02fda70529 farm mode: preheat menu updated 2018-04-10 14:07:44 +02:00
Robert Pelnar 92997204a1 Linearity correction - TMC codes for calibration object, variable stored as uint8, range from 1.03 to 1.20 2018-04-03 12:30:35 +02:00
Robert Pelnar baade7db61 Removed unused files (ST7565R-dogm, digipot)
renamed functions digipot_init and digipot_current
fixed cond. trans. (menus)
fixed variant files - MK25, MK3
2018-03-29 23:01:13 +02:00
Marek Bel cedb30303f Add possible action on menu item back. This fixes broken Merge pull request #586 from mkbel/ustep_linearity_2 06d5ec5. 2018-03-29 11:42:44 +02:00
XPila d5636fd023
Merge pull request #585 from PavelSindler/farm_mode_MK3
checking if file is complete temporarily not active in farm mode
2018-03-28 19:39:00 +02:00
XPila 06d5ec5659
Merge pull request #586 from mkbel/ustep_linearity_2
Ustep linearity
2018-03-28 19:38:34 +02:00
XPila ffdd11e960
Merge pull request #587 from XPila/MK3-V3_2
Mk3 v3 2
2018-03-28 19:38:20 +02:00
Marek Bel 9cb036fbcb Merge remote-tracking branch 'prusa3d/MK3' into ustep_linearity_2 2018-03-28 19:11:02 +02:00
Marek Bel 40a064ffbc Add extruder linearity correction to settings menu. 2018-03-28 18:53:37 +02:00
PavelSindler 6e15a77c9b preheat menu update 2018-03-28 17:50:16 +02:00
PavelSindler 95e751dd65 farm mode: preheat menu update 2018-03-28 17:04:46 +02:00
PavelSindler 2c3c6c54f3 checking if file is complete temporarily not active in farm mode 2018-03-28 17:00:17 +02:00
Robert Pelnar 8ba83a9789 bugfix - PFW226 - selftest error 2018-03-28 16:13:54 +02:00
Marek Bel 678cd17e7b Increase size of EEPROM_TMC2130_WAVE_*_FAC to 16 bits. 2018-03-28 16:13:16 +02:00
Marek Bel 57bbb0e17d Fix wraparound from lowest value to highest value in menu value edit. 2018-03-26 20:25:23 +02:00
Marek Bel 397e7d4791 Increase resolution of wave factor. 2018-03-26 15:17:06 +02:00
XPila 903dce9716
Merge pull request #576 from PavelSindler/MK3_for_merging
stealth mode / silent mode
2018-03-23 20:42:08 +01:00
PavelSindler 2ce75293f3 stealth mode / silent mode 2018-03-23 19:49:59 +01:00
XPila 5a7e76e02b
Merge pull request #575 from PavelSindler/adc_pins
Adc pins, pinda temp table
2018-03-23 19:36:23 +01:00
PavelSindler dc32bd24fc correction 2018-03-23 18:20:55 +01:00
PavelSindler 2d30261976 bed voltage menu hidden 2018-03-23 16:49:06 +01:00
PavelSindler 7ad6fb526c typo removed 2018-03-23 15:53:44 +01:00
PavelSindler 78f9f6b611 use defines for adc pins, temp table for PIDNA update 2018-03-16 11:01:06 +01:00
PavelSindler 08ec920d33 merge with upstream 2018-03-15 14:25:17 +01:00
PavelSindler 863fe1f054 show message that printer is not connected to monitoring on printer start 2018-03-14 15:35:39 +01:00
Robert Pelnar 2f98ac989a Variant file for MK2 + cond. translation 2018-03-13 23:14:44 +01:00
Robert Pelnar 81cd96b8fe Variant file for MK25 + cond. translation 2018-03-13 23:02:46 +01:00
Robert Pelnar ac1a56b493 Merge branch 'MK25' into MK3 2018-03-13 20:43:19 +01:00
PavelSindler 5d389a2c36 Farm mode: when print finishes, ask which filament was used for print; statistics modified 2018-03-13 19:11:02 +01:00
PavelSindler 8ec3c0fd7e removed "Printer disconnected" message 2018-03-13 18:50:56 +01:00
PavelSindler f45f206faf sorting files disabled in farm mode, start printer status needs reponse from monitoring 2018-03-13 18:50:11 +01:00
PavelSindler ddeb7b8c84 statistics improved, initial version of function which forces user to connect printer to monitoring 2018-03-13 18:43:42 +01:00
XPila f487691070
Merge pull request #536 from mkbel/menu_return
Menu return
2018-03-13 14:30:48 +01:00
PavelSindler 98e96c9182
Merge pull request #457 from bubnikv/MK3_fast_dbg
Mk3 fast dbg
2018-03-13 14:13:29 +01:00
Marek Bel b41d680adf Replace problematic character in comment. 2018-03-07 20:58:15 +01:00
Marek Bel 8ff028820a Remove redundant parameter. 2018-03-07 20:55:01 +01:00
PavelSindler abb9aa0a16 not using homing currents in axis selftest 2018-03-07 20:42:15 +01:00
Marek Bel 2a53686d2f Document valid usage of lcd_goto_menu(), remove redundant parameter. 2018-03-07 20:40:59 +01:00
Marek Bel 1aba608133 Document valid usage of lcd_goto_menu(), wrap lcd_second_serial_set() by HAS_SECOND_SERIAL_PORT macro. 2018-03-07 18:30:33 +01:00
Marek Bel 0c961dedc4 Reset menu stack in lcd_return_to_status().
Mark menuStack.reset() as redundant in lcd_status_screen(), but leave it there to be sure.
2018-03-07 18:15:24 +01:00
Marek Bel 716098c434 Preserve position in menu move axis Extruder. 2018-03-07 17:27:27 +01:00
Marek Bel d0a98dc6cc Document valid usage of lcd_goto_menu(). 2018-03-07 17:18:10 +01:00
Marek Bel 0871925353 Remove special handling of lcd_move_z after long button press. Convert lcd_move_z after long button press to ordinary menu_action_submenu.
Known bug (feature) is, that with current maximum stack depth, when long press is activated in menu > settings > move axis > Move X and then Move Z is deactivated, menu is returned to "move axis" and not to "Move X".
2018-03-07 17:03:17 +01:00
Marek Bel 77c3d7d7f7 Review and document lcd_adjust_bed_reset() lcd_goto_menu() usage. 2018-03-07 16:47:20 +01:00
bubnikv 6ba07a358b Fix of a regression bug, caused by pre-calculating the extrudemultiply
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
2018-03-07 16:08:19 +01:00
PavelSindler 33a7723fba
Merge pull request #533 from bubnikv/M221_fix
Fix of a regression bug, caused by pre-calculating the extrudemultiply
2018-03-07 16:03:50 +01:00
bubnikv fb4230f80d Fix of a regression bug, caused by pre-calculating the extrudemultiply
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
2018-03-07 15:46:46 +01:00
Marek Bel b7df176a46 Preserve position in menu Live adjust Z. 2018-03-06 22:45:47 +01:00
Marek Bel ed0e7a8b58 Preserve position in menu move axis. 2018-03-06 21:27:06 +01:00
Marek Bel 020269a83c Fix unable to go back from main menu to status screen. 2018-03-06 21:26:14 +01:00
Marek Bel e551ed1f6e Replace lcd_goto_menu(...) by menu_action_back() in lcd_menu_fails_stats(); 2018-03-06 19:51:13 +01:00
Marek Bel 235803bc2a Move encoder stack to separate class MenuStack. Add menu record to MenuStack.
It was needed to add menuFunc_t menu to stack, as in some places in menu, it is impossible to hardcode parent menu. Example: lcd_babystep_z can be invoked both from main_menu() and settings_menu() depending on printer status.
2018-03-06 19:47:27 +01:00
Robert Pelnar a6f900fd3c Merge remote-tracking branch 'upstream/MK25' into MK25
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-03-06 15:11:50 +01:00
PavelSindler 54749cbcba
Merge pull request #524 from mkbel/Add_fail_stats
Add fail statistics menu item for MK25.
2018-03-06 11:55:22 +01:00
PavelSindler 115416dc60
Merge pull request #520 from mkbel/MK25
Remove Rpi port menu item for MK25.
2018-03-06 11:53:37 +01:00