3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,282 Commits 3 Branches 78 Tags 40 MiB
6a13de1e6e
Commit Graph

953 Commits

Author SHA1 Message Date
Robert Pelnar
0ddb31d4eb Removed hexfile 2018-05-29 17:28:33 +02:00
Robert Pelnar
b47a29b388 New ML support - fixed invalid characters, added some cz translations 2018-05-29 15:56:00 +02:00
PavelSindler
d307868a90 merge with upstream 2018-05-28 20:38:55 +02:00
PavelSindler
26724c4a48 removed message 2018-05-28 20:31:57 +02:00
PavelSindler
7e79ce8e53 MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved 2018-05-28 20:26:15 +02:00
Robert Pelnar
b3f4e1f6e4 New ML support - language menu 2018-05-28 19:41:16 +02:00
Robert Pelnar
baa66a0887 New ML support - secondary language name, language selection 2018-05-28 17:14:55 +02:00
Robert Pelnar
3bf2552b6c fixed #761 from hzapper (#elif instead of #else if) 2018-05-28 13:41:36 +02:00
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
def9ab56f6 New ML support - language.c - fixed return origial string for zero length translation 2018-05-27 16:24:21 +02:00
Robert Pelnar
55157640c5 New ML support - czech version is working!!! 
postbuild.sh, make_lang.sh - fixed (id and offset calculation)
language.c, language.h - fixed (==||==)
config.h - reserved space for _SEC_LANG changed
Marlin_main.cpp - debug output + hardcoded lang_select(1) //means cz
 2018-05-27 15:14:04 +02:00
PavelSindler
2ffb95c72a bugfix: use absolute coordinates for steel sheet removal position, because there is no homing at the beginning of calibration in case that position is already known 2018-05-24 20:28:00 +02:00
PavelSindler
64f7272ea7 M27: returns print saved (fixes setting temperatures to zero during crash detection) 2018-05-24 18:49:35 +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
Robert Pelnar
da3432e237 New ML support - changed _SEC_LANG reserved space to 10kb, added debug code 2018-05-23 16:11:12 +02:00
Robert Pelnar
f00a9ce636 New ML support - language.c, language.h - code fixed, Marlin_main.cpp - debug output 2018-05-23 15:46:08 +02:00
Robert Pelnar
d979c3dffc New ML support - messages.c - some strings fixed 2018-05-23 14:18:37 +02:00
PavelSindler
0091b41fb5
Merge pull request #744 from PavelSindler/M860_fix 
M860 fix: send busy messages
 2018-05-23 13:15:46 +02:00
Robert Pelnar
7e3f675469 New ML support - migration - fixed some messages 
all variants verified according to lang_en.txt (release only)
config.h updated (enabled ML support)
 2018-05-22 20:30:55 +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
Robert Pelnar
8573b65b05 _MIN_ENDSTOP_INVERTING redefinition in variant files (constant -> define) 2018-05-21 23:28:28 +02:00
XPila
a184d2b824
Merge pull request #756 from XPila/MK3-new_lang 
Mk3 new lang
 2018-05-20 13:26:28 +02:00
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
Robert Pelnar
9b7eeaecaa version changed 2018-05-18 14:42:35 +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
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
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
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
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
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
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
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
PavelSindler
265d4761a3 M861: steps value for 35C 2018-04-27 17:07:10 +02:00
Robert Pelnar
e69134eb1c Rambo 1.0 support (MK25, MK2) 2018-04-27 17:04:55 +02:00
Marek Bel
eced66f0f6 Show full screen blocking notification message after heater turning off by safety timer. 2018-04-27 16:23:20 +02:00
PavelSindler
6fb0fa1458 variants for MK3: temporary change 2018-04-27 15:19:28 +02:00
PavelSindler
99be28d335 variants file: force selftest enabled again 2018-04-27 14:59:56 +02:00
PavelSindler
986f9fd3a6 selftest correction 2018-04-27 14:49:37 +02:00
PavelSindler
acd308e3d4 safety timer prolonged to 30 minutes 2018-04-27 14:03:09 +02:00
PavelSindler
ce855f30e2
Merge pull request #678 from PavelSindler/calibrate_autohome 
MK3 selftest: move Z axis higher before calibrating autohome
 2018-04-27 13:35:45 +02:00
