Marek Bel
dcfc6348ed
Fix documentation.
2019-05-16 17:22:47 +02:00
DRracer
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
Marek Bel
dad2065da6
Merge branch 'MK3' into rise_z
2019-05-15 16:37:17 +02:00
Marek Bel
1f3877b221
Extract duplicate code into function. Saves 4B of flash.
2019-05-15 16:31:10 +02:00
Marek Běl
fbc0c260b1
Merge pull request #1826 from ondratu/selftest_wizard
...
Selftest fan improvements
2019-05-15 13:43:48 +02:00
Ondrej Tuma
ebfc8c1c79
Fan autotest for swapping in Selftest
2019-05-15 10:10:46 +02:00
Ondrej Tuma
c851e158cc
Manual fan check menu have default (selected) option
2019-05-15 10:10:46 +02:00
Marek Bel
1a78bd53ba
Fix compiler warning
...
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
2019-05-14 19:11:46 +02:00
Marek Bel
91e72a79f0
Fix compiler warning
...
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
2019-05-14 19:07:50 +02:00
Marek Bel
acfcd59369
Fix compiler warning:
...
sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)':
sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type]
2019-05-14 18:32:40 +02:00
Marek Bel
89fc9e7f92
sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive]
...
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
2019-05-14 18:25:43 +02:00
Marek Bel
66d20f0297
Fix code formatting (indentation).
2019-05-14 16:45:15 +02:00
Marek Bel
4de93ca19c
Fix eject filament menu items numbering.
2019-05-14 16:43:33 +02:00
Marek Bel
150787efbd
Generate menu item texts Cut filament <nr.> during runtime to conserve flash.
2019-05-14 16:25:29 +02:00
Marek Bel
6495a8fa58
Decrease flash reserved for secondary language.
2019-05-14 16:10:04 +02:00
Marek Bel
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
Marek Běl
dddc1b84e6
Merge pull request #1825 from prusa3d/MK3_3.7.1
...
Increase version 3.7.1 final.
2019-05-13 17:29:30 +02:00
Marek Běl
efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500
...
Allow save of uStep resolution with M500
2019-05-13 17:08:34 +02:00
Marek Bel
e93f043fee
Increase version 3.7.1 final.
2019-05-13 15:09:58 +02:00
Marek Běl
bbd1b60229
Merge pull request #1437 from craiglink/memory-overrun
...
set array size correctly to 4
2019-05-11 03:01:52 +02:00
Marek Běl
12b801fa1f
Merge pull request #1397 from jhoblitt/plumbing/sh-chmod
...
make all shell scripts executable
2019-05-11 02:37:09 +02:00
Marek Běl
0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check
...
check if firmware is on right type of printer
2019-05-11 02:11:54 +02:00
Marek Běl
176b28bc83
Merge pull request #1813 from prusa3d/MK3_3.7.1
...
Enable watchdog for all variants.
2019-05-10 17:33:44 +00:00
Marek Bel
a9d6ae296b
Enable watchdog for all variants.
2019-05-10 16:30:08 +02:00
Marek Běl
2a39fad400
Merge branch 'MK3' into bugfixes
2019-05-10 13:43:36 +00:00
Marek Běl
084c6f2700
Merge pull request #1805 from DRracer/MK3
...
PFW-844
2019-05-10 13:41:59 +00:00
Marek Bel
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
DRracer
dc4f30530d
Fix a number overflow to last line of LCD when doing large extruder in
...
menu Settings -> Move axis -> Extruder
2019-05-09 13:44:35 +02:00
DRracer
714fb23de6
Merge remote-tracking branch 'upstream/MK3' into MK3
2019-05-09 13:40:28 +02:00
NotaRobotexe
e7dd5c60d3
check if firmware is on right type of printer
2019-05-07 18:10:44 +02:00
Marek Běl
8692565cf0
Merge pull request #1802 from XPila/MK3
...
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-07 15:13:02 +00:00
DRracer
f431d24762
Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3
2019-05-07 16:17:14 +02:00
DRracer
0124fbf9ee
Fix: display target extruder temperature on the main screen when doing
...
PID calibration
2019-05-07 16:15:42 +02:00
Robert Pelnar
85806a0f38
variable bed pwm frequency fix (input value is 7bit, not 8bit)
2019-05-07 15:35:34 +02:00
Ondrej Tuma
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02:00
Robert Pelnar
58683da2fb
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-06 18:07:42 +02:00
Marek Běl
e56be687bb
Merge pull request #1800 from XPila/MK3
...
return with exitcode 1 if any language not generated properly
2019-05-06 15:58:34 +00:00
Marek Bel
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
Robert Pelnar
fa1bdd6ab1
Lang - decreased reserved space for secondary language (10496 bytes)
2019-05-06 17:29:47 +02:00
DRracer
ffbdb43881
Remove commented code
2019-05-06 17:26:42 +02:00
Robert Pelnar
41a827fa00
Removed unused texts, increased reserved space to 0x2e00 (11776 bytes)
2019-05-06 17:24:06 +02:00
DRracer
0794430208
Fix for linearity correction not being stored to EEPROM when doing MENU-
...
UP
2019-05-06 15:33:13 +02:00
Robert Pelnar
1c9d134c62
return with exitcode 1 if any language not generated properly
...
fix - include system_timer.h
2019-05-06 15:29:57 +02:00
DRracer
e5911c42da
limit printed menu text to max 18 characters
2019-05-06 12:44:36 +02:00
Robert Pelnar
3852aa4275
Different secondary language reserved space for MK3 and MK25
2019-04-30 12:42:18 +02:00
Marek Běl
177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841
...
"stop" immediately after "pause" patch
2019-04-29 14:49:49 +00:00
Marek Bel
8fadbf1b44
Do not call watchdog reset from updateTemperaturesFromRawValues().
2019-04-29 16:41:38 +02:00
MRprusa3d
b93f37ee02
"stop" immediately after "pause" patch
2019-04-29 14:39:19 +02:00
Robert Pelnar
18dec75b56
MK2.5 - watchdog enabled + test (command "D-1")
2019-04-29 13:19:59 +02:00
NotaRobotexe
f16bea26e5
raise the Z axis before filament loading to nozzle on MMU2S
2019-04-25 17:39:09 +02:00
XPila
238079fc95
Merge pull request #1763 from mkbel/save_flash_timer2
...
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-24 16:07:17 +02:00
mkbel
e8e7fa907f
Change comment
2019-04-24 15:52:24 +02:00
Robert Pelnar
1d8b2b3e18
Secondary language reserved space resized
2019-04-24 15:22:17 +02:00
Marek Bel
f25f8f1b71
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-23 19:39:49 +02:00
mkbel
ca449ef517
Merge pull request #1742 from XPila/MK3-bed_pwm_revert
...
Bed high frequency PWM disabled
2019-04-16 21:04:28 +00:00
Marek Bel
75fac9dab2
Do not kill printer if External SPI flash W25X20CL is not responding.
...
Remove internationalization macro for this message. It has no sense to be translated as internationalization in most cases doesn't work if it is not responding.
Show this message instead of splash screen if the error is encountered.
There is no additional delay or wait for click, as such functions doesn't work in setup function.
2019-04-16 22:20:53 +02:00
Robert Pelnar
1f9737b4a6
Bed high frequency PWM disabled
2019-04-16 16:48:01 +02:00
Paul Bransford
863c7158b2
use modification times for sdcard sort
2019-04-16 06:24:47 -04:00
PavelSindler
7168c09eec
Merge pull request #1713 from mkbel/fix_octoprint_mmu_load_failed
...
Fix octoprint mmu load failed
2019-04-10 18:21:06 +02:00
MRprusa3d
b5f196406e
(preliminary) fix @ preHeatError II
2019-04-10 00:29:58 +02:00
Marek Bel
0d3e3c506a
Merge remote-tracking branch 'prusa3d/MK3' into fix_octoprint_mmu_load_failed
2019-04-09 20:54:21 +02:00
Marek Bel
c7d403733a
Allow load filament retry after button push unlimited times in case mmu_continue_loading() is in blocking mode.
2019-04-09 20:50:29 +02:00
MRprusa3d
32f3471862
print parameters checking
...
prusa_stat_diameter()
2019-04-09 15:22:08 +02:00
Voinea
173062295f
Enable print fan while waiting for cooldown
2019-04-06 13:42:21 +03:00
Marek Bel
84cabd3836
Change busy_state type, save 340B of flash
2019-04-05 15:20:34 +02:00
Marek Bel
bf57a59147
Extract duplicate code into function. Saves 106B flash.
2019-04-05 15:12:35 +02:00
Marek Bel
4bfa3d7e0b
Reporty busy: paused for user in case MMU is not responding.
2019-04-04 19:04:15 +02:00
Marek Bel
bf1a55ab02
Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed.
...
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
2019-04-04 18:15:37 +02:00
MRprusa3d
aa0edd09f5
(preliminary) fix @ (bed) preHeatError
2019-04-03 22:48:58 +02:00
MRprusa3d
4b1fc69088
"disable_z()" for Delta PSU III
...
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
PavelSindler
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
PavelSindler
a8d8d9e4c9
version change
2019-04-01 20:52:24 +02:00
PavelSindler
c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz."
2019-04-01 18:44:13 +02:00
Marek Bel
469aa10097
Enable MMU cutter.
2019-03-29 07:27:29 +01:00
PavelSindler
ae11c1e26f
rename function
2019-03-28 16:39:56 +01:00
PavelSindler
97594c83bb
function misleading names changed
2019-03-28 14:58:58 +01:00
PavelSindler
96a111119b
document
2019-03-28 14:52:50 +01:00
PavelSindler
8f69d5a501
document
2019-03-28 14:48:35 +01:00
PavelSindler
1dd486d86d
max length of menu item strings added
2019-03-28 13:18:28 +01:00
PavelSindler
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
PavelSindler
02faadf0b9
MMU mode renamed
2019-03-28 09:49:08 +01:00
PavelSindler
e7900aeaa1
Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing
2019-03-28 08:08:54 +01:00
PavelSindler
c1da07bda0
Merge pull request #1653 from XPila/MK3
...
Phase correct PWM for bed, frequency 40KHz.
2019-03-27 21:07:15 +01:00
PavelSindler
e259967991
remove / comment debug code
2019-03-27 20:41:45 +01:00
PavelSindler
5863297538
if deviation between current Z-probe and avg, value > 50um, enlarge Z-probe movements and repeat measurement
2019-03-27 20:25:00 +01:00
PavelSindler
a9ce38df71
Function for decision if we have valid Z-calibration data in eeprom fixed, mesh bed leveling: possible crash fix, temporaty debug info on serial line.
2019-03-26 17:14:05 +01:00
MRprusa3d
17a534e42b
"disable_z()" for Delta PSU II
2019-03-25 23:28:25 +01:00
Marek Bel
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
Marek Bel
966e772702
Fix compile error for non TMC2130 endstops check.
2019-03-22 00:14:29 +01:00
Marek Bel
89f1a3bacf
Fix compile error for non TMC2130 pulley check.
2019-03-22 00:11:02 +01:00
Marek Bel
8582babddb
Fix compile error for manual fan check.
2019-03-22 00:08:44 +01:00
Marek Bel
d1c5c03907
Fix compile error for manual fan check.
2019-03-22 00:03:14 +01:00
Marek Bel
c45a7f8641
Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error.
2019-03-21 23:50:01 +01:00
Marek Bel
91779a5d04
Add filament sensor false triggering message.
2019-03-21 23:36:59 +01:00
Marek Bel
ba23b1b2c5
Remove unused.
2019-03-21 22:50:46 +01:00
Marek Bel
6c28ed6349
Convert lcd_selftest_error() first parameter to enum class.
2019-03-21 22:48:57 +01:00
PavelSindler
fbe68cb287
variables scope changed
2019-03-21 19:37:34 +01:00
PavelSindler
576bfb17c7
whitespace
2019-03-21 18:51:54 +01:00
PavelSindler
175f840d16
return statement not used (fixes Pronterface issues)
2019-03-21 18:46:07 +01:00
MRprusa3d
632781c4a2
"disable_z()" for Delta PSU
2019-03-21 00:45:15 +01:00
Harpalyke
0f21ccee3c
Adding the microstepping resolution for all axis to the eprom config which is persisted during M500 for Mk3 and Mk3S
2019-03-19 21:39:59 +00:00
MRprusa3d
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
Robert Pelnar
cfd185f315
Phase correct PWM for bed, frequency 40KHz.
2019-03-19 14:50:57 +01:00
Marek Bel
4100bd33a7
Fix Dcodes compilation errors and warnings.
2019-03-19 13:53:58 +01:00
PavelSindler
e37c2e0b2e
version change
2019-03-15 20:01:02 +01:00
PavelSindler
7c5e9500a8
version change
2019-03-15 20:00:07 +01:00
PavelSindler
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
...
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
PavelSindler
0ca52216f3
Revert "variants update"
...
This reverts commit c3a95ab79b .
2019-03-15 13:14:32 +01:00
Marek Bel
ffe45bdef3
Disable mmu filament cutter feature.
2019-03-15 03:38:37 +01:00
PavelSindler
80ef2686ae
mmu mode switching fix
2019-03-14 18:17:40 +01:00
PavelSindler
6e26f61726
fixed 7x7 mesh bed leveling vs. Z calibration check
2019-03-14 14:48:01 +01:00
PavelSindler
ef198856a4
increase relative movement in Z to work better with higher hysteresis PINDAs
2019-03-14 14:10:52 +01:00
PavelSindler
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
MRprusa3d
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
PavelSindler
72f51989fa
compare measured Z-value during mesh bed leveling with Z-calibration value even for 7x7 mesh
2019-03-13 19:41:09 +01:00
PavelSindler
32138ea09a
menu item alignment
2019-03-13 15:08:09 +01:00
PavelSindler
6c70d59810
mbl settings initialization fix
2019-03-13 15:05:10 +01:00
PavelSindler
c3a95ab79b
variants update
2019-03-12 11:57:35 +01:00
PavelSindler
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
PavelSindler
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
PavelSindler
c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749
...
SD card menu enhancement
2019-03-12 11:42:53 +01:00
PavelSindler
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
PavelSindler
4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament
...
Fix change filament
2019-03-12 11:39:15 +01:00
PavelSindler
0aa21c362e
compile error fix
2019-03-11 23:37:30 +01:00
PavelSindler
9a83925a97
fixed bug in counting approximate Z coordinate
2019-03-11 23:13:55 +01:00
MRprusa3d
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
PavelSindler
698f81abe0
fix compile error
2019-03-11 15:55:48 +01:00
PavelSindler
819a91ab1e
switching stealth/normal mode for mmu in settings menu and tune menu
2019-03-11 12:33:22 +01:00
PavelSindler
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
PavelSindler
091934462d
menu correction
2019-03-08 20:06:30 +01:00
PavelSindler
315959c13a
menu update
2019-03-08 20:03:23 +01:00
PavelSindler
952e0e1e77
change min. nProbeRetry to 1
2019-03-08 19:49:10 +01:00
PavelSindler
f293d61d3d
faster Z probe: move Z 150um relatively to last measurement. If PINDA is triggered at the beginning of measurement, move Z 500um higher and repeat measurement
2019-03-08 18:52:14 +01:00
PavelSindler
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
PavelSindler
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
PavelSindler
dccb6ca2c6
Merge remote-tracking branch 'upstream/MK3' into bed_analysis_gcodes2
2019-03-06 19:56:52 +01:00
PavelSindler
f0cc313fed
debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified
2019-03-06 19:56:48 +01:00
PavelSindler
2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
...
Fix compiler warning
2019-03-06 19:55:18 +01:00
MRprusa3d
6217329d50
SD card menu enhancement
2019-03-06 19:51:26 +01:00
PavelSindler
101453b674
mbl submenu
2019-03-06 13:27:31 +01:00
PavelSindler
5766a5537e
limit number of probes
2019-03-05 22:43:44 +01:00
PavelSindler
7c187541e1
function for valid points determination improved; simple Z-coordinate estimation; measure all points and use inaccurate Z-coordinate in case that we don't have enought information for counting Z-coordinate estimation
2019-03-05 22:36:30 +01:00
PavelSindler
d9e93e8a77
measurements points moved 10mm to the left; measure only chosen points (e.g. not points affected by magnets proximity)
2019-03-05 20:40:08 +01:00
Marek Bel
1eab058ad4
Fix uninitialized variable used.
2019-03-05 18:08:35 +01:00
Marek Bel
7fcecabd5f
Fix compiler warning: variable 'previous_millis_cmd' set but not used
2019-03-05 18:04:58 +01:00
Marek Bel
484259cbb2
Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used
2019-03-05 18:00:16 +01:00
Marek Bel
28f1e309a2
Fix compiler warning: 'old_x_max_endstop' defined but not used
...
Fix compiler warning: 'old_y_max_endstop' defined but not used
2019-03-05 17:44:47 +01:00
Marek Bel
7bcd54f8ba
Add missing function prototype.
2019-03-05 17:30:27 +01:00
Marek Bel
ebfd4b2f47
Fix compiler warning: unused parameter 'calib'
2019-03-05 17:02:57 +01:00
Marek Bel
790ae9f0ce
Fix compiler warning: unused parameter 'pstep'.
2019-03-05 16:41:41 +01:00
Marek Bel
5b9e7c4fe7
Fix warning: assignment makes pointer from integer without a cast.
2019-03-05 16:27:47 +01:00
PavelSindler
f1031d2302
new farm statuses for pause (14) and wait for user (15)
2019-03-05 16:00:50 +01:00
Marek Bel
23859921b9
Fix compiler warnings macro redefined.
2019-03-05 15:56:20 +01:00
MRprusa3d
20a03d703d
G-code unification
...
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
2019-03-05 13:36:13 +01:00
Marek Bel
f161d3ade4
Change formatting.
2019-03-04 22:17:43 +01:00
Marek Bel
b2255c8be9
Preheat nozzle before loading filament in M600 (change filament) gcode.
...
This fixes problem of not heating the nozzle when retrying load after MMU load failed.
2019-03-04 22:00:24 +01:00
MRprusa3d
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
PavelSindler
17f095b957
shorter Z movements (makes calibration faster)
2019-03-04 20:32:56 +01:00
mkbel
27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode
...
mmu stealth mode
2019-03-04 17:09:11 +01:00
PavelSindler
7f92d73a40
MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update
2019-03-04 17:04:22 +01:00
PavelSindler
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
PavelSindler
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
PavelSindler
e832f0f2ee
Merge pull request #1582 from mkbel/remove_unused_code
...
Remove commented out code, fix formatting.
2019-03-04 15:29:36 +01:00
Marek Bel
8812d40546
Revert "Fix compiler warning: variable 'kill_message' set but not used"
...
This reverts commit a964f996fa .
2019-03-04 15:05:14 +01:00
MRprusa3d
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
Marek Bel
9e38b1e101
Add missing message "Preheating to cut".
2019-03-01 18:17:08 +01:00
Marek Bel
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
Marek Bel
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
Marek Bel
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
Marek Bel
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
Marek Bel
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
Marek Bel
a964f996fa
Fix compiler warning: variable 'kill_message' set but not used
...
kill_message is unused since:
Author: MRprusa3d <martin.remis@prusa3d.cz>
Date: 4 months ago (11/2/2018 11:03:14 PM)
Commit hash: 73794b56cf
MeshBed Leveling Fail
Z-leveling after MeshBed leveling failing
2019-03-01 17:08:36 +01:00
Marek Bel
8e51b37d91
Suppress warning: unused parameter.
2019-03-01 16:57:20 +01:00
Marek Bel
22500970ba
Remove commented out code, fix formatting.
2019-03-01 16:18:16 +01:00
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
PavelSindler
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject
...
Add filament ramming to eject filament.
2019-03-01 14:21:23 +01:00
PavelSindler
0db721b244
Merge pull request #1559 from mkbel/detect_bad_load
...
Move extruder forth and back after filament detected by sensor to det…
2019-03-01 14:21:04 +01:00
PavelSindler
3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time
...
Fix menu stack overrun.
2019-03-01 14:20:22 +01:00
PavelSindler
250a448d05
Merge pull request #1549 from mionut/7MBL
...
7x7 mesh bed leveling with power failure save + pinda temperature filter
2019-03-01 14:19:52 +01:00
PavelSindler
488497df2c
version change
2019-03-01 13:56:03 +01:00
PavelSindler
ca88010018
Revert "version change"
...
This reverts commit f14733f2dd .
2019-03-01 13:54:25 +01:00
PavelSindler
f14733f2dd
version change
2019-03-01 13:53:18 +01:00
PavelSindler
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
PavelSindler
482f8ef01a
Merge remote-tracking branch 'mionut/7MBL' into 7x7
2019-02-28 15:54:49 +01:00
Marek Bel
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
Marek Bel
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
PavelSindler
ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795
...
preHeat @ filament management
2019-02-27 13:15:39 +01:00
Marek Bel
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
MRprusa3d
2f1e968563
"lcd_update_enable()" replacement
2019-02-26 23:17:52 +01:00
Marek Bel
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
Marek Bel
a67645fda6
Merge branch 'add_cut' into bad_load_cut
2019-02-26 18:35:55 +01:00
Marek Bel
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
MRprusa3d
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
Marek Bel
5a5a482a59
Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command.
2019-02-26 13:59:44 +01:00
Marek Bel
6c9dd4f272
Add filament ramming to eject filament.
2019-02-26 13:41:28 +01:00
Marek Bel
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
Marek Bel
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
Marek Bel
d5c5ed55eb
Change formatting.
2019-02-25 11:12:39 +01:00
Marek Bel
8f5fbe569c
Merge branch 'MK3' into detect_bad_load
2019-02-25 10:41:26 +01:00
PavelSindler
8e3d52ee6d
fix compilation error for MK2.5, make code more readable
2019-02-22 17:15:40 +01:00
PavelSindler
26cab2911f
mmu stealth mode
2019-02-22 16:30:54 +01:00
Laurentiu
51827c578f
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 15:05:06 +02:00
Laurentiu
62875f2e95
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 14:35:48 +02:00
MRprusa3d
c0a8d87e9e
Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795
2019-02-22 03:16:23 +01:00
MRprusa3d
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
PavelSindler
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging
...
version change
2019-02-21 19:17:03 +01:00
PavelSindler
da28773480
version change
2019-02-21 19:16:24 +01:00
MRprusa3d
e422cc1c26
Merge branch 'MK3' into PFW-795
2019-02-21 15:43:56 +01:00
MRprusa3d
ed93f1b7f0
preHeat @ filament management
...
another funcionality IIb
2019-02-21 15:27:22 +01:00
PavelSindler
16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix
...
comments
2019-02-21 14:29:04 +01:00
PavelSindler
6ad5c07e6d
comments
2019-02-21 14:28:05 +01:00
MRprusa3d
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
MRprusa3d
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
Marek Bel
8b858286ac
Document.
2019-02-21 02:30:01 +01:00
Marek Bel
326c8492b5
Move extruder forth and back after filament detected by sensor to detect bad load.
2019-02-21 01:19:26 +01:00
PavelSindler
1e729048dc
cmdqueue_reset fix
2019-02-21 00:14:49 +01:00
MRprusa3d
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
Laurentiu
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
PavelSindler
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
PavelSindler
9d76b6912c
merge new changes from upstream
2019-02-15 17:05:39 +01:00
PavelSindler
2b6668b853
merge MK3S branch into MK3
2019-02-15 16:42:40 +01:00
PavelSindler
fec64a9d5e
Merge pull request #1525 from mkbel/improve_mmu_load_failed_2
...
Improve mmu load failed 2
2019-02-15 15:52:35 +01:00
PavelSindler
69ff37729e
whitespace
2019-02-15 14:19:30 +01:00
PavelSindler
0f791ce47f
mmu needs attention: idler error fix
2019-02-15 14:17:47 +01:00
MRprusa3d
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
Laurentiu
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
MRprusa3d
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
MRprusa3d
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
Marek Bel
a5437cb15b
Resend MMU T commands only.
...
This solves problem with unload repeated if unload takes too long, second ok reply then triggers Wait end and resumes print.
2019-02-13 22:29:29 +01:00
Marek Bel
a4032e437e
Add MMU wait command after MMU load failed. Resume print when MMU wait command returns OK.
2019-02-13 21:28:21 +01:00
Marek Bel
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
Marek Bel
8e23e7f322
Save some flash by using smaller type for filament.
2019-02-13 16:37:54 +01:00
Marek Bel
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
Marek Bel
bb7eeef1f4
Define debug printf and puts functions to make code more readable.
2019-02-12 23:24:23 +01:00
Marek Bel
e1216934ef
Save flash by defining underlying type and omitting number value.
2019-02-12 21:53:11 +01:00
Marek Bel
3379fb4866
Convert mmu_state to enum.
2019-02-12 21:43:26 +01:00
PavelSindler
4c76393231
version change
2019-02-12 13:44:50 +01:00
PavelSindler
62500f0b55
version changed
2019-02-12 10:39:09 +01:00
Marek Bel
6c8d9c6fb4
Retry filament load on MMU load failure once.
2019-02-11 23:43:42 +01:00
Marek Bel
d33b24c281
Unload filament after MMU load failed so MMU unit can be controlled by its buttons.
2019-02-11 23:24:55 +01:00
PavelSindler
b85661309f
configuration change
2019-02-11 16:38:36 +01:00
PavelSindler
ccc542d74a
MK2.5 IR_SENSOR_PIN modified
2019-02-11 14:32:21 +01:00
PavelSindler
cd692f6be6
version change
2019-02-07 19:43:08 +01:00
PavelSindler
065d56b2c6
version change
2019-02-06 23:58:30 +01:00
PavelSindler
38b0e5439b
version change
2019-02-06 23:52:24 +01:00
MRprusa3d
b17a961241
MK2.5S
...
pin definition for filament sensor connection
2019-02-06 23:31:48 +01:00
PavelSindler
e028db7bf9
version change
2019-02-06 23:30:01 +01:00
PavelSindler
ff52499bdc
extr fan RPM measuring fix
2019-02-06 23:05:13 +01:00
PavelSindler
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
PavelSindler
22217a42f7
message change
2019-02-06 21:37:39 +01:00
PavelSindler
a85d8e7f97
message change
2019-02-06 21:36:21 +01:00
PavelSindler
d19c92bca8
welcome message changed
2019-02-06 19:41:17 +01:00
PavelSindler
de9c87c592
welcome message changed
2019-02-06 19:38:52 +01:00
Marek Bel
c704a4b7ab
Fix menu stack overrun.
2019-02-06 18:25:45 +01:00
PavelSindler
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
PavelSindler
63c8a36185
typo fixed
2019-02-06 16:27:44 +01:00
PavelSindler
a220c97f94
Revert "variant files"
...
This reverts commit 850d3316b6 .
2019-02-06 16:19:30 +01:00
PavelSindler
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
PavelSindler
850d3316b6
variant files
2019-02-06 15:18:12 +01:00
PavelSindler
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
PavelSindler
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
PavelSindler
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
PavelSindler
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
PavelSindler
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
MRprusa3d
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
Robert Pelnar
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
PavelSindler
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
PavelSindler
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
PavelSindler
91b12ff64b
bed level correction menu fix (menu_item_edit for negative integers)
2019-02-05 16:49:29 +01:00
PavelSindler
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
PavelSindler
ea20529945
merge changes from upstream
2019-02-04 15:23:39 +01:00
MRprusa3d
5a2df47077
minTemp
...
better stability for delay-cutting
2019-02-04 14:54:25 +01:00
PavelSindler
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
PavelSindler
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
PavelSindler
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
PavelSindler
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
Robert Pelnar
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
MRprusa3d
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
PavelSindler
2f9ab7b185
Merge branch 'dev' into variants
2019-02-04 01:32:24 +01:00
Robert Pelnar
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
PavelSindler
036bd4eb46
Merge branch 'dev' into variants
2019-02-04 01:20:14 +01:00
PavelSindler
6bf8611afa
mintemp: delay cutting lines removed
2019-02-04 01:19:58 +01:00
PavelSindler
71e4459cc9
Merge branch 'dev' into variants
2019-02-04 01:14:11 +01:00
PavelSindler
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
PavelSindler
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
PavelSindler
454a087fb3
Merge branch 'dev' into variants
2019-02-01 21:24:38 +01:00
PavelSindler
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
PavelSindler
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
Robert Pelnar
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
PavelSindler
2cb3b99981
Merge branch 'dev' into variants
2019-01-31 18:04:38 +01:00
PavelSindler
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
PavelSindler
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
PavelSindler
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
MRprusa3d
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
PavelSindler
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
PavelSindler
b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
...
HW pwm fix
2019-01-30 12:52:44 +01:00
Robert Pelnar
9890c60fe5
HW PWM fix
2019-01-30 00:06:12 +01:00
PavelSindler
bbdb2c1597
Merge branch 'dev' into variants
2019-01-29 15:34:56 +01:00
MRprusa3d
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
PavelSindler
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
PavelSindler
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
PavelSindler
60acdd23c5
variants
2019-01-28 21:12:38 +01:00
PavelSindler
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
PavelSindler
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
Marek Bel
6d2358125a
Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2.
2019-01-28 19:29:31 +01:00
PavelSindler
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
PavelSindler
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
PavelSindler
83510ed489
check_for_ir_sensor
2019-01-28 17:27:16 +01:00
PavelSindler
8fe2d1de9a
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 17:15:22 +01:00
PavelSindler
8f039263d5
variant files and version
2019-01-28 17:14:24 +01:00
PavelSindler
1742dbdb9e
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 16:21:57 +01:00
PavelSindler
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm""
2019-01-28 14:20:31 +01:00
Robert Pelnar
1b4e49b5ac
Fixed fancheck and include in TimerRemaining.h
...
this commit enables fast pwm mode for bed (SYSTEM_TIMER_2 definition uncomented)
fancheck fix verified with selftest
2019-01-28 12:57:33 +01:00
PavelSindler
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
PavelSindler
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
PavelSindler
41f103c28f
Revert "Mk3 bed fast pwm"
2019-01-28 10:53:51 +01:00
PavelSindler
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
Robert Pelnar
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
Robert Pelnar
9a1e914637
fix - bed heating durring selftest
2019-01-27 18:14:01 +01:00
Robert Pelnar
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
Robert Pelnar
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
Marek Bel
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
Marek Bel
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
PavelSindler
ab2a25cd3f
Revert "Fast PWM for bed - newer set HEATER_BED_PIN to 1"
...
This reverts commit 50bcfae183 .
2019-01-25 18:38:46 +01:00
PavelSindler
31236e411e
Revert "Fast PWM for bed - set pwm value from soft_pwm_bed variable."
...
This reverts commit e612eb2a17 .
2019-01-25 18:38:36 +01:00
PavelSindler
76db58605b
Revert "Fast PWM for bed - timer2 used as system timer"
...
This reverts commit 0963c889f0 .
2019-01-25 18:37:23 +01:00
Marek Bel
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
PavelSindler
fc1491670f
mmu_idler_sensor_detected -> ir_sensor_detected
2019-01-25 18:03:05 +01:00
PavelSindler
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
PavelSindler
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
PavelSindler
579fb42be2
Merge pull request #1480 from MRprusa3d/PFW-556
...
Pfw 556
2019-01-25 15:04:26 +01:00
PavelSindler
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
PavelSindler
661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-25 13:14:18 +01:00
Marek Bel
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
Marek Bel
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
Marek Bel
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
Marek Bel
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
MRprusa3d
46e2bdaf62
Merge remote-tracking branch 'public_remote/MK3' into PFW-556
2019-01-24 19:39:34 +01:00
Marek Bel
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
MRprusa3d
b2b65475df
SD card menu
...
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
PavelSindler
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
PavelSindler
da2c963893
conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed
2019-01-24 16:00:52 +01:00
PavelSindler
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +01:00
PavelSindler
f4e5c729ac
Merge pull request #1451 from mkbel/Tx_fix
...
Tx fix
2019-01-24 13:41:43 +01:00
PavelSindler
273554b9b0
Merge pull request #1470 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-24 13:11:57 +01:00
PavelSindler
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
PavelSindler
eec869b73a
Merge pull request #1477 from MRprusa3d/PFW-723
...
PID / manage_heater
2019-01-24 00:31:23 +01:00
MRprusa3d
15b45df9fb
PID / manage_heater
...
better build-warnings elimination
2019-01-23 20:14:40 +01:00
MRprusa3d
867182c266
minTemp
...
more user-proof solution
2019-01-23 18:50:13 +01:00
Robert Pelnar
c4d5b58c37
Merge remote-tracking branch 'upstream/MK3' into MK3-bed_fast_pwm
...
# Conflicts:
# Firmware/temperature.cpp
resolved
2019-01-23 17:04:41 +01:00
PavelSindler
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
Marek Bel
1d71c1a5d1
Update IR sensor selftest progress bar more frequently.
2019-01-22 19:02:42 +01:00
Marek Bel
97a4623800
Fix lcd_selftest_screen for small _progress_scale.
2019-01-22 19:01:55 +01:00
Marek Bel
9cda0b69b8
Update IR sensor selftest progress bar.
2019-01-22 18:23:00 +01:00
Marek Bel
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
Marek Bel
c371a5ea65
Document.
2019-01-22 14:05:08 +01:00
Marek Bel
a92d9c782b
Add IR sensor test.
2019-01-22 11:29:55 +01:00
Marek Bel
f292a6ca7a
Refactor filament sensor selftest call.
2019-01-21 21:39:38 +01:00
Robert Pelnar
50bcfae183
Fast PWM for bed - newer set HEATER_BED_PIN to 1
2019-01-21 18:21:17 +01:00
MRprusa3d
2c0d62fbf7
PID / manage_heater
...
some small corrections
2019-01-21 18:20:40 +01:00
Robert Pelnar
e612eb2a17
Fast PWM for bed - set pwm value from soft_pwm_bed variable.
2019-01-21 18:14:19 +01:00
Robert Pelnar
0963c889f0
Fast PWM for bed - timer2 used as system timer
2019-01-21 17:57:07 +01:00
MRprusa3d
d7ac459da7
PID / manage_heater
...
build-warnings elimination
2019-01-20 01:23:15 +01:00
MRprusa3d
d9f8e4eb9e
PID / manage_heater
...
PSD regulator improvement
2019-01-17 02:57:08 +01:00
PavelSindler
ca8cb3784c
Merge pull request #1456 from mkbel/Fix_load_fail_current
...
Do not disable motor currents when print is paused due to mmu load er…
2019-01-16 12:49:38 +01:00
Marek Bel
3af1f81269
Do not disable motor currents when print is paused due to mmu load error.
2019-01-15 21:40:02 +01:00
Marek Bel
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
Marek Bel
d09ff5c3e7
Remove commented out code.
2019-01-15 01:30:54 +01:00
Marek Bel
39b391314f
Document meaning of manage_response() move default parameter value.
2019-01-15 01:29:59 +01:00
Marek Bel
3b175459b1
Fix filament loaded to far and MMU idler never disengaged after Tx command on printer with idler sensor.
2019-01-15 01:28:51 +01:00
Marek Bel
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
Marek Bel
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
PavelSindler
7946cd7250
eeprom write nr. limitation
2019-01-04 22:23:11 +01:00
PavelSindler
02262ff7ca
mmu load fail: possibility to unload/eject filament from menu
2019-01-04 21:37:19 +01:00
Marek Bel
d89c03a0f1
Documentation.
2019-01-04 21:26:13 +01:00
Marek Bel
1a219b2372
Mark filament as depleted when detected by MMUv2 FINDA. Do not try to load filament if it is marked depleted, load next filament instead. Force user action when all filaments are marked as depleted.
2019-01-04 21:11:42 +01:00
PavelSindler
b7b7e9387f
do resend attempts before pausing print (mmu needs attention state) so the print would not be paused if T-code is not received correctly by mmu; prevent infinite loading
2019-01-04 21:07:52 +01:00
Marek Bel
a7128ffa04
Comment.
2019-01-04 19:56:15 +01:00
Marek Bel
92ff284f82
Remove redundant code.
2019-01-04 19:35:33 +01:00
Marek Bel
360a977520
Fix allDepleted(). Add tests.
2019-01-04 19:34:42 +01:00
Marek Bel
a309ec1b0b
Add filament auto deplete engine for multi-material prints with MMUv2.
2019-01-03 22:58:25 +01:00
MRprusa3d
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
Craig Link
52d81bb4d8
set array size correctly to 4
2018-12-31 17:51:16 -08:00
PavelSindler
3ab1daf722
MMU_DEBUG temporarily enabled
2018-12-21 23:17:32 +01:00
PavelSindler
88441f7f2f
scan power failures fix
2018-12-21 23:07:39 +01:00
PavelSindler
6ba86acebc
send A (abort) command to mmu only when loading phase of T-code
2018-12-21 22:33:01 +01:00
PavelSindler
e36e58f385
show sensor on/off temporarily changed to unlocalized strings
2018-12-21 21:28:57 +01:00
PavelSindler
688d4a8a82
missing defines in variant files
2018-12-21 21:05:54 +01:00
PavelSindler
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
PavelSindler
5462d451e1
show power failures in fail stats menu, shorter load to nozzle if idler sensor detected
2018-12-21 20:56:45 +01:00
PavelSindler
d1ca73597b
Merge pull request #1412 from XPila/V3_5
...
Repeat last MMU command after timeout
2018-12-21 20:53:24 +01:00
PavelSindler
d292e877df
load to nozzle shortened, sensor menu moved to support
2018-12-21 18:51:13 +01:00
PavelSindler
3c64bad1cb
initial version which works on old and new hw, initial version of idler sensor detection
2018-12-21 17:12:16 +01:00
PavelSindler
75523b1497
Merge pull request #1417 from PavelSindler/z_cal_endstops
...
version changed
2018-12-19 20:08:22 +01:00
PavelSindler
acbfe89f04
version changed
2018-12-19 20:07:18 +01:00
PavelSindler
b0fce9122e
Merge pull request #1416 from PavelSindler/z_cal_endstops
...
Z cal endstops and stop paused print fix
2018-12-19 19:46:27 +01:00
Robert Pelnar
f79137898a
Fix - move down after calibrate Z (PFW718)
2018-12-19 19:22:03 +01:00
PavelSindler
40fe52202d
stop paused print fix: saved_printing set to false when doing stop print
2018-12-19 19:20:09 +01:00
Robert Pelnar
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
Robert Pelnar
c69d4aa914
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-19 13:43:49 +01:00
Robert Pelnar
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
Robert Pelnar
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
PavelSindler
b5430c2968
M600: consume click
2018-12-18 19:10:02 +01:00
Robert Pelnar
75d31fd2cb
Repeat last MMU command after timeout
2018-12-18 18:47:54 +01:00
PavelSindler
880163dbcb
missing prototypes
2018-12-18 17:38:24 +01:00
PavelSindler
fc5d7e35ef
fail stats mmu function definitions
2018-12-18 17:35:41 +01:00
PavelSindler
11ab5dfd36
fail stats menu for mmu defined for MK2.5 version
2018-12-18 17:33:27 +01:00
PavelSindler
4543949cac
build without MMU_IDLER_SENSOR_PIN defined
2018-12-18 17:29:44 +01:00
PavelSindler
fc33affbda
temporary change
2018-12-18 17:24:29 +01:00
PavelSindler
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
PavelSindler
c782373f2d
comment
2018-12-18 16:09:10 +01:00
PavelSindler
7703125b2e
retry unload movements (T-codes, M702 C) if filament detected by idler sensor, then turn off stepper and wait, MMU_LOAD_TIME prolonged
2018-12-18 16:08:29 +01:00
PavelSindler
27c8612360
use just short movement for unloading filament
2018-12-17 21:25:07 +01:00
PavelSindler
cb1f6d2a0e
show sensor states in calibration menu
2018-12-14 19:43:26 +01:00
Robert Pelnar
927898151a
fix - tmc2130 conditional translation
2018-12-14 15:46:50 +01:00
Robert Pelnar
cfe83daf4a
Meshbed leveling fail - move 1mm outside of colission with disabled endstop
2018-12-14 15:32:47 +01:00
PavelSindler
e0bed71801
comments update
2018-12-13 17:01:45 +01:00
PavelSindler
bbba27c15f
idler state menu
2018-12-13 16:53:59 +01:00
PavelSindler
24ef6deeed
typo fixed
2018-12-13 16:43:40 +01:00
PavelSindler
9c4f086add
fixed statistics for MMU_FAIL
2018-12-13 01:09:21 +01:00
PavelSindler
df71398066
statistics fix
2018-12-13 00:43:27 +01:00
PavelSindler
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +01:00
PavelSindler
665f1d7ffe
pause print after N continue loading attempts and wait for user, then start print and repeat last T-code
2018-12-12 23:36:50 +01:00
PavelSindler
29ecd4ec7a
duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu
2018-12-12 22:32:47 +01:00
Marek Bel
3d4cb8a994
Document gcode T.
2018-12-12 20:30:28 +01:00
PavelSindler
c256af0a1c
unknown filament added; the same T-code will be not executed twice in a row; continue loading
2018-12-12 14:50:55 +01:00
PavelSindler
e52e53d1eb
send continue loading commands periodically if initial load fails
2018-12-12 13:54:17 +01:00
PavelSindler
041ed172a0
Merge remote-tracking branch 'robert/MK3' into idler_sensor
2018-12-11 19:16:04 +01:00
PavelSindler
8af127870d
consume click
2018-12-11 15:59:44 +01:00
Joshua Hoblitt
3f96dea4f9
make all shell scripts executable
2018-12-10 07:09:03 -07:00
PavelSindler
6d6de67c3f
consume click
2018-12-07 18:31:30 +01:00
Robert Pelnar
35378769fd
MMU - idler sensor
2018-12-06 19:19:50 +01:00
Robert Pelnar
6157c3ab32
New filament sensor
2018-12-06 15:41:53 +01:00
Robert Pelnar
41b78187ca
LCD backlight - full brightnes at start
2018-12-06 15:27:05 +01:00
Robert Pelnar
cb334238cc
Slow PWM fan @ 62.5Hz
2018-12-06 15:18:07 +01:00
XPila
1948cb6310
Merge pull request #1369 from PavelSindler/M220_MK3
...
M220: possibility to backup/restore speed
2018-11-30 19:02:45 +01:00
PavelSindler
d1d4a8c58c
whitespace
2018-11-29 17:33:36 +01:00
PavelSindler
8e239ce76f
changed M220
2018-11-29 17:02:38 +01:00
PavelSindler
929e1de253
special variable for saving/restoring feedmultiply using M220
2018-11-29 17:02:10 +01:00
PavelSindler
839de141a3
resolving conflicts
2018-11-29 16:26:49 +01:00
PavelSindler
abf20ef6a2
merged changes from public upstream (Prusa-Firmware repository)
2018-11-29 13:46:58 +01:00
MRprusa3d
83a9f75abe
minTemp
...
correct minTemp detection @ MK2.5 & MK3
2018-11-28 23:43:16 +01:00
Marek Bel
38dacaf07a
Automate secondary language support build.
2018-11-26 20:24:24 +01:00
PavelSindler
90876453a7
Merge pull request #1357 from PavelSindler/MK3_for_merging
...
version change
2018-11-22 23:32:37 +01:00
PavelSindler
47d3535012
version change
2018-11-22 23:30:01 +01:00
PavelSindler
c1773c1aa4
Merge pull request #1356 from PavelSindler/MK3_for_merging
...
process serial line during pause
2018-11-22 23:07:07 +01:00
PavelSindler
85b23d1db6
process serial line during pause
2018-11-22 21:41:22 +01:00
PavelSindler
b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5
...
Lang - final corrections
2018-11-22 19:03:30 +01:00
Robert Pelnar
e229f3343e
Lang - text "volume.init failed" removed from dictionary
2018-11-22 18:48:22 +01:00
Robert Pelnar
42f2a61416
Lang - text "TRIGGERED" removed from dictionary
2018-11-22 18:46:02 +01:00
Robert Pelnar
e9131542ca
Lang - text "Sleep..." removed from dictionary
2018-11-22 18:43:21 +01:00
Robert Pelnar
ddf898cb41
Lang - text "SD init fail" removed from dictionary
2018-11-22 18:41:00 +01:00
Robert Pelnar
3384dd8487
Lang - text "SD card ok" removed from dictionary
2018-11-22 18:39:35 +01:00
Robert Pelnar
72c7810641
Lang - text "Resend" removed from dictionary
2018-11-22 18:38:20 +01:00
Robert Pelnar
7426efac9b
Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary
2018-11-22 18:36:38 +01:00
Robert Pelnar
123bef636a
Lang - text "Printer halted. kill() called!" removed from dictionary
2018-11-22 18:33:15 +01:00
Robert Pelnar
123725edd1
Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed
2018-11-22 18:30:53 +01:00
Robert Pelnar
0fceade481
Lang - text "PowerUp" removed from dictionary
2018-11-22 18:24:21 +01:00
Robert Pelnar
f0e3021d33
Lang - text "openRoot failed" removed from dictionary
2018-11-22 18:20:24 +01:00
Robert Pelnar
1cbb261707
Lang - text "open" removed from dictionary
2018-11-22 18:18:25 +01:00
Robert Pelnar
f4bbce4142
Lang - text "open failed, File: " removed from dictionary
2018-11-22 18:15:22 +01:00
Robert Pelnar
72d47eaeba
Lang - text "ok" removed from dictionary
2018-11-22 18:12:19 +01:00
Robert Pelnar
1568b94e87
Lang - text "No Checksum with line number, Last Line: " removed from dictionary
2018-11-22 18:09:07 +01:00
Robert Pelnar
fd3cd9b551
Lang - texts "Mxxx Invalid extruder " removed from dictionary
2018-11-22 18:06:10 +01:00
Robert Pelnar
fdf9734161
Lang - text "checksum mismatch, Last Line: " removed from dictionary
2018-11-22 17:59:43 +01:00
Robert Pelnar
9c964277ac
Lang - text "error writing to file" removed from dictionary
2018-11-22 17:57:52 +01:00
Robert Pelnar
9f86a334c6
Lang - text "endstops hit: " removed from dictionary
2018-11-22 17:53:51 +01:00
Robert Pelnar
0baa6412fc
Lang - text "Cannot enter subdir: " removed from dictionary
2018-11-22 17:49:28 +01:00
Robert Pelnar
60e567b660
Lang - text " Last Updated: " removed from dictionary
2018-11-22 17:48:12 +01:00
Robert Pelnar
a1f03e9531
Lang - text " Free Memory: " removed from dictionary
2018-11-22 17:46:44 +01:00
Robert Pelnar
283e33dd69
Lang - text " cold extrusion prevented" removed from dictionary
2018-11-22 17:44:53 +01:00
Robert Pelnar
104353c0c5
Lang - text " PlannerBufferBytes: " removed from dictionary
2018-11-22 17:43:11 +01:00
Robert Pelnar
46fba48173
Lang - text "enqueing \"" removed from dictionary
2018-11-22 17:38:52 +01:00
Robert Pelnar
0ceeba38cb
Lang - text "Copy selected language from XFLASH?" shorted to "Copy selected language?"
2018-11-22 17:32:53 +01:00
Robert Pelnar
099fe216b6
Lang - text "KILLED. " removed from dictionaries
2018-11-22 17:26:01 +01:00
Robert Pelnar
37273d9fca
Lang - 'Auto Deplete' changed to 'SpoolJoin'
2018-11-22 17:19:38 +01:00
PavelSindler
49367c0b09
Merge pull request #1353 from XPila/V3_5
...
Lang - french translation
2018-11-22 17:18:42 +01:00
Robert Pelnar
f0624a9e97
Lang - some not localized texts marked as localized, formating fixed
2018-11-22 14:37:29 +01:00
XPila
3d76081c79
Merge pull request #1351 from PavelSindler/MK3_for_merging
...
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
2018-11-21 20:03:07 +01:00
PavelSindler
0e65790218
removed redundant code
2018-11-21 19:49:19 +01:00
PavelSindler
74a7341005
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
2018-11-21 19:27:55 +01:00
PavelSindler
9fa587b206
Merge pull request #1350 from XPila/V3_5
...
V 3.5 - new translation
2018-11-21 15:23:41 +01:00
Robert Pelnar
2dc5439069
Lang - reserved space increased to 0x2f00 (12032 bytes)
2018-11-21 14:57:20 +01:00
Robert Pelnar
1bff138b50
Lang - sec.lang. reserved space increased to 0x2e00 (11776 bytes)
2018-11-21 14:52:14 +01:00
PavelSindler
18eb9ad69e
Merge pull request #1344 from PavelSindler/progress_bar_fix
...
progress bar fix
2018-11-20 14:50:04 +01:00
Marek Bel
ab5b57df11
Style.
2018-11-19 20:41:14 +01:00
PavelSindler
cb7c701791
whitespace
2018-11-19 20:09:03 +01:00
PavelSindler
7d538cde6c
Retrieve settings (M501): initialize each item in feedrate and acceleration arrays separately
2018-11-19 20:05:58 +01:00
PavelSindler
e5dd4d757a
progress bar fix
2018-11-16 15:45:55 +01:00
MRprusa3d
ffe906c733
MeshBed Levelling Fail V
2018-11-14 16:45:49 +01:00
PavelSindler
0398c3c26b
Merge pull request #1335 from PavelSindler/T_codes
...
version change
2018-11-13 17:49:26 +01:00
PavelSindler
51c80352e8
version change
2018-11-13 17:48:42 +01:00
PavelSindler
51b4858a87
Merge pull request #1334 from XPila/V3_5
...
PFW658 - disable extruder motor while changing filament with mmu2 (pr…
2018-11-13 16:10:24 +01:00
XPila
c41b045ea7
Merge pull request #1333 from PavelSindler/T_codes
...
T-code fix
2018-11-13 16:09:52 +01:00
Robert Pelnar
bfc343c7c5
PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating)
2018-11-13 16:04:46 +01:00
PavelSindler
15d0b083ed
whitespace
2018-11-13 15:58:21 +01:00
PavelSindler
17a1049f23
T-codes fix
2018-11-13 15:56:19 +01:00
PavelSindler
f297e72864
Merge pull request #1332 from XPila/V3_5
...
Fix PFW657 - filament runout detection is not working after autoload …
2018-11-13 14:10:11 +01:00
Robert Pelnar
d886ba1100
Fix PFW657 - filament runout detection is not working after autoload disabled from menu.
2018-11-13 14:05:15 +01:00
XPila
3d97d81734
Merge pull request #1329 from PavelSindler/M600_load_fil_message
...
M600 filament load progress bar changes
2018-11-12 20:52:06 +01:00
PavelSindler
27db32cbd0
Merge pull request #1331 from XPila/V3_5
...
M907 fix - value in mA (PFW655)
2018-11-12 20:49:09 +01:00
Robert Pelnar
41b885c537
M907 fix - value in mA (PFW)
2018-11-12 20:39:25 +01:00
MRprusa3d
5e8e96b5d7
MMU module adjustment
...
MMU module conditional compilation adjustment for MMU v1
2018-11-12 20:09:54 +01:00
PavelSindler
32da5bc039
progress bar time counted from feedrate and E - distance
2018-11-12 19:55:53 +01:00
PavelSindler
f4c1e7924f
M600: show progress bar during first filament load
2018-11-12 18:35:06 +01:00
PavelSindler
10a81ea768
version change
2018-11-09 19:16:53 +01:00
PavelSindler
5931d15566
whitespace
2018-11-09 18:31:28 +01:00
PavelSindler
c991c8b314
resume print fix: wait for heater() never disable steppers
2018-11-09 18:29:35 +01:00
XPila
10b79e918b
Merge pull request #1321 from PavelSindler/M600_load_fix
...
M600 load messages synchronization fixed
2018-11-09 15:40:00 +01:00
PavelSindler
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +01:00
PavelSindler
7022373885
Merge pull request #1320 from XPila/V3_5
...
localization - lang-export.sh + po files + tmc2130_print_currents fixed (M913)
2018-11-09 15:27:43 +01:00
Robert Pelnar
3afebcc9cc
tmc2130_print_currents fixed (for obsolete M913)
2018-11-09 15:20:25 +01:00
PavelSindler
5f166374ab
Merge pull request #1319 from XPila/V3_5
...
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compil…
2018-11-09 13:10:51 +01:00
Robert Pelnar
6c13225f49
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compiled on linux arduino 1.8.5 + lto)
2018-11-09 10:45:16 +01:00
PavelSindler
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
...
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
PavelSindler
6d59f88a8e
Merge pull request #1315 from MRprusa3d/PFW-639
...
Bed PowerMonitor III
2018-11-08 10:08:31 +01:00
MRprusa3d
ccb58ae7c9
Revert "MeshBed Levelling Fail IV"
...
This reverts commit bd554df02e .
2018-11-08 04:02:32 +01:00
MRprusa3d
bd554df02e
MeshBed Levelling Fail IV
2018-11-08 03:54:05 +01:00
MRprusa3d
fd45dd64dc
Bed PowerMonitor III
2018-11-08 03:32:00 +01:00
PavelSindler
3cccb125f7
Merge pull request #1313 from MRprusa3d/PFW-639
...
Bed PowerMonitor II
2018-11-07 13:50:50 +01:00
MRprusa3d
4ae857136d
Bed PowerMonitor II
2018-11-07 13:38:39 +01:00
PavelSindler
b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
...
Fix long press modal
2018-11-07 10:28:24 +01:00
PavelSindler
a5bbc75035
Merge pull request #1309 from mkbel/fix_1st_lay_cal
...
PFW-634 Move T<nr> code just before extrude code to properly load fil…
2018-11-07 10:28:13 +01:00
Marek Bel
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
Marek Bel
95b0506284
Make lcd_long_press_active private.
2018-11-06 20:48:28 +01:00
Marek Bel
676434111e
Disable long press handler in modal dialogs (LCD update disabled).
2018-11-06 20:43:19 +01:00
Marek Bel
02e31433f4
PFW-634 Move T<nr> code just before extrude code to properly load filament in first layer calibration with MMUv2.
2018-11-06 15:46:37 +01:00
Robert Pelnar
9a68501039
MK2 variants compilable
2018-11-06 14:17:43 +01:00
PavelSindler
c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
MRprusa3d
46b2c93d60
MeshBed Leveling Fail III
2018-11-06 01:44:53 +01:00
MRprusa3d
9953518681
MeshBed Leveling Fail II
2018-11-06 01:28:47 +01:00
PavelSindler
908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
...
filament quality measurements disabled
2018-11-05 19:14:34 +01:00
PavelSindler
0a6ca7ffd0
Merge pull request #1305 from XPila/V3_5
...
PFW643 - removed M910-M918, implemented M907
2018-11-05 19:14:19 +01:00
PavelSindler
89ad02ac8c
filament quality measurements disabled
2018-11-05 18:37:36 +01:00
Marek Bel
50f9bf06be
Save 74B of flash memory.
2018-11-05 18:02:46 +01:00
Marek Bel
e95c2ad592
Display auto deplete as not available if filament sensor is disabled.
2018-11-05 17:43:07 +01:00
Robert Pelnar
d6b5f5a1c7
PFW643 - removed M910-M918, implemented M907
2018-11-05 16:15:27 +01:00
Marek Bel
ef5be690fb
Add autodeplete setting into tune menu.
2018-11-05 13:54:22 +01:00
PavelSindler
7e43b15b54
Merge pull request #1303 from PavelSindler/m600_idler
...
M600: move extruder to the left to make space for idler opening
2018-11-05 10:38:51 +01:00
PavelSindler
78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
...
Wizard improvements
2018-11-05 10:38:41 +01:00
PavelSindler
688c10247e
Merge pull request #1291 from XPila/MK3-new_bs
...
lang update
2018-11-05 10:38:29 +01:00
PavelSindler
0a2ad97bc6
Merge pull request #1290 from PavelSindler/mmu_improvements
...
mmu improvements: load to nozzle, gcodes for single material mode, M600 fix
2018-11-05 10:38:05 +01:00
PavelSindler
2619c6f7a1
Merge pull request #1283 from PavelSindler/crashdet_cancel
...
canceling print after crash detection sets saved_priting flag to false
2018-11-05 10:37:51 +01:00
PavelSindler
aeeb2af0a4
whitespace
2018-11-05 00:15:36 +01:00
PavelSindler
b058ec7120
whitespace
2018-11-05 00:14:16 +01:00
PavelSindler
934b76ade3
wait message added
2018-11-05 00:12:46 +01:00
PavelSindler
3d24f5437c
leave Z move menu (hotfix)
2018-11-04 23:44:29 +01:00
PavelSindler
daef0eeb67
Merge pull request #1297 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail
2018-11-04 23:33:29 +01:00
mkbel
e177c2b669
Merge pull request #1295 from PavelSindler/feedrate_change
...
choosing filament from T? menu changes feedrate fixed
2018-11-04 23:13:03 +01:00
PavelSindler
515f2723d7
Merge pull request #1301 from XPila/V3_5
...
PFW644 + PFW638
2018-11-04 23:10:10 +01:00
PavelSindler
8afb83406e
Wizard for assembled printers (contains more steps now)
2018-11-04 23:08:23 +01:00
Robert Pelnar
33a29cd416
Fix PFW638 - remaining/elapsed time >100h displayed in hours
2018-11-04 20:27:09 +01:00
PavelSindler
e2d2fb58aa
Z calibraion: always ask user to clean nozzle
2018-11-04 18:47:08 +01:00
XPila
35fae8be1c
Merge pull request #1294 from PavelSindler/manage_response_heating
...
mmu manage response: possibility to resume saved nozzle temperature
2018-11-04 18:31:47 +01:00
Robert Pelnar
1e05e1189d
Fix PFW644 - MK25 reports stopped, arduino 1.8.5.
2018-11-03 22:44:42 +01:00
MRprusa3d
73794b56cf
MeshBed Leveling Fail
...
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
PavelSindler
e304319e15
choosing filament from T? menu changes feedrate fixed
2018-11-02 20:25:24 +01:00
PavelSindler
d18013e5a2
manage response now contains showing nozzle temperature and possibility to resume saved nozzle temperature
2018-11-02 19:31:10 +01:00
MRprusa3d
18a8ae5b8f
Bed PowerMonitor
...
bed power monitoring correction
2018-11-01 20:55:42 +01:00
PavelSindler
aaf65051f9
M600: "is color clear?" menu synchronization
2018-11-01 18:28:52 +01:00
PavelSindler
1342c312a0
use feedrate 200mm/min for final feed (faster and better filament sensor function), show default welcome message when load is finished
2018-11-01 16:51:18 +01:00
PavelSindler
96ce324b7c
load to nozzle improved, unified feedrate and E-distance for final feed used in load filament function, M600 etc.
2018-11-01 16:29:09 +01:00
Robert Pelnar
a0e4acead3
lang - removed unused code and some service messages changed to "not translated"
2018-11-01 14:07:16 +01:00
PavelSindler
e80af46503
load to nozzle and Tx and Tc codes: intial version
2018-10-31 21:48:05 +01:00
PavelSindler
f445b6018e
canceling print after crash detection sets saved_priting flag to false
2018-10-28 11:06:10 +01:00
PavelSindler
4ecc00e4e3
M600: move extruder 100mm to the left to make space for opening idler
2018-10-26 18:19:00 +02:00
PavelSindler
6a82af487e
Merge pull request #1278 from XPila/MK3-new_bs
...
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-26 13:18:48 +02:00
mkbel
16c2f6fe8e
Merge pull request #1279 from PavelSindler/turn_on_FINDA
...
mmu2: filament senor (FINDA) menu fix
2018-10-25 21:53:11 +02:00
PavelSindler
a9317b4d36
upstream/MK3 merge
2018-10-25 21:46:32 +02:00
mkbel
cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging
...
3_4_2 branch merging into MK3
2018-10-25 21:45:51 +02:00
PavelSindler
0e0dbad871
#ifdef __cplusplus added to allow including to .c file
2018-10-25 21:06:37 +02:00
PavelSindler
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
PavelSindler
a6a81c6ea6
mmu2: filament senor (FINDA) can be switched ON/OFF from menu without dependency on pat9125 state
2018-10-25 18:26:26 +02:00
Robert Pelnar
d301aa0e8c
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-25 18:16:36 +02:00
Robert Pelnar
7e9eaf0f4b
New lang, arduino 1.8.5 - disable multilanguage support by default
2018-10-23 17:32:52 +02:00
PavelSindler
bd8ca8d652
removed redefinition of functions in fsensor.cpp
2018-10-22 20:51:44 +02:00
PavelSindler
d1de9fff60
mmu_loop: missing return added
2018-10-22 20:38:32 +02:00
PavelSindler
d005005e22
Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging
2018-10-22 20:33:38 +02:00
PavelSindler
940f436a5f
merge MK3_dev into MK3
2018-10-22 20:25:29 +02:00
PavelSindler
bc247ca02c
MK2.5 sw reset at setup function
2018-10-19 17:54:48 +02:00
Robert Pelnar
ac18eb67c0
New lang, arduino 1.8.5 - boot_app debug output
...
+ variable _uartout linkage fix
+ DEBUG_DCODE5
2018-10-18 16:20:14 +02:00
Robert Pelnar
563052d015
New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix
2018-10-18 15:39:08 +02:00
Robert Pelnar
868c79e835
New lang, arduino 1.8.5 - language.h - section names, messages.h - extern "C" added
2018-10-18 14:41:32 +02:00
PavelSindler
b8f92fdfa9
MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers
2018-10-18 02:44:16 +02:00
mkbel
0d9b502937
Merge pull request #1246 from PavelSindler/variants_max
...
MK3: default max feedrate for x and y changed to 100mm/s
2018-10-10 16:46:34 +02:00
PavelSindler
bbd4f70f41
Merge pull request #1221 from XPila/MK3
...
Update fsensor in Manage_inactivity instead of main loop.
2018-10-10 13:12:12 +02:00
PavelSindler
866d6758c3
Merge pull request #1243 from mkbel/simplify_EEPROM_M500
...
Simplify eeprom m500
2018-10-10 13:11:17 +02:00
Marek Bel
9dff6431e6
Format fsensor documentation.
2018-10-09 22:33:54 +02:00
PavelSindler
809ae5a5f0
default max feedrate for x and y changed to 100mm/s
2018-10-09 20:03:28 +02:00
Marek Bel
9cae0c378a
Rename _EEPROM_writeData to EEPROM_writeData. Rename _EEPROM_readData to EEPROM_readData. Add return value to EEPROM_writeData to detect failure to write. Do not mark data as valid, if write has failed. Remove EEPROM_WRITE_VAR and EEPROM_READ_VAR macros. Make pos input only parameter. Convert EEPROM_OFFSET macro to typed constatant EEPROM_M500_base, it was defined in two places, leave it in one place. Use Config_StoreSettings() instead of erase_eeprom_section(). Compare float with 0xff byte by byte to avoid compiler warning "Dereferencing type punned pointer will break strict aliasing rules."
2018-10-08 20:24:56 +02:00
PavelSindler
c91c878408
Merge pull request #1202 from MRprusa3d/PFW-573
...
preHeatError
2018-10-08 16:12:33 +02:00
Marek Bel
1585dc66b0
Merge remote-tracking branch 'prusa3d/MK3_dev' into simplify_EEPROM_M500
...
Known limitation: Unable to compile.
2018-10-08 15:58:49 +02:00
Marek Bel
c77672bf0f
PFW-608 Decrease wear of mass erase EEPROM and do it faster.
2018-10-05 18:11:26 +02:00
PavelSindler
436f5b5728
changed version
2018-10-04 17:40:38 +02:00
PavelSindler
d2aa13d333
Merge pull request #1199 from mkbel/document_gcodes1
...
Documentation: Put scattered and unscattered Gcode documentation toge…
2018-10-04 16:29:39 +02:00
Robert Pelnar
9960c80bf7
Additional check always with enabled oq_meassure
...
+ variant files
2018-10-04 16:12:41 +02:00
Robert Pelnar
f9d8c46802
Enable/disable optical quality meassurement in settings menu
2018-10-04 15:48:28 +02:00
Robert Pelnar
ced74b7ec2
Merge remote-tracking branch 'upstream/MK3' into MK3
2018-10-04 13:53:00 +02:00
Robert Pelnar
7882b3c975
Update fsensor in Manage_inactivity instead of main loop.
2018-10-03 17:29:24 +02:00
PavelSindler
3a58489c6a
Merge pull request #1169 from mkbel/remove_duplicate_debouncing_4
...
Remove duplicate debouncing 4
2018-10-02 11:21:17 +02:00
PavelSindler
bba1ffdb65
version change
2018-09-27 21:13:06 +02:00
PavelSindler
aefb4e5c09
Merge pull request #1200 from XPila/MK3
...
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
2018-09-27 21:05:33 +02:00
Robert Pelnar
e50025cc7d
static_assert - portable solution compatible with C++98
2018-09-27 19:59:29 +02:00
PavelSindler
7e9220ada2
Merge pull request #1198 from PavelSindler/communication_timeouts
...
communication timeouts fix
2018-09-27 11:23:58 +02:00
MRprusa3d
0184f06dcf
preHeatError
...
correction of preHeatError detection
2018-09-27 04:23:00 +02:00
Robert Pelnar
c2f535b619
Filament sensor - fix invalid calculation of fsensor_counter in LA stepper.
...
+decreased additional check sensitivity/sctrictness
2018-09-26 18:59:07 +02:00
Marek Bel
0e33db0064
Documentation: Put scattered and unscattered Gcode documentation together in process_commands documentation. Mention at least existence of all implemented commands. Document T<n> and T? commands.
2018-09-26 18:55:31 +02:00
PavelSindler
e6a00b8f53
send busy messages when checking for filament presence
2018-09-25 19:14:57 +02:00
Marek Bel
4151e19781
Remove attribute packed. It is not needed on 8-bit platform. Change of platform would be detected by static_assert (sizeof(M500_conf) == 188).
2018-09-25 16:27:20 +02:00
Marek Bel
d80fcab66c
Disable filament sensor response quality check.
2018-09-25 15:50:50 +02:00
Marek Bel
19c1ba6274
Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch.
2018-09-25 14:25:03 +02:00
Marek Bel
ccfcc6f989
Document.
2018-09-24 18:32:01 +02:00
Marek Bel
3662f60f8f
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values;
2018-09-24 18:13:20 +02:00
Marek Bel
c38fef281d
Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore.
2018-09-24 17:33:58 +02:00
Marek Bel
ca179a2d18
Use cs.filament_size from ConfigurationStore.
2018-09-24 17:29:02 +02:00
Marek Bel
e225e9cab0
Use cs.volumetric_enabled from ConfigurationStore.
2018-09-24 17:12:16 +02:00
Marek Bel
a201128b20
Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore.
2018-09-24 17:10:25 +02:00
Marek Bel
7e593e6922
Use cs.autoretract_enabled from ConfigurationStore.
2018-09-24 17:03:10 +02:00
Marek Bel
20ba2b1c79
Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore.
2018-09-24 16:57:48 +02:00
Marek Bel
54bcc8aa52
Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore.
2018-09-24 16:54:50 +02:00
Marek Bel
f2ae3fb1f7
Use cs.zprobe_zoffset from ConfigurationStore.
2018-09-24 16:47:57 +02:00
Marek Bel
959d0069fa
Use cs.add_homing from ConfigurationStore.
2018-09-24 16:42:28 +02:00
Marek Bel
ac7c062161
Use cs.max_jerk from ConfigurationStore.
2018-09-24 16:35:33 +02:00
Marek Bel
bb66bfe6a7
Use cs.minsegmenttime from ConfigurationStore.
2018-09-24 16:22:50 +02:00
mkbel
0e7afc67ca
Merge pull request #1175 from PavelSindler/eeprom_version
...
M500 EEPROM version update and M500 EEPROM block size check
2018-09-24 16:19:55 +02:00
Marek Bel
10428b30d9
Use cs.mintravelfeedrate from ConfigurationStore.
2018-09-24 16:01:58 +02:00
PavelSindler
cd438c5c00
whitespace
2018-09-24 16:01:31 +02:00
PavelSindler
740e922b87
EEPROM M500 block size check for reading stored data added
2018-09-24 16:00:23 +02:00
Marek Bel
26e2fd1c76
Use cs.minimumfeedrate from ConfigurationStore.
2018-09-24 15:57:24 +02:00
Marek Bel
b8fefceb4d
Use cs.retract_acceleration from ConfigurationStore.
2018-09-24 15:53:35 +02:00
Marek Bel
7dbe0afdc4
Use cs.acceleration from ConfigurationStore.
2018-09-24 15:47:36 +02:00
Marek Bel
cee51cf9c3
Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore.
2018-09-24 15:40:35 +02:00
Marek Bel
02becb5e6a
Use cs.max_feedrate_normal from ConfigurationStore.
2018-09-24 15:09:19 +02:00
PavelSindler
053b94b711
remove "start" duplicity in setup
2018-09-24 14:57:46 +02:00
Marek Bel
3f28632443
Use cs.axis_steps_per_unit from ConfigurationStore.
2018-09-24 14:54:41 +02:00
Marek Bel
d611cad087
Temporary hide M500_conf cs to allow automated renaming.
2018-09-24 14:42:01 +02:00
Marek Bel
e94dc1341a
Use M500_conf cs in Config_ StoreSettings, RetrieveSettings and ResetDefault.
2018-09-24 14:34:43 +02:00
Marek Bel
991db0e71d
Finish default_conf.
2018-09-23 23:36:01 +02:00
Marek Bel
d9e2dcc736
Incomplete.
2018-09-23 22:21:28 +02:00
Marek Bel
58af1ae4c4
Add configuration store struct.
2018-09-21 20:52:44 +02:00
PavelSindler
d8dc2eef7a
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; eeprom_version changed back to V2
2018-09-21 15:42:28 +02:00
PavelSindler
1c33b673c0
comment update
2018-09-19 18:43:27 +02:00
PavelSindler
3d57d504ba
Merge pull request #1174 from mkbel/fix_runout_resume
...
Fix runout resume
2018-09-19 18:29:32 +02:00
Marek Bel
2607a0c4ed
Update documentation.
2018-09-19 17:22:06 +02:00
Marek Bel
b92b307ee8
Make variables constant.
2018-09-19 17:21:45 +02:00
Marek Bel
cce8131070
Add missing s for seconds of print time.
2018-09-19 17:20:41 +02:00
Marek Bel
b5bb40474d
Fix print time overflow.
2018-09-19 17:17:32 +02:00
PavelSindler
0a5394a20e
defines moved to eeprom.h
2018-09-19 15:10:10 +02:00
PavelSindler
752aec37fb
M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored
2018-09-19 14:36:26 +02:00
Marek Bel
9868dd766e
Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out.
2018-09-19 14:22:08 +02:00
Marek Bel
a5a7b1f1d6
Move functions definitions behind variable definitions. (No change in functionality.)
2018-09-19 14:08:31 +02:00
Marek Bel
05d3b7032d
Update documentation.
2018-09-18 17:48:11 +02:00
Marek Bel
a7fdfdd258
Put repetitive code into separate function. No change in functionality.
2018-09-18 17:15:13 +02:00
Marek Bel
6ee97468ee
Remove lcd_buttons_update() call from all other places than interrupt. There is no known reason, why lcd_buttons_update() should be called from multiple places and multiple contexts. Remove mutex, which is not needed anymore, and wasn't implemented properly anyway (Operation was not atomic.).
2018-09-18 16:05:49 +02:00
Marek Bel
f532da4b17
Remove duplicate button debouncing code. Save 254B flash.
2018-09-18 14:39:01 +02:00
Marek Bel
90a10a692a
Enable button debouncing also in modal mode (!lcd_update_enabled). In lcd_clicked() consume click event immediately.
2018-09-18 14:38:50 +02:00
Marek Bel
ab2d350ed1
Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament.
2018-09-17 21:23:13 +02:00
Marek Bel
a687b8e64a
Don't enable lcd update inside mmu_eject_filament().
2018-09-17 17:12:36 +02:00
Marek Bel
f496076508
Remove redundant code. No change in functionality.
2018-09-14 18:33:03 +02:00
Marek Bel
635a1b4cd8
Add possibility to to select preheat temperature when unloading filament in first layer calibration wizard.
...
Known limitations:
During filament eject, menu is shown for some moment.
2018-09-14 18:29:14 +02:00
Marek Bel
fe30e58fb5
Add possibility to unload filament from wizard before first layer calibration, if it is not PLA.
...
Known limitations:
Preheat temperature other than PLA can not be selected.
During filament eject, menu is shown for some moment.
2018-09-14 16:06:25 +02:00
Marek Bel
d14822b22f
Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory.
2018-09-13 16:37:41 +02:00
Marek Bel
8235f0f869
Merge branch 'MK3_dev' into add_cancel
2018-09-12 19:38:26 +02:00
Marek Bel
7bc46323e2
Update pause print documentation.
2018-09-12 18:35:26 +02:00
Marek Bel
de2100ac7b
Merge branch 'MK3' into MK3_dev
2018-09-12 15:22:12 +02:00
PavelSindler
0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
...
lang fix
2018-09-12 09:38:18 +02:00
PavelSindler
45066ebddc
lang fix
2018-09-12 09:37:16 +02:00
PavelSindler
30d54be9de
Merge pull request #1142 from PavelSindler/lang2
...
changed version
2018-09-12 09:20:32 +02:00
PavelSindler
298950e601
changed version
2018-09-12 09:19:23 +02:00
Robert Pelnar
3e84bf6341
Lang update (translation + increased reserved space)
2018-09-12 02:45:13 +02:00
Marek Bel
13b67f0e0a
Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU.
2018-09-11 22:33:13 +02:00
Marek Bel
ada7cffd32
Open menu to select filament before first layer calibration if MMU unit is present.
2018-09-11 19:53:29 +02:00
PavelSindler
96aada9061
load filament messages, czech language missing translation readded
2018-09-11 18:25:38 +02:00
Marek Bel
5649d6c3c0
Precede active filament on status screen with letter F.
2018-09-11 17:27:10 +02:00
Marek Bel
98264808dc
Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5".
2018-09-11 17:16:13 +02:00
Marek Bel
46df46f482
Add possibility to use other filaments in LCD_COMMAND_V2_CAL.
2018-09-11 17:03:20 +02:00
Marek Bel
19a1ccdc76
Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.
2018-09-11 16:51:00 +02:00
Marek Bel
6c6354b2cb
Do not preheat nozzle before loading filament to MMU in first layer calibration wizard.
...
Show insert PLA filament to the first tube of MMU instead of "to the extruder".
First layer calibration wizard with MMU is now functional. But there is no option to unload filament from wizard.
2018-09-11 16:03:46 +02:00
Marek Bel
0fcd2cf2a1
Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal
2018-09-11 15:26:35 +02:00
PavelSindler
d9a2fe70ec
missing declaration fix
2018-09-11 11:06:37 +02:00
PavelSindler
c023fb12d5
add choose filament messages
2018-09-11 09:50:50 +02:00
PavelSindler
90e3ae5464
Merge pull request #1127 from XPila/MK3
...
Lang update, french translation
2018-09-11 09:44:02 +02:00
Robert Pelnar
4ca300bc39
Lang update, french translation
...
+resized reserved space
2018-09-11 03:43:05 +02:00
Marek Bel
b3bc71b45b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-09-10 23:52:51 +02:00
PavelSindler
25a46557d1
merge with upstream
2018-09-10 22:11:32 +02:00
PavelSindler
8a9f066c1b
choose_extruder_menu: extruder -> filament
2018-09-10 22:09:37 +02:00
Marek Bel
cc08d660f7
Always use filament 1 for first layer calibration when MMU is present.
...
Lift Z when moving from intro line to meander.
For MMU, print longer intro line to allow load to nozzle.
2018-09-10 20:55:50 +02:00
PavelSindler
1bb9e9ed92
MMU_DEBUG
2018-09-10 20:39:28 +02:00
PavelSindler
6fa798aa83
init
2018-09-10 20:08:13 +02:00
PavelSindler
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
Marek Bel
764e5c9769
Merge branch 'MK3' into MK3_dev
2018-09-09 22:52:01 +02:00
Marek Bel
5a6ef00cfc
Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position.
2018-09-07 10:50:23 +02:00
Marek Bel
ebfbf4ac3f
Merge branch 'MK3' into MK3_dev
2018-09-07 09:24:45 +02:00
mkbel
cbc506c379
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
...
lcd_clicked() fix (PFW-534 and PFW-546)
2018-09-07 09:07:03 +02:00
Marek Bel
001680bbdc
Merge branch 'MK3' into time_remaining_fix
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
mkbel
801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining
...
MK25: always show "normal mode" remaining time (PFW-553)
2018-09-07 08:05:16 +02:00
PavelSindler
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
PavelSindler
66305b3e04
MK25: always show "normal mode" remaining time
2018-09-06 23:05:36 +02:00
PavelSindler
48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev
...
Merge MK3 into Mk3_dev
2018-09-06 21:01:29 +02:00
PavelSindler
dbc0654b1c
Merge pull request #1108 from mkbel/pause_print
...
Pause print
2018-09-06 21:01:16 +02:00
PavelSindler
48f5da9cb8
lcd_clicked fix
2018-09-06 20:54:51 +02:00
Marek Bel
0e50c388af
Save 1K flash memory.
2018-09-06 15:06:46 +02:00
Marek Bel
0d99dc0a3f
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-06 15:06:33 +02:00
Marek Bel
5d1e59cec3
Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished.
2018-09-06 13:20:24 +02:00
Marek Bel
0fe48de4af
Remove feedmultiplyBckp global variable. Remove redundant isPrintPaused = true assignment, as it is already done in lcd_pause_print(). Remove unused saved_feedmultiply and fanSpeedBckp prototypes. Move isPrintPaused = true assignment to safer location, as LCD_COMMAND_LONG_PAUSE is not reached if lcd_commands_type is not LCD_COMMAND_IDLE.
2018-09-06 12:23:21 +02:00
Marek Bel
05a0b9c939
Remove fanSpeedBckp global variable.
2018-09-06 11:41:44 +02:00
Marek Bel
40990c4deb
Remove saved_feedmultiply global variable.
2018-09-06 11:30:06 +02:00
Marek Bel
b43c8dad74
Remove HotendTempBckp global variable.
2018-09-06 10:05:59 +02:00
Marek Bel
d71311f13f
Remove redundant HotendTempBckp from crash detection recover.
2018-09-06 09:41:37 +02:00
Marek Bel
920d828833
Rename lcd_sdcard_pause() to lcd_pause_print() to reflect, that also USB printing could be possible to pause. Unite it with pause_print() and use new (immediate) pause mechanism in all places where old mechanism was used. Rename resume_print() to lcd_resume_print() and make it global, unite it with lcd_sdcard_resume() and use it also in place, where lcd_commands_type = LCD_COMMAND_LONG_PAUSE_RESUME was used. Remove LCD_COMMAND_LONG_PAUSE_RESUME lcd_command_type. Remove unused pause_lastpos[].
2018-09-06 08:43:54 +02:00
Marek Bel
67b2456ad9
Merge branch 'MK3' into MK3_dev
2018-09-05 21:48:29 +02:00
Marek Bel
74be7677cf
Fix problem, that current_position is rewritten after long_pause() call.
2018-09-05 21:10:05 +02:00
Marek Bel
4b47a74d1d
Remove unused declarations from tmc2130.cpp. Move used declaration to Marlin.h.
2018-09-05 18:14:32 +02:00
PavelSindler
ed43913c5c
Merge pull request #1099 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-09-05 16:53:51 +02:00
PavelSindler
40679dcb3a
Merge branch 'MK3' into MK3
2018-09-05 00:06:48 +02:00
Marek Bel
a5db084b70
Move resuming nozzle temperature to restore_print_from_ram_and_continue().
...
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 14:56:20 +02:00
MRprusa3d
35cf3f3a61
Time info
...
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
Marek Bel
2abd2a6cab
Resume print fan.
...
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 11:13:51 +02:00
Marek Bel
acef0578a5
Don't move before reaching nozzle temperature when resuming the print.
...
Known limitations: Doesn't resume print fan. Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 10:07:52 +02:00
Marek Bel
d54e629950
Retract, lift Z, move away in XY, disable fan and nozzle heating. Resume nozzle heating.
...
Known limitations: Doesn't wait for nozzle temperature reaching set temperature before moving to print area. Doesn't resume print fan. Unused code not removed.
2018-09-04 08:53:27 +02:00
Marek Bel
af08e16426
Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h.
...
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
2018-09-04 08:13:56 +02:00
Marek Bel
63a215b0c3
Remove unused variable chars.
2018-09-03 20:48:03 +02:00
Marek Bel
cbf633cfd4
Remove unused variable chars.
2018-09-03 20:47:12 +02:00
Marek Bel
c95b463e0b
Remove unused variable yes. Remove redundant tmp_extruder assignment.
2018-09-03 20:44:40 +02:00
Marek Bel
517fbb66bf
Save 1K flash memory.
2018-09-03 20:00:46 +02:00
Marek Bel
d796df3f14
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-03 17:32:42 +02:00
Marek Bel
e5c0e26601
Merge branch 'MK3' into MK3_dev
2018-08-30 19:05:24 +02:00
Marek Bel
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
PavelSindler
ed49e5187b
version changed
2018-08-30 11:35:06 +02:00
PavelSindler
d96b0d5f32
linearity correction define added (menu readded)
2018-08-30 11:28:12 +02:00
MRprusa3d
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
PavelSindler
b2c94f36cc
removed unused "out of range" function
2018-08-29 14:41:39 +02:00
PavelSindler
8a453e65f8
eject filament allowed only when nozzle is hot (there can be filament loaded in printer nozzle)
2018-08-29 13:16:17 +02:00
PavelSindler
b284c70d9b
auto deplete: dont eject filament
2018-08-29 13:08:09 +02:00
PavelSindler
515e78cfd1
Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament
2018-08-29 01:58:28 +02:00
PavelSindler
b9808354c4
Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder
2018-08-28 23:53:35 +02:00
PavelSindler
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament
...
Fix active filament PFW-528
2018-08-28 23:50:57 +02:00
PavelSindler
705f098b1c
eject filament: initial version
2018-08-28 23:50:31 +02:00
Marek Bel
2cd8691376
Do not use global variable tmp_extruder when setting temperature.
2018-08-28 20:26:33 +02:00
MRprusa3d
0695f3f345
Z-move correction
...
Z-move inhibition after FactoryReset
2018-08-28 19:58:03 +02:00
Marek Bel
8aeb7e04f1
Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle().
2018-08-28 18:52:16 +02:00
Marek Bel
55eaa1de83
Fix code indentation.
2018-08-28 18:26:10 +02:00
Marek Bel
9fb68fb724
Remove usage of global variable tmp_extruder in M200.
2018-08-28 18:08:21 +02:00
mkbel
5ad2fdaaaa
Merge pull request #1080 from PavelSindler/M600_change_extruder
...
removed redundant code
2018-08-28 17:36:50 +02:00
Marek Bel
adde0d3944
Merge branch 'prusa3d_MK3' into MK3_dev
2018-08-28 17:31:12 +02:00
MRprusa3d
d3869bd857
Z-endstop @ MK3
...
add show P.I.N.D.A. state menu item @ CalibrationMenu
2018-08-28 16:12:59 +02:00
Marek Bel
9a14daab06
Revert "Split settings menu into separate functions."
...
Original commit wont work, as intended as MENU_ITEM_* macros contain return statement.
2018-08-28 16:03:07 +02:00
PavelSindler
27bd31e255
removed redundant code
2018-08-28 11:26:35 +02:00
PavelSindler
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
PavelSindler
755baddb54
Merge branch 'MK3' into fix_unable_to_compile
2018-08-28 10:57:19 +02:00
Marek Bel
72cd0d26f9
Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu.
2018-08-27 21:08:40 +02:00
Marek Bel
dd39976176
Merge remote-tracking branch 'pavel/fix_unable_to_compile' into fix_unable_to_compile
2018-08-27 21:06:35 +02:00
Marek Bel
7aadb2f660
Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P
2018-08-27 20:57:57 +02:00
Marek Bel
9611401b69
Fix mmu_M600_load_filament increments tmp_extruder, which is not set in case of automatic == true.
2018-08-27 20:23:43 +02:00
Marek Bel
2a00e5d348
Fix loading filament screen hangs if changed automatically.
2018-08-27 20:09:22 +02:00
Marek Bel
b08ae95568
Rename autoDeplete to lcd_autoDeplete and make it global. When filament runs out, call M600 AUTO if lcd_autoDeplete is enabled. Shorten finda polling period to 300 ms.
2018-08-27 19:36:54 +02:00
Marek Bel
1cdb7a48cb
Show auto deplete only when mmu unit present.
2018-08-27 16:24:21 +02:00
Marek Bel
8279aba4d7
Add auto deplete setting.
2018-08-27 16:15:46 +02:00
PavelSindler
191e5dfddd
mmu M600: dont use change extruder posibility; unload starts always imidiately
2018-08-27 16:12:10 +02:00
Marek Bel
f02b0d80e3
Split settings menu into separate macros.
2018-08-27 15:48:09 +02:00
PavelSindler
2b32b41969
MK2.5 build error hotfix
2018-08-27 05:53:39 +02:00
PavelSindler
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
...
Mmu filament sensor
2018-08-27 05:26:12 +02:00
PavelSindler
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix
...
M600 mmu fix
2018-08-27 05:26:00 +02:00
PavelSindler
5d3eff6aea
Merge pull request #1072 from PavelSindler/manage_response
...
mmu timeout update: no need to press knob on printer
2018-08-27 05:25:50 +02:00
PavelSindler
c1ce07c463
Merge pull request #1071 from PavelSindler/feedrate_limit
...
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
2018-08-27 05:25:41 +02:00
PavelSindler
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
PavelSindler
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
PavelSindler
ac3b92bade
commentary fix
2018-08-26 23:55:29 +02:00
PavelSindler
d3ed270a5a
single material printer (no mmu unit) M600 hotfix: M600_check_state loop working
2018-08-26 23:52:45 +02:00
PavelSindler
b13ff8e424
Wait for ok after U0 (unload current filament) command.
2018-08-26 22:08:52 +02:00
PavelSindler
4b1f1bc6a6
mmu timeout update: no need to press knob on printer to recover paused print
2018-08-26 21:39:37 +02:00
PavelSindler
5769b758ee
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
2018-08-26 16:50:28 +02:00
PavelSindler
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
PavelSindler
c57fdb11b7
show active extruder: numbers corrected
2018-08-26 14:22:52 +02:00
PavelSindler
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
...
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
PavelSindler
cf83852d22
Merge pull request #1068 from PavelSindler/M600_fix
...
M600 fix: remove unretract
2018-08-25 20:02:30 +02:00
PavelSindler
ddcdfce356
Merge pull request #1069 from PavelSindler/mmu_timeout
...
5 minutes mmu timeout
2018-08-25 20:02:12 +02:00
PavelSindler
0929a35a4f
5 minutes mmu timeout
2018-08-25 17:21:17 +02:00
PavelSindler
815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2
...
Fix linearity correction 2
2018-08-25 16:56:40 +02:00
PavelSindler
255cd2f34e
Merge pull request #1056 from mkbel/prdel
...
Reserve space for MENU_ITEM_EDIT_int3_P in shared memory
2018-08-25 16:55:56 +02:00
PavelSindler
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
PavelSindler
1f5bece0db
check for required mmu2 firmware buildnr
2018-08-25 16:15:35 +02:00
Marek Bel
6b7e47d730
Merge branch 'MK3' into MK3_dev
2018-08-24 22:21:08 +02:00
Marek Bel
5fe6a3ed1c
Place similar functions together.
2018-08-24 22:04:48 +02:00
Marek Bel
ea88dea432
Fix memory overwrite.
2018-08-24 21:24:14 +02:00
Marek Bel
085c77effb
Fix when value edited, other values appeard as +1.000 instead of [off].
2018-08-24 20:38:07 +02:00
Marek Bel
df61172984
Fix linearity correction not saved and applied when menu was left by timeout.
2018-08-24 20:31:49 +02:00
PavelSindler
32723d8d6f
whitespace
2018-08-24 20:30:44 +02:00
Marek Bel
46a3baac57
Add menu_item_edit_P<uint8_t*> specialization to be used for linearity correction. Works well, but costs about 600..700B of FLASH, needs to be optimized.
2018-08-24 20:06:09 +02:00
PavelSindler
0c80eca648
merge with upstream
2018-08-24 18:30:03 +02:00
PavelSindler
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
Marek Bel
5a7c9e3ffd
Make local functions static. Saves 30B of flash with Arduino 1.6.9. No difference with Arduino 1.8.5.
2018-08-24 18:00:05 +02:00
Marek Bel
5daae818e1
Convert menu_item_edit to template function.
2018-08-24 17:40:40 +02:00
PavelSindler
e6ac75f6a1
Merge pull request #1061 from mkbel/MK3_dev
...
Merge branch 'MK3' into MK3_dev
2018-08-24 16:27:07 +02:00
Marek Bel
ac5cb0989e
Uncomment linearity correction menu. Fix return from linearity correction menu.
2018-08-24 16:00:51 +02:00
Marek Bel
050a7c41d0
Fix "Check MMU. Fix the issue and then press button on MMU unit." shown instead of "Loading filament 1".
2018-08-24 03:49:51 +02:00
Marek Bel
0de7668bac
Remove usage of global variable tmp_extruder in M200.
2018-08-23 23:34:50 +02:00
Marek Bel
3c9047c9cd
Remove usage of global variable tmp_extruder in mmu_M600_load_filament. For automatic load filament, use mmu_extruder value as filament previously selected.
2018-08-23 23:34:45 +02:00
Marek Bel
54138407dd
Encapsulate MMU internal state.
2018-08-23 23:34:38 +02:00
Marek Bel
f1c51502fd
Merge branch 'MK3' into MK3_dev
2018-08-23 23:28:20 +02:00
Marek Bel
142bf28dc2
Clear communication buffer when sending load filament command to MMU.
...
This fixes PFW-517 in the moment, when the problem with not displaying "Loading filament 1" to "Loading filament 5" has appeared for the first time.
2018-08-23 22:05:56 +02:00
MRprusa3d
5dc2af961b
ShippingPrepare & M600
...
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
Marek Bel
3780516f74
PFW-512 Reserve space for MENU_ITEM_EDIT_int3_P in shared memory in lcd_tune_menu().
2018-08-22 19:47:29 +02:00
Marek Bel
07d07831f1
Add portability note.
2018-08-22 19:40:12 +02:00
Marek Bel
bb5ac93921
Add missing compile time check for ShortTimer fitting into menu_data. Convert preprocessor checks to shorter and more accurate static_assert. Remove redundant macro MENU_DATA_EDIT_SIZE. Decrease scope of menu_stack and asociated macro. No functional change.
2018-08-22 18:55:42 +02:00
PavelSindler
3477f84143
Merge pull request #1055 from XPila/MK3
...
MMU - communication fix + active extruder status
2018-08-22 16:48:09 +02:00
Robert Pelnar
dfb4bfac5b
MMU - display status while switching active extruder [PFW-465]
2018-08-22 16:38:34 +02:00
MRprusa3d
a1190e9a22
Merge pull request #1052 from PavelSindler/mmu_v2
...
fixes and improvements for multimaterial
2018-08-22 14:28:33 +00:00
Robert Pelnar
7836742621
MMU communication fix - WD reset inside manage_response
2018-08-22 16:19:57 +02:00
PavelSindler
9210ab12a9
Merge pull request #1053 from mkbel/MK3
...
Hot fix PFW-505 Speed change after tuning (on USB).
2018-08-22 16:19:08 +02:00
Marek Bel
fe43791673
Merge branch 'MK3' into MK3_dev
2018-08-22 16:17:10 +02:00
PavelSindler
a81b8dbd61
remove manage_heater
2018-08-22 16:09:38 +02:00
Marek Bel
ef6188cd59
Hot fix PFW-505 Speed change after tuning (on USB).
...
When encoder is rotated left and pushed immediately on status screen, after returning to status screen print speed jumps to 345%.
This is caused by downcasting signed lcd_encoder to unsigned position and back to signed lcd_encoder.
2018-08-22 16:09:19 +02:00
PavelSindler
d2aeb40bee
manage response function update
2018-08-22 15:46:36 +02:00
PavelSindler
f99196a7a0
fix reseting during filament change
2018-08-22 11:09:12 +02:00
Marek Bel
3b3d6ab472
Merge branch 'MK3' into MK3_dev
2018-08-21 17:56:34 +02:00
Robert Pelnar
315bfc43dd
MMU communication fix
2018-08-21 16:41:01 +02:00
Robert Pelnar
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +02:00
Robert Pelnar
1cd0c6cfea
Status screen - print active MMU exrtuder (1/2 PFW465)
2018-08-20 00:59:36 +02:00
Robert Pelnar
c4281b0b36
Status screen redesign - fix of flickering and text wraping on status screen
...
printf formating, saved flash, reduced code size
2018-08-20 00:27:45 +02:00
Robert Pelnar
fd9516f520
Status screen - status message logic simplification
...
added definitions of custom_message_type values
removed flag custom_message (previous solution maybe caused displaying of empty status line)
fixed in Marlin_main.cpp code "custom_message = _T(MSG_TEMP_CALIBRATION)"
2018-08-19 18:34:57 +02:00
Robert Pelnar
f1ad1d22ba
Menu lcd_adjust_bed fixed (Bed level correction, PFW-499)
2018-08-19 13:59:33 +02:00
Marek Bel
cc0249126a
Document fsensor_update, remove disabled code.
2018-08-15 21:36:23 +02:00
MRprusa3d
01e71286f7
Merge pull request #1028 from mkbel/refactor_settings
...
Split settings menu into separate functions.
2018-08-15 15:42:02 +00:00
Marek Bel
6c387384c7
Fix compiler warnings: sketch/Marlin.h:366:35: warning: large integer implicitly truncated to unsigned type [-Woverflow]
...
#define PRINT_TIME_REMAINING_INIT 0xffffffff
sketch/Marlin_main.cpp:8814:21: note: in expansion of macro 'PRINT_TIME_REMAINING_INIT'
uint16_t print_t = PRINT_TIME_REMAINING_INIT;
sketch/Marlin_main.cpp:8817:15: warning: comparison is always true due to limited range of data type [-Wtype-limits]
if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100 * print_t / feedmultiply;
2018-08-13 19:43:37 +02:00
Marek Bel
ac62117d6b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-13 19:38:55 +02:00
Robert Pelnar
a11ae18f7e
XYZ calibration fix (progmem constants declaration) + version changed
2018-08-13 14:55:31 +02:00
Robert Pelnar
b7f17292ca
Version changed
2018-08-10 20:08:10 +02:00
Robert Pelnar
8409a26594
Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep)
2018-08-10 19:55:50 +02:00
Robert Pelnar
b16fec956c
Enabled pullup for RX2 pin (it prevents uart2 from rx buffer overflow in case of disconnected MMU)
2018-08-10 16:20:53 +02:00
Marek Bel
95e7536955
Split settings menu into separate functions.
2018-08-10 15:19:35 +02:00
Robert Pelnar
923a06c164
menu data shared memory re-design
...
+code cleaning
2018-08-10 02:59:49 +02:00
Marek Bel
d94a1c5952
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-09 21:26:33 +02:00
Robert Pelnar
9ee7a2124b
removed unused code
2018-08-09 18:43:07 +02:00
Robert Pelnar
796079bb08
MMU2 communication - connection after reset, fw versions, state machine
...
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
Robert Pelnar
10cc077ee4
mmu_enabled = true removed
2018-08-08 21:05:25 +02:00
Robert Pelnar
4e32fb7181
removed '!' signalization when accel/feedrate limits reached
2018-08-08 20:23:13 +02:00
Robert Pelnar
310751397c
line endings + fixed declaration
2018-08-08 20:11:57 +02:00
Robert Pelnar
990a5c9119
PFW489 (github issue 1008) - time remaining variables declared as uint32
2018-08-08 19:51:50 +02:00
Robert Pelnar
2f17997622
reset safety timer everytime lcd clicked
2018-08-08 19:33:44 +02:00
Robert Pelnar
ca25ec90bd
Disabled timeouts in support and failstats menus
2018-08-08 19:28:34 +02:00
Robert Pelnar
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
XPila
290328445a
Merge pull request #1019 from mkbel/MK3_fix6
...
Mk3 fix6
2018-08-08 18:38:20 +02:00
XPila
c2f098e263
Merge pull request #1015 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-08-08 18:37:57 +02:00
Robert Pelnar
9e09efc9f4
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
conflicts + fix
2018-08-07 20:55:08 +02:00
Robert Pelnar
71f1a1f6db
MMU - communication, check after start, code cleaning
2018-08-07 20:37:59 +02:00
Marek Bel
5493ac57f9
Fix declaration and definition type mismatch of lcd_change_fil_state. Move declaration to Marlin.h.
2018-08-07 20:15:04 +02:00
Marek Bel
10ba3e7ffd
Move global variable count_position declaration to stepper.h header file.
2018-08-07 20:12:37 +02:00
mkbel
cda93906bc
Merge pull request #1018 from prusa3d/MK3
...
Merge MK3 into MK3_dev
2018-08-07 20:09:09 +02:00
mkbel
4cc127feac
Merge pull request #817 from 3d-gussner/MK3_fix6
...
Fix MK3 compilation issue with Arduino 1.8.x
2018-08-07 20:02:52 +02:00
Marek Bel
7e19b4adc1
Supress compiler warning sketch/Marlin_main.cpp:3079:6: warning: unused parameter 'e_shift_late' [-Wunused-parameter]. Make function static. Fix indentation.
2018-08-07 19:17:29 +02:00
Marek Bel
814d31d70d
Remove factory_reset() unused quiet parameter and make it static. It was tested, that both calls of factory reset (from menu and via PRUSA FR command) works somehow. Fix compiler warning: sketch/Marlin_main.cpp:808:6: warning: unused parameter 'quiet' [-Wunused-parameter]
2018-08-07 18:50:11 +02:00
Marek Bel
791b568339
Fix compiler warnings: sketch/uart2.c:19:33: warning: unused parameter 'stream' [-Wunused-parameter]
...
sketch/uart2.c:28:25: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/Marlin_main.cpp:925:5: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/lcd.cpp:224:5: warning: unused parameter 'stream' [-Wunused-parameter]
2018-08-07 17:51:30 +02:00
Marek Bel
4395ec207e
Fix compiler warnings: sketch/xyzcal.cpp:111:10: warning: unused parameter 'nd' [-Wunused-parameter]
...
sketch/xyzcal.cpp:111:10: warning: unused parameter 'dd' [-Wunused-parameter]
2018-08-07 17:32:27 +02:00
Marek Bel
78f1a7914f
Fix compiler warning: sketch/xyzcal.cpp:90:6: warning: unused parameter 'de' [-Wunused-parameter].
2018-08-07 16:45:19 +02:00
Marek Bel
9271d12bf7
Save 32B of FLASH, fix compiler warning: sketch/tmc2130.cpp:238:6: warning: unused parameter 'last_step_mask' [-Wunused-parameter].
2018-08-07 16:32:32 +02:00
Marek Bel
5af4897360
Fix compiler warning sketch/stepper.cpp:1553:6: warning: unused parameter 'driver' [-Wunused-parameter]
2018-08-07 16:05:06 +02:00
Marek Bel
880ed67785
Fix compiler warning: sketch/stepper.cpp:1499:6: warning: unused parameter 'address' [-Wunused-parameter].
2018-08-07 16:00:35 +02:00
Marek Bel
e06e19edf5
Fix showing calibration results.
...
Messages:
_i("XYZ calibration failed. Bed calibration point was not found.")
_T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
_i("XYZ calibration failed. Front calibration points not reachable.")
_i("XYZ calibration failed. Right front calibration point not reachable.")
_i("XYZ calibration failed. Left front calibration point not reachable.");
were never shown.
Fix compiler warnings:
sketch/ultralcd.cpp:3476:19: warning: comparison is always false due to limited range of data type [-Wtype-limits]
sketch/ultralcd.cpp:3478:26: warning: comparison is always false due to limited range of data type [-Wtype-limits]
2018-08-07 15:46:23 +02:00
Marek Bel
c0f37efbad
Save 278B of flash. Remove unused function parameters. Make functions static. Fix compiler warnings:
...
sketch/ultralcd.cpp:292:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:292:6: warning: unused parameter 'filename' [-Wunused-parameter]
sketch/ultralcd.cpp:344:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:364:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:385:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:6920:6: warning: unused parameter 'longFilename' [-Wunused-parameter]
sketch/ultralcd.cpp:6965:6: warning: unused parameter 'longFilename' [-Wunused-parameter]
2018-08-07 15:29:58 +02:00
Marek Bel
cf069f3fc2
Fix compiler warning sketch/ultralcd.cpp:53:31: warning: missing initializer for member 'MenuData::BabyStep::babystepMem' [-Wmissing-field-initializers]
2018-08-07 15:07:51 +02:00
Marek Bel
453b199057
Save 8B flash, fix compiler warning sketch/sound.cpp:62:6: warning: unused parameter 'eSoundClass' [-Wunused-parameter]
2018-08-07 15:05:18 +02:00
Marek Bel
548f4cb1fa
Fix compiler warning sketch/mmu.cpp:32:6: warning: unused parameter 'extr' [-Wunused-parameter]
2018-08-07 15:01:49 +02:00
Marek Bel
4c146a5b2c
Fix compiler warning: sketch/mesh_bed_leveling.cpp:24:6: warning: unused parameter 'use_default' [-Wunused-parameter].
2018-08-07 14:44:53 +02:00
Marek Bel
aa0f1fd80b
Fix compiler warnings sketch/mesh_bed_calibration.cpp:150:21: warning: unused parameter 'npts' [-Wunused-parameter]
...
sketch/mesh_bed_calibration.cpp:172:21: warning: unused parameter 'npts' [-Wunused-parameter]
2018-08-07 14:20:51 +02:00
Marek Bel
e9d8ed8599
Fix compiler warning: sketch/mesh_bed_calibration.cpp:1057:13: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
2018-08-07 13:58:06 +02:00
Marek Bel
0d35451544
Fix compiler warning: sketch/mesh_bed_calibration.cpp:966:13: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
2018-08-07 13:00:22 +02:00
Marek Bel
523c9cd737
Fix compiler warning: sketch/mesh_bed_calibration.cpp:205:34: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
2018-08-07 12:58:15 +02:00
Marek Bel
95d13cbb59
Fix compiler warning: sketch/mesh_bed_calibration.cpp:135:20: warning: unused parameter 'i' [-Wunused-parameter]
2018-08-07 12:52:51 +02:00
Marek Bel
7364b6cf80
Do not compare signed value with unsigned, add parentheses.
2018-08-07 12:52:51 +02:00
Marek Bel
2e719c7885
Fix stack corruption for folder name longer than 12 characters. Save 260B of flash memory. Move duplicate code to separate method. Fix compiler warnings: sketch/cardreader.cpp:448:25: warning: ordered comparison of pointer with integer zero [-Wextra]
...
sketch/cardreader.cpp:453:22: warning: ordered comparison of pointer with integer zero [-Wextra]
2018-08-07 12:52:51 +02:00
Marek Bel
7a6cbf75b9
Fix compiler warnings: sketch/cardreader.cpp: In member function 'void CardReader::openFile(const char*, bool, bool)':
...
sketch/cardreader.cpp:350:25: warning: ordered comparison of pointer with integer zero [-Wextra]
sketch/cardreader.cpp:355:22: warning: ordered comparison of pointer with integer zero [-Wextra]
2018-08-07 12:52:51 +02:00
Marek Bel
5f4380cafb
Remove unused function, fix compiler warning: sketch/Marlin_main.cpp:8994:6: warning: unused parameter 'extruder' [-Wunused-parameter]
2018-08-07 12:52:51 +02:00
Marek Bel
30438833c6
Fix compiler warning sketch/Marlin_main.cpp:6584:19: warning: comparison is always true due to limited range of data type [-Wtype-limits]
2018-08-07 12:52:51 +02:00
Marek Bel
72cfa1b124
Fix 4 compiler warnings of type: sketch/planner.cpp:872:59: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
2018-08-07 12:52:51 +02:00
Marek Bel
55a47d57da
Fix compiler warning: sketch/Marlin.h:151:25: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
2018-08-07 12:52:51 +02:00
Marek Bel
ceac1e07bd
Merge branch 'MK3' into MK3_dev
2018-08-06 16:26:38 +02:00
PavelSindler
702a2e1883
Merge pull request #1004 from mkbel/fix_XYhoming_direction
...
Obey defined X and Y homing direction.
2018-08-05 20:18:30 +02:00
PavelSindler
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
PavelSindler
0c2d0bebce
merge with upstream fix
2018-08-03 19:14:17 +02:00
PavelSindler
cf06c5171c
merge with upstream
2018-08-03 18:43:09 +02:00
PavelSindler
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
Marek Bel
5846707c5a
Remove local variable verbosity_level, which was masking function parameter of the same name. Remove duplicate code to derive verbosity level.
...
Problem manifested itself as compiler warning: sketch/Marlin_main.cpp:2881:6: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
bool gcode_M45(bool onlyZ, int8_t verbosity_level)
2018-08-03 15:49:20 +02:00
PavelSindler
5824da8310
add more extrusion to M600 load filament
2018-08-03 15:42:06 +02:00
Marek Bel
f6094a58f7
Fix compiler warning sketch/lcd.cpp:160:6: warning: unused parameter 'cols' [-Wunused-parameter].
2018-08-03 15:37:40 +02:00
bubnikv
dd4c4b39b4
Added support for the upstream Marlin interpretation of the M204 code:
...
M204 S.. T..:
T is interpreted the old way (as acceleration when retracting)
only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.
M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.
This change will help us to solve the following Slic3r issue:
https://github.com/prusa3d/Slic3r/issues/1089
2018-08-03 15:33:41 +02:00
Marek Bel
a85d5948c3
Make function static, save 38B flash.
2018-08-03 15:32:28 +02:00
PavelSindler
ae7561bb27
M600 fix: set hotend temperature to correct value, manage_response function fix: now works in case that user presses button on mmu unit before he is asked to do it, compiler warnings (uninitialized variables) fixed
2018-08-03 15:26:39 +02:00
Marek Bel
373b4a1ea9
Fix compiler warnings sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::unget' [-Wmissing-field-initializers]
...
FILE _lcdout = {0};
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::flags' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::size' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::len' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::put' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::get' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::udata' [-Wmissing-field-initializers]
2018-08-03 15:25:52 +02:00
Marek Bel
0638e490c1
Fix compiler warnings: sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::unget' [-Wmissing-field-initializers]
...
FILE _uartout = {0};
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::flags' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::size' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::len' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::put' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::get' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::udata' [-Wmissing-field-initializers]
2018-08-03 15:23:24 +02:00
Marek Bel
0632f3b6d8
Fix compiler warnings: sketch/ConfigurationStore.cpp:17:13: warning: unused parameter 'name' [-Wunused-parameter]
...
static void _EEPROM_writeData(int &pos, uint8_t* value, uint8_t size, char* name)
sketch/ConfigurationStore.cpp:45:13: warning: unused parameter 'name' [-Wunused-parameter]
static void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size, char* name)
2018-08-03 14:50:51 +02:00
Marek Bel
f7f4ba2512
Make functions static, save 270B of flash.
2018-08-03 14:44:56 +02:00
Marek Bel
bd907aec86
Fix 4 compiler warnings of type sketch/sm4.c:88:2: warning: 'register' is not at beginning of declaration [-Wold-style-declaration].
2018-08-03 14:35:18 +02:00
Marek Bel
d3360c6868
Fix compiler warning sketch/Marlin_main.cpp:9099:7: warning: unused variable 'response' [-Wunused-variable].
2018-08-02 21:46:50 +02:00
Marek Bel
e13e3a9dc4
Merge remote-tracking branch 'prusa3d/MK3' into fix_compiler_warnings
2018-08-02 21:42:55 +02:00
Marek Bel
2e61c0e289
Obey defined X and Y homing direction.
...
Problem manifested itself as sketch/Marlin_main.cpp:2288:13: warning: unused variable 'axis_home_dir' [-Wunused-variable]
2018-08-02 20:47:03 +02:00
Robert Pelnar
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
Marek Bel
63724c5f0e
Comment out variable used only for commented out debug.
2018-08-02 18:26:49 +02:00
Marek Bel
fd70078606
Remove or disable by preprocessor unused functions in ultralcd.cpp.
2018-08-02 18:18:31 +02:00