Commit Graph

2281 Commits

Author SHA1 Message Date
Robert Pelnar
a528f8837c Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-05-20 13:24:52 +02:00
Robert Pelnar
5b015907aa New localization - macro declarations fixed 2018-05-20 13:15:46 +02:00
XPila
92cb1dc3db
Merge pull request #750 from XPila/MK3
version changed
2018-05-18 14:44:28 +02:00
Robert Pelnar
9b7eeaecaa version changed 2018-05-18 14:42:35 +02:00
XPila
7a6d2bcf30
Merge pull request #748 from mkbel/fix_build_MK2
Fix build of MK2. Global variable distance_from_min was removed, do n…
2018-05-18 14:08:42 +02:00
Marek Bel
503d5551e6 Fix build of MK2. Global variable distance_from_min was removed, do not update it.
Expression
float y = vec_x[1] * pgm_read_float(bed_ref_points_4+mesh_point*2) + vec_y[1] * pgm_read_float(bed_ref_points_4+mesh_point*2+1) + cntr[1];
is identical with expression in count_xyz_details().
2018-05-16 18:40:36 +02:00
XPila
f73e5d5c2e
Merge pull request #747 from PavelSindler/first_cal_redo
wizard fix: don't reset cal. status when repeating first layer calibration
2018-05-16 13:19:57 +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
PavelSindler
c59e9bd6be M860 fix: send busy messages 2018-05-15 18:27:25 +02:00
PavelSindler
553779a65d
Merge pull request #723 from mkbel/refactor_bed_geometry
Refactor bed geometry
2018-05-14 17:18:03 +02:00
PavelSindler
6e451c2780
Merge pull request #663 from mkbel/read_xyz_cal
Read xyz cal
2018-05-14 17:17:18 +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
PavelSindler
dd89226537
Merge pull request #722 from MRprusa3d/MK3
build instructions update
2018-05-10 14:44:55 +02:00
PavelSindler
1e9553a118
Merge pull request #724 from PavelSindler/MK3_for_merging
version changed
2018-05-09 18:59:15 +02:00
PavelSindler
2bfc7475a8 version changed 2018-05-09 18:58:24 +02:00
Marek Bel
2a5a7ab9d2 Add bed calibration points macro definitions to MK25 variants.
Homing and full print area printing tested on MK25.
2018-05-09 17:09:57 +02:00
Robert Pelnar
59f3f9d8ec New localization - includes fixed 2018-05-09 16:55:41 +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
MRprusa3d
b889d770a5 build instructions update
Czech version added
2018-05-08 23:10:07 +02:00
Marek Bel
f00bde09a4 Re-factor bed calibration point coordinates to match bed CAD data. Tested successfully on MK3 (auto home position not calibrated and calibrated printer and print area position of calibrated printer). MK25 not tested. 2018-05-08 21:54:11 +02:00
PavelSindler
737cb9608c
Merge pull request #716 from mkbel/calibrate_Z_via_live_adjust
Set calibration status to calibrated also by using live adjust Z.
2018-05-04 16:40:34 +02:00
PavelSindler
0619831fca
Merge pull request #717 from mkbel/fix_pause_bed_cooling
Do not disable bed heating, when the print is paused.
2018-05-04 16:21:25 +02:00
Marek Bel
c359d11858 Do not disable bed heating, when the print is paused.
Also remove duplicate handleSafetyTimer() call.
2018-05-04 15:21:22 +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
777beac66a
Merge pull request #713 from PavelSindler/fan_error_fix
fan error synchronization with planner
2018-05-03 16:01:00 +02:00
PavelSindler
cd3851e175
Merge pull request #715 from MRprusa3d/MK3
Mk3
2018-05-03 14:54:43 +02:00
PavelSindler
d39343f92d
Merge pull request #714 from mkbel/hot_fix_move_axis
Hot fix: Can not move X and Y axis in stealth mode, when the printer …
2018-05-03 13:42:54 +02:00
MRprusa3d
8a92d9b6a3 MaR::180501b 2018-05-02 23:49:21 +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
d86d1beeaa fan error synchronization with planner 2018-05-02 16:16:48 +02:00
XPila
3d595cc523
Merge pull request #712 from XPila/MK3-V3_2
Mk3 v3 2
2018-05-02 13:43:07 +02:00
Robert Pelnar
964d019dd1 MK3 - extruder current = 30 2018-05-02 13:42:05 +02:00
XPila
5d8697bdb4
Merge pull request #702 from PavelSindler/temperature_cal_fix
terminate temperature calibration
2018-05-02 13:40:55 +02:00
Robert Pelnar
65a9827fd1 Merge remote-tracking branch 'upstream/MK3' into MK3-V3_2 2018-05-02 13:34:22 +02:00
PavelSindler
420d1079af terminate temperature calibration in case that Z probing function returns false 2018-04-30 17:51:44 +02:00
PavelSindler
b691225d0b
Merge pull request #701 from XPila/MK3-V3_2
Decreased stallguard sensitivity for Z axis because meshbedleveling f…
2018-04-30 16:58:18 +02:00
Robert Pelnar
1fc3f9816c Merge remote-tracking branch 'upstream/MK3' into MK3-V3_2 2018-04-30 16:29:02 +02:00
Robert Pelnar
47868145e6 Decreased stallguard sensitivity for Z axis because meshbedleveling failed on some printers (PFW298). 2018-04-30 16:28:26 +02:00
PavelSindler
e2b3553aee
Merge pull request #689 from PavelSindler/MK3_for_merging
version change
2018-04-27 20:01:37 +02:00
PavelSindler
e1b95ed2a7 version change 2018-04-27 19:59:22 +02:00
PavelSindler
12dda6a6ca
Merge pull request #688 from PavelSindler/MK3_for_merging
MK3 variants file change
2018-04-27 18:41:49 +02:00
PavelSindler
068ee08454 MK3 variants file change 2018-04-27 18:41:00 +02:00
PavelSindler
2a57325bd5
Merge pull request #685 from mkbel/add_safety_timer_notice
Show full screen blocking notification message after heater turned off
2018-04-27 17:24:33 +02:00
PavelSindler
2b42db8ace
Merge pull request #687 from PavelSindler/MK3_for_merging
M861: steps value for 35C
2018-04-27 17:24:18 +02:00