Commit Graph

846 Commits

Author SHA1 Message Date
XPila 5bb9451b5d
Merge pull request #658 from XPila/MK3-V3_2
Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message…
2018-04-24 20:54:53 +02:00
Robert Pelnar 1553e99d8e Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message "debris on nozzle...") 2018-04-24 20:12:29 +02:00
PavelSindler 5a9cc39562
Merge pull request #654 from XPila/MK3-V3_2
New current setting for MK3
2018-04-24 17:10:19 +02:00
PavelSindler f9d64bdfb1
Merge pull request #655 from mkbel/fix_z_home_point
Fix z home point
2018-04-24 16:51:57 +02:00
XPila 79b9f736aa
Merge pull request #657 from PavelSindler/temp_cal_update
Temp calibration update
2018-04-24 15:16:13 +02:00
PavelSindler 8efe66ef99 remove tab 2018-04-24 14:34:49 +02:00
PavelSindler ffe93b2ca9 whitespace correction 2018-04-24 14:33:48 +02:00
PavelSindler cc74edfa13 whitespace 2018-04-24 14:23:52 +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
Marek Bel 468645e92e Set DEFAULT_Y_OFFSET to 4 mm for MK3 printer. 2018-04-23 20:34:04 +02:00
Marek Bel 37ebe5c35d Move default correction matrix of not calibrated printer to world2machine_default() function. Use world2machine_reset() to uncorrected matrix. Call it from world2machine_revert_to_uncorrected() and from world2machine_default() if there is no default shift to remove code duplication. 2018-04-23 20:33:39 +02:00
Marek Bel 9bd4d580d7 Use right calibration point. This change is only formal, as both original and new point have same coordinates. 2018-04-23 20:33:25 +02:00
Marek Bel cccd8246ab Fix world2machine(const float &x, const float &y, float &out_x, float &out_y) not using input parameters if only WORLD2MACHINE_CORRECTION_SHIFT is applied. 2018-04-23 20:33:14 +02:00
Robert Pelnar 864284f043 New current setting for MK3
X, Y: no change
Z: +26.1%
E: -28.5%
2018-04-23 20:17:45 +02:00
PavelSindler 2467b19dd2
Merge pull request #647 from XPila/MK3-V3_2
XYZ cal fix (better histogram processing)
2018-04-23 14:54:23 +02:00
Marek Bel 82b31e8552 Set [0;0] point offset for uncalibrated printer. 2018-04-20 15:01:11 +02:00
Robert Pelnar 65aa62ebab XYZ cal fix (better histogram processing) 2018-04-20 13:17:18 +02:00
PavelSindler 043c8c66be waiting for pinda probe cooling 2018-04-19 16:55:00 +02:00
Marek Bel 31ae097dba mesh bed leveling / auto home Y coordinates updated 2018-04-18 17:09:12 +02:00
PavelSindler 5791d9f0d8 EEPROM address conflict fix; forcing selftest can happen only in case that we have TMC2130 drivers 2018-04-18 14:17:28 +02:00
PavelSindler cf99808aef
Merge pull request #624 from mkbel/update_version
Update version.
2018-04-13 19:55:21 +02:00
Marek Bel af6c1f8acb Update version. 2018-04-13 19:53:51 +02:00
PavelSindler b90e8999df
Merge pull request #623 from mkbel/fix_safety_timer
Fix safety timer.
2018-04-13 19:43:36 +02:00
Marek Bel c88f0108af Fix safety timer.
Constant parameter greater than 16 bits must by stated as unsigned long.
2018-04-13 19:30:08 +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 f3209e1aec fixed possible feedmultiply change cause by entering main menu with negative encoder position 2018-04-13 10:27:55 +02:00
PavelSindler b1bb6841c9
Merge pull request #617 from mkbel/fix_farm_reset_1
Fix farm reset
2018-04-13 10:02:54 +02:00
PavelSindler 5f3fed33cf
Merge pull request #613 from MRprusa3d/MK3
Add files via upload
2018-04-13 10:02:44 +02:00
Marek Bel 388d6eea36 Fix printer resets in farm mode if command "PRUSA SN" is received and 32U2 processor is not responding. 2018-04-12 18:44:33 +02:00
Marek Bel 08740356b8 Move "PRUSA SN" gcode to separate function. 2018-04-12 18:41:11 +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 78245ce566
farm preheat temperature for heatbed 2018-04-11 18:54:27 +02: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
XPila 6b5835fd9f
Merge pull request #612 from PavelSindler/M861_gcode
M861 gcode, temp cal is automaticly activated after calibration process
2018-04-11 18:45:57 +02:00
PavelSindler 45d1dbbfe0 temp cal. active set to false 2018-04-11 18:37:07 +02:00
PavelSindler ce66699340 dont use default temp table for new printers and dont automaticly activate temp. cal. (new pinda probes have different characteristics) 2018-04-11 18:36:38 +02:00
PavelSindler 52de4891fe typo fixed 2018-04-11 18:32:27 +02:00
PavelSindler 47eab97d2d temp. calibration is automaticly activated after calibration process 2018-04-11 18:16:16 +02:00
PavelSindler 0ba7850146 pinda temp table changed back 2018-04-11 17:40:04 +02:00
XPila c69524c3fb
Merge pull request #611 from XPila/MK3-V3_2
removed Configuration_prusa.h
2018-04-11 17:33:37 +02:00
Robert Pelnar 89efcb84b1 removed Configuration_prusa.h
fixed - compilation for MK25
2018-04-11 17:32:31 +02:00
PavelSindler 919fba531a wait for PINDA gcode changed 2018-04-11 16:48:47 +02:00
MRprusa3d c8f1c55ec0
Add files via upload 2018-04-11 14:41:41 +00:00
PavelSindler f70685a92d
Merge pull request #542 from stahlfabrik/MK3_PINDA_TEMP_WAIT_GCODE
MK3 Add Gcode to wait for minimum PINDA temp
2018-04-11 16:40:21 +02:00
PavelSindler 1e1531a4f8
Merge pull request #608 from MRprusa3d/MK3
Mk3
2018-04-11 16:37:34 +02:00
Robert Pelnar 8da2330b93 FSensor PAT9125 - i2c ACK check + two attempts in init function (PFW).
ultralcd_implementation_hitachi - fixed link
2018-04-11 16:03:54 +02:00
MRprusa3d 716f1c63bf
Add files via upload 2018-04-10 18:08:57 +00:00
MRprusa3d 6b77e68924
Add files via upload 2018-04-10 18:07:08 +00:00
PavelSindler 02fda70529 farm mode: preheat menu updated 2018-04-10 14:07:44 +02:00
Robert Pelnar da43aa0250 XYZ calibration tunning 2018-04-04 20:03:39 +02:00
Robert Pelnar 3b26e1635a XYZcal - better filtering. 2018-04-03 20:10:50 +02:00
Robert Pelnar 630041ecb2 XYZcal - threshold changed from 32 to 16 2018-04-03 18:49:15 +02:00
Robert Pelnar 339d2ebdef Z-axis stealth mode
XYZcal fix
2018-04-03 18:26:39 +02:00
Robert Pelnar 869a99d8ad XYZ calibration - diagonal find_point_center 2018-04-03 15:05:57 +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
XPila dba2fd7e75
Merge pull request #589 from XPila/MK3-V3_2
New SPI, LiquidCrystal renamed
2018-03-29 18:20:29 +02:00
Robert Pelnar 363a9d24b3 LiquidCrystal class renamed to LiquidCrystal_Prusa 2018-03-29 17:50:43 +02:00
Robert Pelnar 186e630299 New SPI (do not use Arduino SPI class)
saved ~300bytes flash, 4bytes ram
2018-03-29 17:42:41 +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
Robert Pelnar bde097cad1 bugfix - PFW233 - first homing in silent mode Y crash. 2018-03-28 19:22: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
Robert Pelnar cf43b85de9 XYZ calibration - accuracy improvement 2018-03-27 17:27:41 +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 e5faba7226 serial port set back (was previously changed for debugging purposes) 2018-03-15 14:42:03 +01:00
PavelSindler 08ec920d33 merge with upstream 2018-03-15 14:25:17 +01:00
Marek Bel 3d299cc412 Document. 2018-03-14 21:05:47 +01:00
Robert Pelnar 4bc1671953 version=3.2.0-alpha buildnumber=370 repository=Unknown 2018-03-14 16:33:50 +01:00
Robert Pelnar 67e90b576a Disabled force selftest
XYZ calibration tunning
2018-03-14 16:25:32 +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 3ff5686336 MK2-25-3 variant files 2018-03-14 13:53:36 +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 c163d8a9f7 Variant file for MK3 2018-03-13 22:40:20 +01:00
Robert Pelnar 46cecb1bdf deleted unused file 2018-03-13 20:44:06 +01:00
Robert Pelnar ac1a56b493 Merge branch 'MK25' into MK3 2018-03-13 20:43:19 +01:00
PavelSindler 27cc5e51c3 removed duplicit declaration of prusa_statistics function 2018-03-13 19:12:36 +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 a3ad74a6be status screen fix 2018-03-13 19:08:19 +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
Robert Pelnar 16f9f35451 static_assert replaced with error directive 2018-03-13 16:47:38 +01:00
PavelSindler 0c97f46f25
Merge pull request #551 from XPila/MK3-new_xyz_cal
New XYZ calibration with image processing
2018-03-13 16:17:50 +01:00
XPila a23ac6db7d
Merge pull request #550 from mkbel/safety_timer_MK3
Safety timer (disable heaters after 15min idle)
2018-03-13 15:03:45 +01:00
XPila 701dc55f4e
Merge pull request #549 from mkbel/safety_timer
Safety timer (disable heaters after 15min idle)
2018-03-13 15:02:09 +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
Robert Pelnar 65a91b366d New XYZ calibration with image processing 2018-03-13 12:55:35 +01:00
Marek Bel 6b08cdeaf1 Safety timer (disable heaters after 15min idle) 2018-03-12 23:45:10 +01:00
Marek Bel 262e800db7 Safety timer (disable heaters after 15min idle) 2018-03-12 23:35:50 +01:00
Christoph Stahl 1df91e5656 MK3 Add Gcode to wait for minimum PINDA temp
The PINDA temperature compensation is defined for values above 35C. To achieve an optimal first layer consistently it is vital to start the print with a temperature of >= 35C on the pinda probe.
When doing a manual pinda temperature calibration it is necessary to begin homing and mesh bed leveling at an exact temperature. This gcode is perfect for this.