PavelSindler
9e0e152279
Merge pull request #674 from mkbel/hot_fix_print_area_crop 
Hot fix print area crop on MK3.
 2018-04-27 13:35:31 +02:00
PavelSindler
254804cc8d MK3 selftest: move Z axis higher before calibrating autohome 2018-04-27 09:23:56 +02:00
Marek Bel
75075bed31 Hot fix print area crop on MK3. Move print area -2mm in Y axis (Y_PROBE_OFFSET_FROM_EXTRUDER to 3). Do not limit print area for skewed axis (increase Y_MAX_POS to 212.5). Preserve Z homing point for uncalibrated printer (DEFAULT_Y_OFFSET to 2.f). 2018-04-26 22:01:28 +02:00
XPila
aeca8cbf69
Merge pull request #671 from PavelSindler/temp_comp_unsigned 
M861 update: unsigned values
 2018-04-26 21:07:45 +02:00
PavelSindler
84d5771845
Merge pull request #670 from XPila/MK3-V3_2 
XYZcal - findpointcenter starting Z coordinate down by 50um
 2018-04-26 19:56:50 +02:00
PavelSindler
e7cf68e038 whitespace 2018-04-26 19:27:07 +02:00
PavelSindler
2dd0d84845 M861: usteps and z_shift variables correction 2018-04-26 19:14:28 +02:00
PavelSindler
9c3e0aab36 M861 update: use signed values 2018-04-26 18:55:08 +02:00
Robert Pelnar
d50dd9a6e9 XYZcal - findpointcenter starting Z coordinate down by 50um 2018-04-26 18:41: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
PavelSindler
2657d3febd MK25: SILENT_MODE_NORMAL changed to SILENT_MODE_POWER 2018-04-26 15:12:45 +02:00
PavelSindler
14cf4abb64
Merge pull request #668 from XPila/MK3-V3_2 
Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1)
 2018-04-26 14:53:49 +02:00
PavelSindler
84a53370d3 temporary change in MK3 variants file: disable forced selftest 2018-04-26 14:50:16 +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
PavelSindler
4681361883 correction in M27 message 2018-04-26 11:50:48 +02:00
PavelSindler
9a6cc8a035
Merge pull request #664 from MRprusa3d/MK3 
Mk3
 2018-04-25 22:20:45 +02:00
PavelSindler
cf0c83a6c1 M27 fix 2018-04-25 21:23:38 +02:00
MRprusa3d
7e462b3224
Merge branch 'MK3' into MK3 2018-04-25 19:15:36 +00:00
MRprusa3d
2f49574822
Add files via upload 2018-04-25 18:48:15 +00:00
MRprusa3d
0b6644915a
Add files via upload 2018-04-25 18:47:19 +00:00
PavelSindler
d85a8077a8 M115 update 2018-04-25 20:39:10 +02:00
PavelSindler
e7ad81e159
Merge pull request #660 from mkbel/fix_z_home_point 
Update documentation of mesh_bed_calibration.cpp.
 2018-04-25 17:27:22 +02:00
PavelSindler
d2736fdacf
Merge pull request #662 from mkbel/fix_return_autoload 
Return from Autoload filament and Load filament menu item to parent m…
 2018-04-25 17:26:56 +02: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
Robert Pelnar
0271ab3643 Meshbedleveling, calibration Z 
check crash Z (MK3)
 check deviation of Z-probe (>50um == error, all printers)
kill with message "debris on nozzle..."
 2018-04-25 16:19:16 +02:00
Robert Pelnar
5f12289339 CalibrationZ/MK3 - check crash Z after homeaxis (kill with message "debris on nozzle...") 2018-04-25 14:43:32 +02:00
Marek Bel
3abfeb831f Update documentation of mesh_bed_calibration.cpp. 2018-04-25 12:21:20 +02:00
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