Example startup code:

G28 W ; home all without mesh bed level
G0 Z50 ; raise Z to not heat PINDA before bed is warm
M104 S215 ; set extruder temp
M140 S60 ; set bed temp
M190 S60 ; wait for bed temp
M109 S215 ; wait for extruder temp
G0 X50 Y50 Z0.15 ; this is a good PINDA heating position
M666 S35 ; the new code - wait until PINDA is >= 35C
G28 W ; home all without mesh bed level
G80 ; mesh bed leveling

See my forum post later for more explaination on my manual temperature calibration procedure. I will link it then.
2018-03-09 20:46:07 +01:00
Robert Pelnar 66dc65ecd4 version changed 2018-03-09 14:15:47 +01:00
PavelSindler d512c9c9c2 version changed 2018-03-08 14:48:01 +01:00
Robert Pelnar 976e5a6a19 Temperature calibration - remove steel 2018-03-07 21:45:55 +01:00
PavelSindler b902d91760 changed version 2018-03-07 21:02:07 +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
PavelSindler f41584524e
Merge pull request #534 from PavelSindler/M221_fix
Fix of a regression bug, caused by pre-calculating the extrudemultiply
2018-03-07 16:13:16 +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
Robert Pelnar e3967e444b SafetyTimer disabled
Watchdog disabled
watchdog.cpp and watchdog.h source code removed (using directly <avr/wdt.h>)
2018-03-07 14:13:34 +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
XPila 55065cf124
Merge pull request #530 from PavelSindler/temp_cal_fix
steps per unit changed to 0.95%; changed temp cal. warnings, changed …
2018-03-06 18:26:37 +01:00
PavelSindler c986ac14ec pinda thermistor pin changed 2018-03-06 18:09:25 +01:00
PavelSindler 27659ae69e steps per unit changed to 0.95%; changed temp cal. warnings, changed pin for PINDA probe 2018-03-06 16:48:39 +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
bubnikv 2b7e50e45b Fix of calculate_extrusion_multipliers().
This is a fix of a bug made in the previous commit.
2018-03-06 13:03:38 +01:00
PavelSindler 15e7b88834
Merge pull request #528 from bubnikv/M221_fix
Fix of calculate_extrusion_multipliers().
2018-03-06 13:00:57 +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
PavelSindler ee2de71d26 searching for point xy updated to be more reliable, max z error enlarged to speed up calibration 2018-03-06 11:51:31 +01:00
Marek Bel 67fd467ebe Add fail statistics menu item for MK25.
As there is only filament sensor and no crash and power interruption detection, squash everything into single screen.
2018-03-05 21:42:04 +01:00
bubnikv fc3af0533a Fix of calculate_extrusion_multipliers().
This is a fix of a bug made in the previous commit.
2018-03-05 21:31:31 +01:00
bubnikv a0bcfc7d95 Fix after merge (symbol calculate_volumetric_multipliers() renamed
to calculate_extruder_multipliers())
2018-03-05 19:28:57 +01:00