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
fa1bdd6ab1
Lang - decreased reserved space for secondary language (10496 bytes)
2019-05-06 17:29:47 +02:00
ffbdb43881
Remove commented code
2019-05-06 17:26:42 +02:00
41a827fa00
Removed unused texts, increased reserved space to 0x2e00 (11776 bytes)
2019-05-06 17:24:06 +02:00
0794430208
Fix for linearity correction not being stored to EEPROM when doing MENU-
...
UP
2019-05-06 15:33:13 +02:00
1c9d134c62
return with exitcode 1 if any language not generated properly
...
fix - include system_timer.h
2019-05-06 15:29:57 +02:00
e5911c42da
limit printed menu text to max 18 characters
2019-05-06 12:44:36 +02:00
3852aa4275
Different secondary language reserved space for MK3 and MK25
2019-04-30 12:42:18 +02:00
177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841
...
"stop" immediately after "pause" patch
2019-04-29 14:49:49 +00:00
8fadbf1b44
Do not call watchdog reset from updateTemperaturesFromRawValues().
2019-04-29 16:41:38 +02:00
b93f37ee02
"stop" immediately after "pause" patch
2019-04-29 14:39:19 +02:00
18dec75b56
MK2.5 - watchdog enabled + test (command "D-1")
2019-04-29 13:19:59 +02:00
f16bea26e5
raise the Z axis before filament loading to nozzle on MMU2S
2019-04-25 17:39:09 +02:00
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
e8e7fa907f
Change comment
2019-04-24 15:52:24 +02:00
1d8b2b3e18
Secondary language reserved space resized
2019-04-24 15:22:17 +02:00
f25f8f1b71
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-23 19:39:49 +02:00
ca449ef517
Merge pull request #1742 from XPila/MK3-bed_pwm_revert
...
Bed high frequency PWM disabled
2019-04-16 21:04:28 +00:00
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
1f9737b4a6
Bed high frequency PWM disabled
2019-04-16 16:48:01 +02:00
863c7158b2
use modification times for sdcard sort
2019-04-16 06:24:47 -04:00
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
b5f196406e
(preliminary) fix @ preHeatError II
2019-04-10 00:29:58 +02:00
0d3e3c506a
Merge remote-tracking branch 'prusa3d/MK3' into fix_octoprint_mmu_load_failed
2019-04-09 20:54:21 +02:00
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
32f3471862
print parameters checking
...
prusa_stat_diameter()
2019-04-09 15:22:08 +02:00
173062295f
Enable print fan while waiting for cooldown
2019-04-06 13:42:21 +03:00
84cabd3836
Change busy_state type, save 340B of flash
2019-04-05 15:20:34 +02:00
bf57a59147
Extract duplicate code into function. Saves 106B flash.
2019-04-05 15:12:35 +02:00
4bfa3d7e0b
Reporty busy: paused for user in case MMU is not responding.
2019-04-04 19:04:15 +02:00
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
aa0edd09f5
(preliminary) fix @ (bed) preHeatError
2019-04-03 22:48:58 +02:00
4b1fc69088
"disable_z()" for Delta PSU III
...
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
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
a8d8d9e4c9
version change
2019-04-01 20:52:24 +02:00
c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz."
2019-04-01 18:44:13 +02:00
469aa10097
Enable MMU cutter.
2019-03-29 07:27:29 +01:00
ae11c1e26f
rename function
2019-03-28 16:39:56 +01:00
97594c83bb
function misleading names changed
2019-03-28 14:58:58 +01:00
96a111119b
document
2019-03-28 14:52:50 +01:00
8f69d5a501
document
2019-03-28 14:48:35 +01:00
1dd486d86d
max length of menu item strings added
2019-03-28 13:18:28 +01:00
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
02faadf0b9
MMU mode renamed
2019-03-28 09:49:08 +01:00
e7900aeaa1
Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing
2019-03-28 08:08:54 +01:00
c1da07bda0
Merge pull request #1653 from XPila/MK3
...
Phase correct PWM for bed, frequency 40KHz.
2019-03-27 21:07:15 +01:00
e259967991
remove / comment debug code
2019-03-27 20:41:45 +01:00
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
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
17a534e42b
"disable_z()" for Delta PSU II
2019-03-25 23:28:25 +01:00
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
966e772702
Fix compile error for non TMC2130 endstops check.
2019-03-22 00:14:29 +01:00
89f1a3bacf
Fix compile error for non TMC2130 pulley check.
2019-03-22 00:11:02 +01:00
8582babddb
Fix compile error for manual fan check.
2019-03-22 00:08:44 +01:00
d1c5c03907
Fix compile error for manual fan check.
2019-03-22 00:03:14 +01:00
c45a7f8641
Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error.
2019-03-21 23:50:01 +01:00
91779a5d04
Add filament sensor false triggering message.
2019-03-21 23:36:59 +01:00
ba23b1b2c5
Remove unused.
2019-03-21 22:50:46 +01:00
6c28ed6349
Convert lcd_selftest_error() first parameter to enum class.
2019-03-21 22:48:57 +01:00
fbe68cb287
variables scope changed
2019-03-21 19:37:34 +01:00
576bfb17c7
whitespace
2019-03-21 18:51:54 +01:00
175f840d16
return statement not used (fixes Pronterface issues)
2019-03-21 18:46:07 +01:00
632781c4a2
"disable_z()" for Delta PSU
2019-03-21 00:45:15 +01:00
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
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
cfd185f315
Phase correct PWM for bed, frequency 40KHz.
2019-03-19 14:50:57 +01:00
4100bd33a7
Fix Dcodes compilation errors and warnings.
2019-03-19 13:53:58 +01:00
e37c2e0b2e
version change
2019-03-15 20:01:02 +01:00
7c5e9500a8
version change
2019-03-15 20:00:07 +01:00
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
...
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
0ca52216f3
Revert "variants update"
...
This reverts commit c3a95ab79b
2019-03-15 13:14:32 +01:00
ffe45bdef3
Disable mmu filament cutter feature.
2019-03-15 03:38:37 +01:00
80ef2686ae
mmu mode switching fix
2019-03-14 18:17:40 +01:00
6e26f61726
fixed 7x7 mesh bed leveling vs. Z calibration check
2019-03-14 14:48:01 +01:00
ef198856a4
increase relative movement in Z to work better with higher hysteresis PINDAs
2019-03-14 14:10:52 +01:00
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
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
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
32138ea09a
menu item alignment
2019-03-13 15:08:09 +01:00
6c70d59810
mbl settings initialization fix
2019-03-13 15:05:10 +01:00
c3a95ab79b
variants update
2019-03-12 11:57:35 +01:00
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749
...
SD card menu enhancement
2019-03-12 11:42:53 +01:00
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament
...
Fix change filament
2019-03-12 11:39:15 +01:00
0aa21c362e
compile error fix
2019-03-11 23:37:30 +01:00
9a83925a97
fixed bug in counting approximate Z coordinate
2019-03-11 23:13:55 +01:00
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
698f81abe0
fix compile error
2019-03-11 15:55:48 +01:00
819a91ab1e
switching stealth/normal mode for mmu in settings menu and tune menu
2019-03-11 12:33:22 +01:00
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
091934462d
menu correction
2019-03-08 20:06:30 +01:00
315959c13a
menu update
2019-03-08 20:03:23 +01:00
952e0e1e77
change min. nProbeRetry to 1
2019-03-08 19:49:10 +01:00
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
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
dccb6ca2c6
Merge remote-tracking branch 'upstream/MK3' into bed_analysis_gcodes2
2019-03-06 19:56:52 +01:00
f0cc313fed
debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified
2019-03-06 19:56:48 +01:00
2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
...
Fix compiler warning
2019-03-06 19:55:18 +01:00
6217329d50
SD card menu enhancement
2019-03-06 19:51:26 +01:00
101453b674
mbl submenu
2019-03-06 13:27:31 +01:00
5766a5537e
limit number of probes
2019-03-05 22:43:44 +01:00
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
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
1eab058ad4
Fix uninitialized variable used.
2019-03-05 18:08:35 +01:00
7fcecabd5f
Fix compiler warning: variable 'previous_millis_cmd' set but not used
2019-03-05 18:04:58 +01:00
484259cbb2
Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used
2019-03-05 18:00:16 +01:00
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
7bcd54f8ba
Add missing function prototype.
2019-03-05 17:30:27 +01:00
ebfd4b2f47
Fix compiler warning: unused parameter 'calib'
2019-03-05 17:02:57 +01:00
790ae9f0ce
Fix compiler warning: unused parameter 'pstep'.
2019-03-05 16:41:41 +01:00
5b9e7c4fe7
Fix warning: assignment makes pointer from integer without a cast.
2019-03-05 16:27:47 +01:00
f1031d2302
new farm statuses for pause (14) and wait for user (15)
2019-03-05 16:00:50 +01:00
23859921b9
Fix compiler warnings macro redefined.
2019-03-05 15:56:20 +01:00
20a03d703d
G-code unification
...
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
2019-03-05 13:36:13 +01:00
f161d3ade4
Change formatting.
2019-03-04 22:17:43 +01:00
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
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
17f095b957
shorter Z movements (makes calibration faster)
2019-03-04 20:32:56 +01:00
27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode
...
mmu stealth mode
2019-03-04 17:09:11 +01:00
7f92d73a40
MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update
2019-03-04 17:04:22 +01:00
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
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
e832f0f2ee
Merge pull request #1582 from mkbel/remove_unused_code
...
Remove commented out code, fix formatting.
2019-03-04 15:29:36 +01:00
8812d40546
Revert "Fix compiler warning: variable 'kill_message' set but not used"
...
This reverts commit a964f996fa
2019-03-04 15:05:14 +01:00
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
9e38b1e101
Add missing message "Preheating to cut".
2019-03-01 18:17:08 +01:00
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
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
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
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
2019-03-01 17:08:36 +01:00
8e51b37d91
Suppress warning: unused parameter.
2019-03-01 16:57:20 +01:00
22500970ba
Remove commented out code, fix formatting.
2019-03-01 16:18:16 +01:00
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject
...
Add filament ramming to eject filament.
2019-03-01 14:21:23 +01:00
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
3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time
...
Fix menu stack overrun.
2019-03-01 14:20:22 +01:00
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
488497df2c
version change
2019-03-01 13:56:03 +01:00
ca88010018
Revert "version change"
...
This reverts commit f14733f2dd
2019-03-01 13:54:25 +01:00
f14733f2dd
version change
2019-03-01 13:53:18 +01:00
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
482f8ef01a
Merge remote-tracking branch 'mionut/7MBL' into 7x7
2019-02-28 15:54:49 +01:00
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795
...
preHeat @ filament management
2019-02-27 13:15:39 +01:00
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
2f1e968563
"lcd_update_enable()" replacement
2019-02-26 23:17:52 +01:00
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
a67645fda6
Merge branch 'add_cut' into bad_load_cut
2019-02-26 18:35:55 +01:00
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
5a5a482a59
Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command.
2019-02-26 13:59:44 +01:00
6c9dd4f272
Add filament ramming to eject filament.
2019-02-26 13:41:28 +01:00
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
d5c5ed55eb
Change formatting.
2019-02-25 11:12:39 +01:00
8f5fbe569c
Merge branch 'MK3' into detect_bad_load
2019-02-25 10:41:26 +01:00
8e3d52ee6d
fix compilation error for MK2.5, make code more readable
2019-02-22 17:15:40 +01:00
26cab2911f
mmu stealth mode
2019-02-22 16:30:54 +01:00
51827c578f
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 15:05:06 +02:00
62875f2e95
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 14:35:48 +02:00
c0a8d87e9e
Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795
2019-02-22 03:16:23 +01:00
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging
...
version change
2019-02-21 19:17:03 +01:00
da28773480
version change
2019-02-21 19:16:24 +01:00
e422cc1c26
Merge branch 'MK3' into PFW-795
2019-02-21 15:43:56 +01:00
ed93f1b7f0
preHeat @ filament management
...
another funcionality IIb
2019-02-21 15:27:22 +01:00
16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix
...
comments
2019-02-21 14:29:04 +01:00
6ad5c07e6d
comments
2019-02-21 14:28:05 +01:00
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
8b858286ac
Document.
2019-02-21 02:30:01 +01:00
326c8492b5
Move extruder forth and back after filament detected by sensor to detect bad load.
2019-02-21 01:19:26 +01:00
1e729048dc
cmdqueue_reset fix
2019-02-21 00:14:49 +01:00
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
9d76b6912c
merge new changes from upstream
2019-02-15 17:05:39 +01:00
2b6668b853
merge MK3S branch into MK3
2019-02-15 16:42:40 +01:00
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
69ff37729e
whitespace
2019-02-15 14:19:30 +01:00
0f791ce47f
mmu needs attention: idler error fix
2019-02-15 14:17:47 +01:00
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
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
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
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
8e23e7f322
Save some flash by using smaller type for filament.
2019-02-13 16:37:54 +01:00
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
bb7eeef1f4
Define debug printf and puts functions to make code more readable.
2019-02-12 23:24:23 +01:00
e1216934ef
Save flash by defining underlying type and omitting number value.
2019-02-12 21:53:11 +01:00
3379fb4866
Convert mmu_state to enum.
2019-02-12 21:43:26 +01:00
4c76393231
version change
2019-02-12 13:44:50 +01:00
62500f0b55
version changed
2019-02-12 10:39:09 +01:00
6c8d9c6fb4
Retry filament load on MMU load failure once.
2019-02-11 23:43:42 +01:00
d33b24c281
Unload filament after MMU load failed so MMU unit can be controlled by its buttons.
2019-02-11 23:24:55 +01:00
b85661309f
configuration change
2019-02-11 16:38:36 +01:00
ccc542d74a
MK2.5 IR_SENSOR_PIN modified
2019-02-11 14:32:21 +01:00
cd692f6be6
version change
2019-02-07 19:43:08 +01:00
065d56b2c6
version change
2019-02-06 23:58:30 +01:00
38b0e5439b
version change
2019-02-06 23:52:24 +01:00
b17a961241
MK2.5S
...
pin definition for filament sensor connection
2019-02-06 23:31:48 +01:00
e028db7bf9
version change
2019-02-06 23:30:01 +01:00
ff52499bdc
extr fan RPM measuring fix
2019-02-06 23:05:13 +01:00
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
22217a42f7
message change
2019-02-06 21:37:39 +01:00
a85d8e7f97
message change
2019-02-06 21:36:21 +01:00
d19c92bca8
welcome message changed
2019-02-06 19:41:17 +01:00
de9c87c592
welcome message changed
2019-02-06 19:38:52 +01:00
c704a4b7ab
Fix menu stack overrun.
2019-02-06 18:25:45 +01:00
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
63c8a36185
typo fixed
2019-02-06 16:27:44 +01:00
a220c97f94
Revert "variant files"
...
This reverts commit 850d3316b6
2019-02-06 16:19:30 +01:00
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
850d3316b6
variant files
2019-02-06 15:18:12 +01:00
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
91b12ff64b
bed level correction menu fix (menu_item_edit for negative integers)
2019-02-05 16:49:29 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
ea20529945
merge changes from upstream
2019-02-04 15:23:39 +01:00
5a2df47077
minTemp
...
better stability for delay-cutting
2019-02-04 14:54:25 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
2f9ab7b185
Merge branch 'dev' into variants
2019-02-04 01:32:24 +01:00
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
036bd4eb46
Merge branch 'dev' into variants
2019-02-04 01:20:14 +01:00
6bf8611afa
mintemp: delay cutting lines removed
2019-02-04 01:19:58 +01:00
71e4459cc9
Merge branch 'dev' into variants
2019-02-04 01:14:11 +01:00
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
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
454a087fb3
Merge branch 'dev' into variants
2019-02-01 21:24:38 +01:00
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
2cb3b99981
Merge branch 'dev' into variants
2019-01-31 18:04:38 +01:00
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
...
HW pwm fix
2019-01-30 12:52:44 +01:00
9890c60fe5
HW PWM fix
2019-01-30 00:06:12 +01:00
bbdb2c1597
Merge branch 'dev' into variants
2019-01-29 15:34:56 +01:00
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
60acdd23c5
variants
2019-01-28 21:12:38 +01:00
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
6d2358125a
Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2.
2019-01-28 19:29:31 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
83510ed489
check_for_ir_sensor
2019-01-28 17:27:16 +01:00
8fe2d1de9a
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 17:15:22 +01:00
8f039263d5
variant files and version
2019-01-28 17:14:24 +01:00
1742dbdb9e
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 16:21:57 +01:00
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm""
2019-01-28 14:20:31 +01:00
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
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
41f103c28f
Revert "Mk3 bed fast pwm"
2019-01-28 10:53:51 +01:00
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
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
9a1e914637
fix - bed heating durring selftest
2019-01-27 18:14:01 +01:00
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
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
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
76db58605b
Revert "Fast PWM for bed - timer2 used as system timer"
...
This reverts commit 0963c889f0
2019-01-25 18:37:23 +01:00
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
fc1491670f
mmu_idler_sensor_detected -> ir_sensor_detected
2019-01-25 18:03:05 +01:00
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
579fb42be2
Merge pull request #1480 from MRprusa3d/PFW-556
...
Pfw 556
2019-01-25 15:04:26 +01:00
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-25 13:14:18 +01:00
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
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
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
46e2bdaf62
Merge remote-tracking branch 'public_remote/MK3' into PFW-556
2019-01-24 19:39:34 +01:00
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
b2b65475df
SD card menu
...
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
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
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +01:00
f4e5c729ac
Merge pull request #1451 from mkbel/Tx_fix
...
Tx fix
2019-01-24 13:41:43 +01:00
273554b9b0
Merge pull request #1470 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-24 13:11:57 +01:00
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
eec869b73a
Merge pull request #1477 from MRprusa3d/PFW-723
...
PID / manage_heater
2019-01-24 00:31:23 +01:00
15b45df9fb
PID / manage_heater
...
better build-warnings elimination
2019-01-23 20:14:40 +01:00
867182c266
minTemp
...
more user-proof solution
2019-01-23 18:50:13 +01:00
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
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
1d71c1a5d1
Update IR sensor selftest progress bar more frequently.
2019-01-22 19:02:42 +01:00
97a4623800
Fix lcd_selftest_screen for small _progress_scale.
2019-01-22 19:01:55 +01:00
9cda0b69b8
Update IR sensor selftest progress bar.
2019-01-22 18:23:00 +01:00
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
c371a5ea65
Document.
2019-01-22 14:05:08 +01:00
a92d9c782b
Add IR sensor test.
2019-01-22 11:29:55 +01:00
f292a6ca7a
Refactor filament sensor selftest call.
2019-01-21 21:39:38 +01:00
50bcfae183
Fast PWM for bed - newer set HEATER_BED_PIN to 1
2019-01-21 18:21:17 +01:00
2c0d62fbf7
PID / manage_heater
...
some small corrections
2019-01-21 18:20:40 +01:00
e612eb2a17
Fast PWM for bed - set pwm value from soft_pwm_bed variable.
2019-01-21 18:14:19 +01:00
0963c889f0
Fast PWM for bed - timer2 used as system timer
2019-01-21 17:57:07 +01:00
d7ac459da7
PID / manage_heater
...
build-warnings elimination
2019-01-20 01:23:15 +01:00
d9f8e4eb9e
PID / manage_heater
...
PSD regulator improvement
2019-01-17 02:57:08 +01:00
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
3af1f81269
Do not disable motor currents when print is paused due to mmu load error.
2019-01-15 21:40:02 +01:00
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
d09ff5c3e7
Remove commented out code.
2019-01-15 01:30:54 +01:00
39b391314f
Document meaning of manage_response() move default parameter value.
2019-01-15 01:29:59 +01:00
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
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
7946cd7250
eeprom write nr. limitation
2019-01-04 22:23:11 +01:00
02262ff7ca
mmu load fail: possibility to unload/eject filament from menu
2019-01-04 21:37:19 +01:00
d89c03a0f1
Documentation.
2019-01-04 21:26:13 +01:00
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
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
a7128ffa04
Comment.
2019-01-04 19:56:15 +01:00
92ff284f82
Remove redundant code.
2019-01-04 19:35:33 +01:00
360a977520
Fix allDepleted(). Add tests.
2019-01-04 19:34:42 +01:00
a309ec1b0b
Add filament auto deplete engine for multi-material prints with MMUv2.
2019-01-03 22:58:25 +01:00
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
52d81bb4d8
set array size correctly to 4
2018-12-31 17:51:16 -08:00
3ab1daf722
MMU_DEBUG temporarily enabled
2018-12-21 23:17:32 +01:00
88441f7f2f
scan power failures fix
2018-12-21 23:07:39 +01:00
6ba86acebc
send A (abort) command to mmu only when loading phase of T-code
2018-12-21 22:33:01 +01:00
e36e58f385
show sensor on/off temporarily changed to unlocalized strings
2018-12-21 21:28:57 +01:00
688d4a8a82
missing defines in variant files
2018-12-21 21:05:54 +01:00
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
5462d451e1
show power failures in fail stats menu, shorter load to nozzle if idler sensor detected
2018-12-21 20:56:45 +01:00
d1ca73597b
Merge pull request #1412 from XPila/V3_5
...
Repeat last MMU command after timeout
2018-12-21 20:53:24 +01:00
d292e877df
load to nozzle shortened, sensor menu moved to support
2018-12-21 18:51:13 +01:00
3c64bad1cb
initial version which works on old and new hw, initial version of idler sensor detection
2018-12-21 17:12:16 +01:00
75523b1497
Merge pull request #1417 from PavelSindler/z_cal_endstops
...
version changed
2018-12-19 20:08:22 +01:00
acbfe89f04
version changed
2018-12-19 20:07:18 +01:00
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
f79137898a
Fix - move down after calibrate Z (PFW718)
2018-12-19 19:22:03 +01:00
40fe52202d
stop paused print fix: saved_printing set to false when doing stop print
2018-12-19 19:20:09 +01:00
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
c69d4aa914
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-19 13:43:49 +01:00
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
b5430c2968
M600: consume click
2018-12-18 19:10:02 +01:00
75d31fd2cb
Repeat last MMU command after timeout
2018-12-18 18:47:54 +01:00
880163dbcb
missing prototypes
2018-12-18 17:38:24 +01:00
fc5d7e35ef
fail stats mmu function definitions
2018-12-18 17:35:41 +01:00
11ab5dfd36
fail stats menu for mmu defined for MK2.5 version
2018-12-18 17:33:27 +01:00
4543949cac
build without MMU_IDLER_SENSOR_PIN defined
2018-12-18 17:29:44 +01:00
fc33affbda
temporary change
2018-12-18 17:24:29 +01:00
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
c782373f2d
comment
2018-12-18 16:09:10 +01:00
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
27c8612360
use just short movement for unloading filament
2018-12-17 21:25:07 +01:00
cb1f6d2a0e
show sensor states in calibration menu
2018-12-14 19:43:26 +01:00
927898151a
fix - tmc2130 conditional translation
2018-12-14 15:46:50 +01:00
cfe83daf4a
Meshbed leveling fail - move 1mm outside of colission with disabled endstop
2018-12-14 15:32:47 +01:00
e0bed71801
comments update
2018-12-13 17:01:45 +01:00
bbba27c15f
idler state menu
2018-12-13 16:53:59 +01:00
24ef6deeed
typo fixed
2018-12-13 16:43:40 +01:00
9c4f086add
fixed statistics for MMU_FAIL
2018-12-13 01:09:21 +01:00
df71398066
statistics fix
2018-12-13 00:43:27 +01:00
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +01:00
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
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
3d4cb8a994
Document gcode T.
2018-12-12 20:30:28 +01:00
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
e52e53d1eb
send continue loading commands periodically if initial load fails
2018-12-12 13:54:17 +01:00
041ed172a0
Merge remote-tracking branch 'robert/MK3' into idler_sensor
2018-12-11 19:16:04 +01:00
8af127870d
consume click
2018-12-11 15:59:44 +01:00
3f96dea4f9
make all shell scripts executable
2018-12-10 07:09:03 -07:00
6d6de67c3f
consume click
2018-12-07 18:31:30 +01:00
35378769fd
MMU - idler sensor
2018-12-06 19:19:50 +01:00
6157c3ab32
New filament sensor
2018-12-06 15:41:53 +01:00
41b78187ca
LCD backlight - full brightnes at start
2018-12-06 15:27:05 +01:00
cb334238cc
Slow PWM fan @ 62.5Hz
2018-12-06 15:18:07 +01:00
1948cb6310
Merge pull request #1369 from PavelSindler/M220_MK3
...
M220: possibility to backup/restore speed
2018-11-30 19:02:45 +01:00
d1d4a8c58c
whitespace
2018-11-29 17:33:36 +01:00
8e239ce76f
changed M220
2018-11-29 17:02:38 +01:00
929e1de253
special variable for saving/restoring feedmultiply using M220
2018-11-29 17:02:10 +01:00
839de141a3
resolving conflicts
2018-11-29 16:26:49 +01:00
abf20ef6a2
merged changes from public upstream (Prusa-Firmware repository)
2018-11-29 13:46:58 +01:00
83a9f75abe
minTemp
...
correct minTemp detection @ MK2.5 & MK3
2018-11-28 23:43:16 +01:00
38dacaf07a
Automate secondary language support build.
2018-11-26 20:24:24 +01:00
90876453a7
Merge pull request #1357 from PavelSindler/MK3_for_merging
...
version change
2018-11-22 23:32:37 +01:00
47d3535012
version change
2018-11-22 23:30:01 +01:00
c1773c1aa4
Merge pull request #1356 from PavelSindler/MK3_for_merging
...
process serial line during pause
2018-11-22 23:07:07 +01:00
85b23d1db6
process serial line during pause
2018-11-22 21:41:22 +01:00
b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5
...
Lang - final corrections
2018-11-22 19:03:30 +01:00
e229f3343e
Lang - text "volume.init failed" removed from dictionary
2018-11-22 18:48:22 +01:00
42f2a61416
Lang - text "TRIGGERED" removed from dictionary
2018-11-22 18:46:02 +01:00
e9131542ca
Lang - text "Sleep..." removed from dictionary
2018-11-22 18:43:21 +01:00
ddf898cb41
Lang - text "SD init fail" removed from dictionary
2018-11-22 18:41:00 +01:00
3384dd8487
Lang - text "SD card ok" removed from dictionary
2018-11-22 18:39:35 +01:00
72c7810641
Lang - text "Resend" removed from dictionary
2018-11-22 18:38:20 +01:00
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
123bef636a
Lang - text "Printer halted. kill() called!" removed from dictionary
2018-11-22 18:33:15 +01:00
123725edd1
Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed
2018-11-22 18:30:53 +01:00
0fceade481
Lang - text "PowerUp" removed from dictionary
2018-11-22 18:24:21 +01:00
f0e3021d33
Lang - text "openRoot failed" removed from dictionary
2018-11-22 18:20:24 +01:00
1cbb261707
Lang - text "open" removed from dictionary
2018-11-22 18:18:25 +01:00
f4bbce4142
Lang - text "open failed, File: " removed from dictionary
2018-11-22 18:15:22 +01:00
72d47eaeba
Lang - text "ok" removed from dictionary
2018-11-22 18:12:19 +01:00
1568b94e87
Lang - text "No Checksum with line number, Last Line: " removed from dictionary
2018-11-22 18:09:07 +01:00
fd3cd9b551
Lang - texts "Mxxx Invalid extruder " removed from dictionary
2018-11-22 18:06:10 +01:00
fdf9734161
Lang - text "checksum mismatch, Last Line: " removed from dictionary
2018-11-22 17:59:43 +01:00
9c964277ac
Lang - text "error writing to file" removed from dictionary
2018-11-22 17:57:52 +01:00
9f86a334c6
Lang - text "endstops hit: " removed from dictionary
2018-11-22 17:53:51 +01:00
0baa6412fc
Lang - text "Cannot enter subdir: " removed from dictionary
2018-11-22 17:49:28 +01:00
60e567b660
Lang - text " Last Updated: " removed from dictionary
2018-11-22 17:48:12 +01:00
a1f03e9531
Lang - text " Free Memory: " removed from dictionary
2018-11-22 17:46:44 +01:00
283e33dd69
Lang - text " cold extrusion prevented" removed from dictionary
2018-11-22 17:44:53 +01:00
104353c0c5
Lang - text " PlannerBufferBytes: " removed from dictionary
2018-11-22 17:43:11 +01:00
46fba48173
Lang - text "enqueing \"" removed from dictionary
2018-11-22 17:38:52 +01:00
0ceeba38cb
Lang - text "Copy selected language from XFLASH?" shorted to "Copy selected language?"
2018-11-22 17:32:53 +01:00
099fe216b6
Lang - text "KILLED. " removed from dictionaries
2018-11-22 17:26:01 +01:00
37273d9fca
Lang - 'Auto Deplete' changed to 'SpoolJoin'
2018-11-22 17:19:38 +01:00
49367c0b09
Merge pull request #1353 from XPila/V3_5
...
Lang - french translation
2018-11-22 17:18:42 +01:00
f0624a9e97
Lang - some not localized texts marked as localized, formating fixed
2018-11-22 14:37:29 +01:00
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
0e65790218
removed redundant code
2018-11-21 19:49:19 +01:00
74a7341005
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
2018-11-21 19:27:55 +01:00
9fa587b206
Merge pull request #1350 from XPila/V3_5
...
V 3.5 - new translation
2018-11-21 15:23:41 +01:00
2dc5439069
Lang - reserved space increased to 0x2f00 (12032 bytes)
2018-11-21 14:57:20 +01:00
1bff138b50
Lang - sec.lang. reserved space increased to 0x2e00 (11776 bytes)
2018-11-21 14:52:14 +01:00
18eb9ad69e
Merge pull request #1344 from PavelSindler/progress_bar_fix
...
progress bar fix
2018-11-20 14:50:04 +01:00
ab5b57df11
Style.
2018-11-19 20:41:14 +01:00
cb7c701791
whitespace
2018-11-19 20:09:03 +01:00
7d538cde6c
Retrieve settings (M501): initialize each item in feedrate and acceleration arrays separately
2018-11-19 20:05:58 +01:00
e5dd4d757a
progress bar fix
2018-11-16 15:45:55 +01:00
ffe906c733
MeshBed Levelling Fail V
2018-11-14 16:45:49 +01:00
0398c3c26b
Merge pull request #1335 from PavelSindler/T_codes
...
version change
2018-11-13 17:49:26 +01:00
51c80352e8
version change
2018-11-13 17:48:42 +01:00
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
c41b045ea7
Merge pull request #1333 from PavelSindler/T_codes
...
T-code fix
2018-11-13 16:09:52 +01:00
bfc343c7c5
PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating)
2018-11-13 16:04:46 +01:00
15d0b083ed
whitespace
2018-11-13 15:58:21 +01:00
17a1049f23
T-codes fix
2018-11-13 15:56:19 +01:00
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
d886ba1100
Fix PFW657 - filament runout detection is not working after autoload disabled from menu.
2018-11-13 14:05:15 +01:00
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
27db32cbd0
Merge pull request #1331 from XPila/V3_5
...
M907 fix - value in mA (PFW655)
2018-11-12 20:49:09 +01:00
41b885c537
M907 fix - value in mA (PFW)
2018-11-12 20:39:25 +01:00
5e8e96b5d7
MMU module adjustment
...
MMU module conditional compilation adjustment for MMU v1
2018-11-12 20:09:54 +01:00
32da5bc039
progress bar time counted from feedrate and E - distance
2018-11-12 19:55:53 +01:00
f4c1e7924f
M600: show progress bar during first filament load
2018-11-12 18:35:06 +01:00
10a81ea768
version change
2018-11-09 19:16:53 +01:00
5931d15566
whitespace
2018-11-09 18:31:28 +01:00
c991c8b314
resume print fix: wait for heater() never disable steppers
2018-11-09 18:29:35 +01:00
10b79e918b
Merge pull request #1321 from PavelSindler/M600_load_fix
...
M600 load messages synchronization fixed
2018-11-09 15:40:00 +01:00
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +01:00
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
3afebcc9cc
tmc2130_print_currents fixed (for obsolete M913)
2018-11-09 15:20:25 +01:00
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
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
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
...
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
6d59f88a8e
Merge pull request #1315 from MRprusa3d/PFW-639
...
Bed PowerMonitor III
2018-11-08 10:08:31 +01:00
ccb58ae7c9
Revert "MeshBed Levelling Fail IV"
...
This reverts commit bd554df02e
2018-11-08 04:02:32 +01:00
bd554df02e
MeshBed Levelling Fail IV
2018-11-08 03:54:05 +01:00
fd45dd64dc
Bed PowerMonitor III
2018-11-08 03:32:00 +01:00
3cccb125f7
Merge pull request #1313 from MRprusa3d/PFW-639
...
Bed PowerMonitor II
2018-11-07 13:50:50 +01:00
4ae857136d
Bed PowerMonitor II
2018-11-07 13:38:39 +01:00
b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
...
Fix long press modal
2018-11-07 10:28:24 +01:00
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
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
95b0506284
Make lcd_long_press_active private.
2018-11-06 20:48:28 +01:00
676434111e
Disable long press handler in modal dialogs (LCD update disabled).
2018-11-06 20:43:19 +01:00
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
9a68501039
MK2 variants compilable
2018-11-06 14:17:43 +01:00
c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
46b2c93d60
MeshBed Leveling Fail III
2018-11-06 01:44:53 +01:00
9953518681
MeshBed Leveling Fail II
2018-11-06 01:28:47 +01:00
908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
...
filament quality measurements disabled
2018-11-05 19:14:34 +01:00
0a6ca7ffd0
Merge pull request #1305 from XPila/V3_5
...
PFW643 - removed M910-M918, implemented M907
2018-11-05 19:14:19 +01:00
89ad02ac8c
filament quality measurements disabled
2018-11-05 18:37:36 +01:00
50f9bf06be
Save 74B of flash memory.
2018-11-05 18:02:46 +01:00
e95c2ad592
Display auto deplete as not available if filament sensor is disabled.
2018-11-05 17:43:07 +01:00
d6b5f5a1c7
PFW643 - removed M910-M918, implemented M907
2018-11-05 16:15:27 +01:00
ef5be690fb
Add autodeplete setting into tune menu.
2018-11-05 13:54:22 +01:00
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
78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
...
Wizard improvements
2018-11-05 10:38:41 +01:00
688c10247e
Merge pull request #1291 from XPila/MK3-new_bs
...
lang update
2018-11-05 10:38:29 +01:00
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
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
aeeb2af0a4
whitespace
2018-11-05 00:15:36 +01:00
b058ec7120
whitespace
2018-11-05 00:14:16 +01:00
934b76ade3
wait message added
2018-11-05 00:12:46 +01:00
3d24f5437c
leave Z move menu (hotfix)
2018-11-04 23:44:29 +01:00
daef0eeb67
Merge pull request #1297 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail
2018-11-04 23:33:29 +01:00
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
515f2723d7
Merge pull request #1301 from XPila/V3_5
...
PFW644 + PFW638
2018-11-04 23:10:10 +01:00
8afb83406e
Wizard for assembled printers (contains more steps now)
2018-11-04 23:08:23 +01:00
33a29cd416
Fix PFW638 - remaining/elapsed time >100h displayed in hours
2018-11-04 20:27:09 +01:00
e2d2fb58aa
Z calibraion: always ask user to clean nozzle
2018-11-04 18:47:08 +01:00
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
1e05e1189d
Fix PFW644 - MK25 reports stopped, arduino 1.8.5.
2018-11-03 22:44:42 +01:00
73794b56cf
MeshBed Leveling Fail
...
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
e304319e15
choosing filament from T? menu changes feedrate fixed
2018-11-02 20:25:24 +01:00
d18013e5a2
manage response now contains showing nozzle temperature and possibility to resume saved nozzle temperature
2018-11-02 19:31:10 +01:00
18a8ae5b8f
Bed PowerMonitor
...
bed power monitoring correction
2018-11-01 20:55:42 +01:00
aaf65051f9
M600: "is color clear?" menu synchronization
2018-11-01 18:28:52 +01:00
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
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
a0e4acead3
lang - removed unused code and some service messages changed to "not translated"
2018-11-01 14:07:16 +01:00
e80af46503
load to nozzle and Tx and Tc codes: intial version
2018-10-31 21:48:05 +01:00
f445b6018e
canceling print after crash detection sets saved_priting flag to false
2018-10-28 11:06:10 +01:00
4ecc00e4e3
M600: move extruder 100mm to the left to make space for opening idler
2018-10-26 18:19:00 +02:00
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
16c2f6fe8e
Merge pull request #1279 from PavelSindler/turn_on_FINDA
...
mmu2: filament senor (FINDA) menu fix
2018-10-25 21:53:11 +02:00
a9317b4d36
upstream/MK3 merge
2018-10-25 21:46:32 +02:00
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
0e0dbad871
#ifdef __cplusplus added to allow including to .c file
2018-10-25 21:06:37 +02:00
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
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
d301aa0e8c
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-25 18:16:36 +02:00
7e9eaf0f4b
New lang, arduino 1.8.5 - disable multilanguage support by default
2018-10-23 17:32:52 +02:00
bd8ca8d652
removed redefinition of functions in fsensor.cpp
2018-10-22 20:51:44 +02:00
d1de9fff60
mmu_loop: missing return added
2018-10-22 20:38:32 +02:00
d005005e22
Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging
2018-10-22 20:33:38 +02:00
940f436a5f
merge MK3_dev into MK3
2018-10-22 20:25:29 +02:00
bc247ca02c
MK2.5 sw reset at setup function
2018-10-19 17:54:48 +02:00
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
563052d015
New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix
2018-10-18 15:39:08 +02:00
868c79e835
New lang, arduino 1.8.5 - language.h - section names, messages.h - extern "C" added
2018-10-18 14:41:32 +02:00
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
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
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
866d6758c3
Merge pull request #1243 from mkbel/simplify_EEPROM_M500
...
Simplify eeprom m500
2018-10-10 13:11:17 +02:00
9dff6431e6
Format fsensor documentation.
2018-10-09 22:33:54 +02:00
809ae5a5f0
default max feedrate for x and y changed to 100mm/s
2018-10-09 20:03:28 +02:00
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
c91c878408
Merge pull request #1202 from MRprusa3d/PFW-573
...
preHeatError
2018-10-08 16:12:33 +02:00
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
c77672bf0f
PFW-608 Decrease wear of mass erase EEPROM and do it faster.
2018-10-05 18:11:26 +02:00
436f5b5728
changed version
2018-10-04 17:40:38 +02:00
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
9960c80bf7
Additional check always with enabled oq_meassure
...
+ variant files
2018-10-04 16:12:41 +02:00
f9d8c46802
Enable/disable optical quality meassurement in settings menu
2018-10-04 15:48:28 +02:00
ced74b7ec2
Merge remote-tracking branch 'upstream/MK3' into MK3
2018-10-04 13:53:00 +02:00
7882b3c975
Update fsensor in Manage_inactivity instead of main loop.
2018-10-03 17:29:24 +02:00
3a58489c6a
Merge pull request #1169 from mkbel/remove_duplicate_debouncing_4
...
Remove duplicate debouncing 4
2018-10-02 11:21:17 +02:00
bba1ffdb65
version change
2018-09-27 21:13:06 +02:00
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
e50025cc7d
static_assert - portable solution compatible with C++98
2018-09-27 19:59:29 +02:00
7e9220ada2
Merge pull request #1198 from PavelSindler/communication_timeouts
...
communication timeouts fix
2018-09-27 11:23:58 +02:00
0184f06dcf
preHeatError
...
correction of preHeatError detection
2018-09-27 04:23:00 +02:00
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
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
e6a00b8f53
send busy messages when checking for filament presence
2018-09-25 19:14:57 +02:00
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
d80fcab66c
Disable filament sensor response quality check.
2018-09-25 15:50:50 +02:00
19c1ba6274
Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch.
2018-09-25 14:25:03 +02:00
ccfcc6f989
Document.
2018-09-24 18:32:01 +02:00
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
c38fef281d
Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore.
2018-09-24 17:33:58 +02:00
ca179a2d18
Use cs.filament_size from ConfigurationStore.
2018-09-24 17:29:02 +02:00
e225e9cab0
Use cs.volumetric_enabled from ConfigurationStore.
2018-09-24 17:12:16 +02:00
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
7e593e6922
Use cs.autoretract_enabled from ConfigurationStore.
2018-09-24 17:03:10 +02:00
20ba2b1c79
Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore.
2018-09-24 16:57:48 +02:00
54bcc8aa52
Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore.
2018-09-24 16:54:50 +02:00
f2ae3fb1f7
Use cs.zprobe_zoffset from ConfigurationStore.
2018-09-24 16:47:57 +02:00
959d0069fa
Use cs.add_homing from ConfigurationStore.
2018-09-24 16:42:28 +02:00
ac7c062161
Use cs.max_jerk from ConfigurationStore.
2018-09-24 16:35:33 +02:00
bb66bfe6a7
Use cs.minsegmenttime from ConfigurationStore.
2018-09-24 16:22:50 +02:00
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
10428b30d9
Use cs.mintravelfeedrate from ConfigurationStore.
2018-09-24 16:01:58 +02:00
cd438c5c00
whitespace
2018-09-24 16:01:31 +02:00
740e922b87
EEPROM M500 block size check for reading stored data added
2018-09-24 16:00:23 +02:00
26e2fd1c76
Use cs.minimumfeedrate from ConfigurationStore.
2018-09-24 15:57:24 +02:00
b8fefceb4d
Use cs.retract_acceleration from ConfigurationStore.
2018-09-24 15:53:35 +02:00
7dbe0afdc4
Use cs.acceleration from ConfigurationStore.
2018-09-24 15:47:36 +02:00
cee51cf9c3
Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore.
2018-09-24 15:40:35 +02:00
02becb5e6a
Use cs.max_feedrate_normal from ConfigurationStore.
2018-09-24 15:09:19 +02:00
053b94b711
remove "start" duplicity in setup
2018-09-24 14:57:46 +02:00
3f28632443
Use cs.axis_steps_per_unit from ConfigurationStore.
2018-09-24 14:54:41 +02:00
d611cad087
Temporary hide M500_conf cs to allow automated renaming.
2018-09-24 14:42:01 +02:00
e94dc1341a
Use M500_conf cs in Config_ StoreSettings, RetrieveSettings and ResetDefault.
2018-09-24 14:34:43 +02:00
991db0e71d
Finish default_conf.
2018-09-23 23:36:01 +02:00
d9e2dcc736
Incomplete.
2018-09-23 22:21:28 +02:00
58af1ae4c4
Add configuration store struct.
2018-09-21 20:52:44 +02:00
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
1c33b673c0
comment update
2018-09-19 18:43:27 +02:00
3d57d504ba
Merge pull request #1174 from mkbel/fix_runout_resume
...
Fix runout resume
2018-09-19 18:29:32 +02:00
2607a0c4ed
Update documentation.
2018-09-19 17:22:06 +02:00
b92b307ee8
Make variables constant.
2018-09-19 17:21:45 +02:00
cce8131070
Add missing s for seconds of print time.
2018-09-19 17:20:41 +02:00
b5bb40474d
Fix print time overflow.
2018-09-19 17:17:32 +02:00
0a5394a20e
defines moved to eeprom.h
2018-09-19 15:10:10 +02:00
752aec37fb
M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored
2018-09-19 14:36:26 +02:00
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
a5a7b1f1d6
Move functions definitions behind variable definitions. (No change in functionality.)
2018-09-19 14:08:31 +02:00
05d3b7032d
Update documentation.
2018-09-18 17:48:11 +02:00
a7fdfdd258
Put repetitive code into separate function. No change in functionality.
2018-09-18 17:15:13 +02:00
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
f532da4b17
Remove duplicate button debouncing code. Save 254B flash.
2018-09-18 14:39:01 +02:00
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
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
a687b8e64a
Don't enable lcd update inside mmu_eject_filament().
2018-09-17 17:12:36 +02:00
f496076508
Remove redundant code. No change in functionality.
2018-09-14 18:33:03 +02:00
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
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
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
8235f0f869
Merge branch 'MK3_dev' into add_cancel
2018-09-12 19:38:26 +02:00
7bc46323e2
Update pause print documentation.
2018-09-12 18:35:26 +02:00
de2100ac7b
Merge branch 'MK3' into MK3_dev
2018-09-12 15:22:12 +02:00
0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
...
lang fix
2018-09-12 09:38:18 +02:00
45066ebddc
lang fix
2018-09-12 09:37:16 +02:00
30d54be9de
Merge pull request #1142 from PavelSindler/lang2
...
changed version
2018-09-12 09:20:32 +02:00
298950e601
changed version
2018-09-12 09:19:23 +02:00
3e84bf6341
Lang update (translation + increased reserved space)
2018-09-12 02:45:13 +02:00
13b67f0e0a
Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU.
2018-09-11 22:33:13 +02:00
ada7cffd32
Open menu to select filament before first layer calibration if MMU unit is present.
2018-09-11 19:53:29 +02:00
96aada9061
load filament messages, czech language missing translation readded
2018-09-11 18:25:38 +02:00
5649d6c3c0
Precede active filament on status screen with letter F.
2018-09-11 17:27:10 +02:00
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
46df46f482
Add possibility to use other filaments in LCD_COMMAND_V2_CAL.
2018-09-11 17:03:20 +02:00
19a1ccdc76
Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.
2018-09-11 16:51:00 +02:00
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
0fcd2cf2a1
Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal
2018-09-11 15:26:35 +02:00
d9a2fe70ec
missing declaration fix
2018-09-11 11:06:37 +02:00
c023fb12d5
add choose filament messages
2018-09-11 09:50:50 +02:00
90e3ae5464
Merge pull request #1127 from XPila/MK3
...
Lang update, french translation
2018-09-11 09:44:02 +02:00
4ca300bc39
Lang update, french translation
...
+resized reserved space
2018-09-11 03:43:05 +02:00
b3bc71b45b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-09-10 23:52:51 +02:00
25a46557d1
merge with upstream
2018-09-10 22:11:32 +02:00
8a9f066c1b
choose_extruder_menu: extruder -> filament
2018-09-10 22:09:37 +02:00
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
1bb9e9ed92
MMU_DEBUG
2018-09-10 20:39:28 +02:00
6fa798aa83
init
2018-09-10 20:08:13 +02:00
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
764e5c9769
Merge branch 'MK3' into MK3_dev
2018-09-09 22:52:01 +02:00
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
ebfbf4ac3f
Merge branch 'MK3' into MK3_dev
2018-09-07 09:24:45 +02:00
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
001680bbdc
Merge branch 'MK3' into time_remaining_fix
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
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
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
66305b3e04
MK25: always show "normal mode" remaining time
2018-09-06 23:05:36 +02:00
48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev
...
Merge MK3 into Mk3_dev
2018-09-06 21:01:29 +02:00
dbc0654b1c
Merge pull request #1108 from mkbel/pause_print
...
Pause print
2018-09-06 21:01:16 +02:00
48f5da9cb8
lcd_clicked fix
2018-09-06 20:54:51 +02:00
0e50c388af
Save 1K flash memory.
2018-09-06 15:06:46 +02:00
0d99dc0a3f
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-06 15:06:33 +02:00
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
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
05a0b9c939
Remove fanSpeedBckp global variable.
2018-09-06 11:41:44 +02:00
40990c4deb
Remove saved_feedmultiply global variable.
2018-09-06 11:30:06 +02:00
b43c8dad74
Remove HotendTempBckp global variable.
2018-09-06 10:05:59 +02:00
d71311f13f
Remove redundant HotendTempBckp from crash detection recover.
2018-09-06 09:41:37 +02:00
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
67b2456ad9
Merge branch 'MK3' into MK3_dev
2018-09-05 21:48:29 +02:00
74be7677cf
Fix problem, that current_position is rewritten after long_pause() call.
2018-09-05 21:10:05 +02:00
4b47a74d1d
Remove unused declarations from tmc2130.cpp. Move used declaration to Marlin.h.
2018-09-05 18:14:32 +02:00
ed43913c5c
Merge pull request #1099 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-09-05 16:53:51 +02:00
40679dcb3a
Merge branch 'MK3' into MK3
2018-09-05 00:06:48 +02:00
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
35cf3f3a61
Time info
...
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
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
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
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
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
63a215b0c3
Remove unused variable chars.
2018-09-03 20:48:03 +02:00
cbf633cfd4
Remove unused variable chars.
2018-09-03 20:47:12 +02:00
c95b463e0b
Remove unused variable yes. Remove redundant tmp_extruder assignment.
2018-09-03 20:44:40 +02:00
517fbb66bf
Save 1K flash memory.
2018-09-03 20:00:46 +02:00
d796df3f14
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-03 17:32:42 +02:00
e5c0e26601
Merge branch 'MK3' into MK3_dev
2018-08-30 19:05:24 +02:00
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
ed49e5187b
version changed
2018-08-30 11:35:06 +02:00
d96b0d5f32
linearity correction define added (menu readded)
2018-08-30 11:28:12 +02:00
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
b2c94f36cc
removed unused "out of range" function
2018-08-29 14:41:39 +02:00
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
b284c70d9b
auto deplete: dont eject filament
2018-08-29 13:08:09 +02:00
515e78cfd1
Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament
2018-08-29 01:58:28 +02:00
b9808354c4
Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder
2018-08-28 23:53:35 +02:00
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament
...
Fix active filament PFW-528
2018-08-28 23:50:57 +02:00
705f098b1c
eject filament: initial version
2018-08-28 23:50:31 +02:00
2cd8691376
Do not use global variable tmp_extruder when setting temperature.
2018-08-28 20:26:33 +02:00
0695f3f345
Z-move correction
...
Z-move inhibition after FactoryReset
2018-08-28 19:58:03 +02:00
8aeb7e04f1
Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle().
2018-08-28 18:52:16 +02:00
55eaa1de83
Fix code indentation.
2018-08-28 18:26:10 +02:00
9fb68fb724
Remove usage of global variable tmp_extruder in M200.
2018-08-28 18:08:21 +02:00
5ad2fdaaaa
Merge pull request #1080 from PavelSindler/M600_change_extruder
...
removed redundant code
2018-08-28 17:36:50 +02:00
adde0d3944
Merge branch 'prusa3d_MK3' into MK3_dev
2018-08-28 17:31:12 +02:00
d3869bd857
Z-endstop @ MK3
...
add show P.I.N.D.A. state menu item @ CalibrationMenu
2018-08-28 16:12:59 +02:00
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
27bd31e255
removed redundant code
2018-08-28 11:26:35 +02:00
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
755baddb54
Merge branch 'MK3' into fix_unable_to_compile
2018-08-28 10:57:19 +02:00
72cd0d26f9
Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu.
2018-08-27 21:08:40 +02:00
dd39976176
Merge remote-tracking branch 'pavel/fix_unable_to_compile' into fix_unable_to_compile
2018-08-27 21:06:35 +02:00
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
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
2a00e5d348
Fix loading filament screen hangs if changed automatically.
2018-08-27 20:09:22 +02:00
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
1cdb7a48cb
Show auto deplete only when mmu unit present.
2018-08-27 16:24:21 +02:00
8279aba4d7
Add auto deplete setting.
2018-08-27 16:15:46 +02:00
191e5dfddd
mmu M600: dont use change extruder posibility; unload starts always imidiately
2018-08-27 16:12:10 +02:00
f02b0d80e3
Split settings menu into separate macros.
2018-08-27 15:48:09 +02:00
2b32b41969
MK2.5 build error hotfix
2018-08-27 05:53:39 +02:00
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
...
Mmu filament sensor
2018-08-27 05:26:12 +02:00
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix
...
M600 mmu fix
2018-08-27 05:26:00 +02:00
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
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
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
ac3b92bade
commentary fix
2018-08-26 23:55:29 +02:00
d3ed270a5a
single material printer (no mmu unit) M600 hotfix: M600_check_state loop working
2018-08-26 23:52:45 +02:00
b13ff8e424
Wait for ok after U0 (unload current filament) command.
2018-08-26 22:08:52 +02:00
4b1f1bc6a6
mmu timeout update: no need to press knob on printer to recover paused print
2018-08-26 21:39:37 +02:00
5769b758ee
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
2018-08-26 16:50:28 +02:00
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
c57fdb11b7
show active extruder: numbers corrected
2018-08-26 14:22:52 +02:00
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
...
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
cf83852d22
Merge pull request #1068 from PavelSindler/M600_fix
...
M600 fix: remove unretract
2018-08-25 20:02:30 +02:00
ddcdfce356
Merge pull request #1069 from PavelSindler/mmu_timeout
...
5 minutes mmu timeout
2018-08-25 20:02:12 +02:00
0929a35a4f
5 minutes mmu timeout
2018-08-25 17:21:17 +02:00
815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2
...
Fix linearity correction 2
2018-08-25 16:56:40 +02:00
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
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
1f5bece0db
check for required mmu2 firmware buildnr
2018-08-25 16:15:35 +02:00
6b7e47d730
Merge branch 'MK3' into MK3_dev
2018-08-24 22:21:08 +02:00
5fe6a3ed1c
Place similar functions together.
2018-08-24 22:04:48 +02:00
ea88dea432
Fix memory overwrite.
2018-08-24 21:24:14 +02:00
085c77effb
Fix when value edited, other values appeard as +1.000 instead of [off].
2018-08-24 20:38:07 +02:00
df61172984
Fix linearity correction not saved and applied when menu was left by timeout.
2018-08-24 20:31:49 +02:00
32723d8d6f
whitespace
2018-08-24 20:30:44 +02:00
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
0c80eca648
merge with upstream
2018-08-24 18:30:03 +02:00
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
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
5daae818e1
Convert menu_item_edit to template function.
2018-08-24 17:40:40 +02:00
e6ac75f6a1
Merge pull request #1061 from mkbel/MK3_dev
...
Merge branch 'MK3' into MK3_dev
2018-08-24 16:27:07 +02:00
ac5cb0989e
Uncomment linearity correction menu. Fix return from linearity correction menu.
2018-08-24 16:00:51 +02:00
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
0de7668bac
Remove usage of global variable tmp_extruder in M200.
2018-08-23 23:34:50 +02:00
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
54138407dd
Encapsulate MMU internal state.
2018-08-23 23:34:38 +02:00
f1c51502fd
Merge branch 'MK3' into MK3_dev
2018-08-23 23:28:20 +02:00
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
5dc2af961b
ShippingPrepare & M600
...
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
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
07d07831f1
Add portability note.
2018-08-22 19:40:12 +02:00
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
3477f84143
Merge pull request #1055 from XPila/MK3
...
MMU - communication fix + active extruder status
2018-08-22 16:48:09 +02:00
dfb4bfac5b
MMU - display status while switching active extruder [PFW-465]
2018-08-22 16:38:34 +02:00
a1190e9a22
Merge pull request #1052 from PavelSindler/mmu_v2
...
fixes and improvements for multimaterial
2018-08-22 14:28:33 +00:00
7836742621
MMU communication fix - WD reset inside manage_response
2018-08-22 16:19:57 +02:00
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
fe43791673
Merge branch 'MK3' into MK3_dev
2018-08-22 16:17:10 +02:00
a81b8dbd61
remove manage_heater
2018-08-22 16:09:38 +02:00
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
d2aeb40bee
manage response function update
2018-08-22 15:46:36 +02:00
f99196a7a0
fix reseting during filament change
2018-08-22 11:09:12 +02:00
3b3d6ab472
Merge branch 'MK3' into MK3_dev
2018-08-21 17:56:34 +02:00
315bfc43dd
MMU communication fix
2018-08-21 16:41:01 +02:00
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +02:00
1cd0c6cfea
Status screen - print active MMU exrtuder (1/2 PFW465)
2018-08-20 00:59:36 +02:00
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
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
f1ad1d22ba
Menu lcd_adjust_bed fixed (Bed level correction, PFW-499)
2018-08-19 13:59:33 +02:00
cc0249126a
Document fsensor_update, remove disabled code.
2018-08-15 21:36:23 +02:00
01e71286f7
Merge pull request #1028 from mkbel/refactor_settings
...
Split settings menu into separate functions.
2018-08-15 15:42:02 +00:00
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
ac62117d6b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-13 19:38:55 +02:00
a11ae18f7e
XYZ calibration fix (progmem constants declaration) + version changed
2018-08-13 14:55:31 +02:00
b7f17292ca
Version changed
2018-08-10 20:08:10 +02:00
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
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
95e7536955
Split settings menu into separate functions.
2018-08-10 15:19:35 +02:00
923a06c164
menu data shared memory re-design
...
+code cleaning
2018-08-10 02:59:49 +02:00
d94a1c5952
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-09 21:26:33 +02:00
9ee7a2124b
removed unused code
2018-08-09 18:43:07 +02:00
796079bb08
MMU2 communication - connection after reset, fw versions, state machine
...
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
10cc077ee4
mmu_enabled = true removed
2018-08-08 21:05:25 +02:00
4e32fb7181
removed '!' signalization when accel/feedrate limits reached
2018-08-08 20:23:13 +02:00
310751397c
line endings + fixed declaration
2018-08-08 20:11:57 +02:00
990a5c9119
PFW489 (github issue 1008) - time remaining variables declared as uint32
2018-08-08 19:51:50 +02:00
2f17997622
reset safety timer everytime lcd clicked
2018-08-08 19:33:44 +02:00
ca25ec90bd
Disabled timeouts in support and failstats menus
2018-08-08 19:28:34 +02:00
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
290328445a
Merge pull request #1019 from mkbel/MK3_fix6
...
Mk3 fix6
2018-08-08 18:38:20 +02:00
c2f098e263
Merge pull request #1015 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-08-08 18:37:57 +02:00
9e09efc9f4
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
conflicts + fix
2018-08-07 20:55:08 +02:00
71f1a1f6db
MMU - communication, check after start, code cleaning
2018-08-07 20:37:59 +02:00
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
10ba3e7ffd
Move global variable count_position declaration to stepper.h header file.
2018-08-07 20:12:37 +02:00
cda93906bc
Merge pull request #1018 from prusa3d/MK3
...
Merge MK3 into MK3_dev
2018-08-07 20:09:09 +02:00
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
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
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
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
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
78f1a7914f
Fix compiler warning: sketch/xyzcal.cpp:90:6: warning: unused parameter 'de' [-Wunused-parameter].
2018-08-07 16:45:19 +02:00
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
5af4897360
Fix compiler warning sketch/stepper.cpp:1553:6: warning: unused parameter 'driver' [-Wunused-parameter]
2018-08-07 16:05:06 +02:00
880ed67785
Fix compiler warning: sketch/stepper.cpp:1499:6: warning: unused parameter 'address' [-Wunused-parameter].
2018-08-07 16:00:35 +02:00
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
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
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
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
548f4cb1fa
Fix compiler warning sketch/mmu.cpp:32:6: warning: unused parameter 'extr' [-Wunused-parameter]
2018-08-07 15:01:49 +02:00
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
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
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
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
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
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
7364b6cf80
Do not compare signed value with unsigned, add parentheses.
2018-08-07 12:52:51 +02:00
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
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
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
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
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
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
ceac1e07bd
Merge branch 'MK3' into MK3_dev
2018-08-06 16:26:38 +02:00
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
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
0c2d0bebce
merge with upstream fix
2018-08-03 19:14:17 +02:00
cf06c5171c
merge with upstream
2018-08-03 18:43:09 +02:00
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
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
5824da8310
add more extrusion to M600 load filament
2018-08-03 15:42:06 +02:00
f6094a58f7
Fix compiler warning sketch/lcd.cpp:160:6: warning: unused parameter 'cols' [-Wunused-parameter].
2018-08-03 15:37:40 +02:00
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
a85d5948c3
Make function static, save 38B flash.
2018-08-03 15:32:28 +02:00
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
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
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
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
f7f4ba2512
Make functions static, save 270B of flash.
2018-08-03 14:44:56 +02:00
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
d3360c6868
Fix compiler warning sketch/Marlin_main.cpp:9099:7: warning: unused variable 'response' [-Wunused-variable].
2018-08-02 21:46:50 +02:00
e13e3a9dc4
Merge remote-tracking branch 'prusa3d/MK3' into fix_compiler_warnings
2018-08-02 21:42:55 +02:00
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
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
63724c5f0e
Comment out variable used only for commented out debug.
2018-08-02 18:26:49 +02:00
fd70078606
Remove or disable by preprocessor unused functions in ultralcd.cpp.
2018-08-02 18:18:31 +02:00
268c52207b
Fix compiler warning: sketch/ultralcd.cpp:7457:7: warning: unused variable 'pressed' [-Wunused-variable].
2018-08-02 17:29:14 +02:00
87a650f2cb
Fix compiler warning: sketch/ultralcd.cpp:6573:23: warning: array subscript has type 'char' [-Wchar-subscripts]
2018-08-02 17:25:32 +02:00
02f5a60065
Fix compiler warning: sketch/ultralcd.cpp:6540:23: warning: array subscript has type 'char' [-Wchar-subscripts]
2018-08-02 17:23:11 +02:00
05d455fc30
Fix compiler warning sketch/ultralcd.cpp:6301:7: warning: unused variable 'tempScrool' [-Wunused-variable].
2018-08-02 17:11:23 +02:00
282ff6c577
removed unused union
2018-08-02 17:09:02 +02:00
d85c36cc77
Fix compiler warning sketch/ultralcd.cpp:3588:9: warning: unused variable 'enc_dif' [-Wunused-variable]
2018-08-02 17:08:46 +02:00
d378575a68
SNMM_V2 - default retraction declared as variable
2018-08-02 17:07:09 +02:00
1898ef9896
Fix compiler warning sketch/ultralcd.cpp:2533:7: warning: unused variable '_cm' [-Wunused-variable]
2018-08-02 17:02:12 +02:00
bf8808ce22
Fix compiler warning sketch/tmc2130.cpp: In function 'void tmc2130_set_wave(uint8_t, uint8_t, uint8_t)':
...
sketch/tmc2130.cpp:921:32: warning: 'reg' may be used uninitialized in this function [-Wmaybe-uninitialized]
This was completely innocent, as reg was zeroed inside for loop.
2018-08-02 16:50:04 +02:00
10af023eae
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-08-02 16:32:59 +02:00
3248d219f2
Restore motor power, after it is disabled in tmc2130_get_wave(). This bug manifested itself as compiler warning:
...
sketch/tmc2130.cpp:827:10: warning: unused variable 'pwr' [-Wunused-variable]
2018-08-02 16:23:30 +02:00
9f68681a1b
Fix compiler warnings: sketch/tmc2130.cpp: In function 'void tmc2130_goto_step(uint8_t, uint8_t, uint8_t, uint16_t, uint16_t)':
...
sketch/tmc2130.cpp:795:94: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
sketch/tmc2130.cpp:807:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
sketch/tmc2130.cpp: In function 'void tmc2130_get_wave(uint8_t, uint8_t*, __file*)':
sketch/tmc2130.cpp:839:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-08-02 16:21:38 +02:00
ea3d407aa7
Fix compiler warning: remove unused function float analog2tempPINDA(int raw).
2018-08-02 15:52:28 +02:00
aee31bdb8d
Fix compiler warnings sketch/stepper.cpp: In function 'void babystep(uint8_t, bool)':
...
sketch/stepper.cpp:1429:20: warning: unused variable 'x' [-Wunused-variable]
volatile float x=1./float(axis+1)/float(axis+2); //wait a tiny bit
sketch/stepper.cpp:1455:20: warning: unused variable 'x' [-Wunused-variable]
volatile float x=1./float(axis+1)/float(axis+2); //wait a tiny bit
sketch/stepper.cpp:1485:20: warning: unused variable 'x' [-Wunused-variable]
volatile float x=1./float(axis+1); //absolutely useless
sketch/stepper.cpp: In function 'void microstep_init()':
sketch/stepper.cpp:1571:17: warning: unused variable 'microstep_modes' [-Wunused-variable]
const uint8_t microstep_modes[] = MICROSTEP_MODES;
2018-08-02 15:45:33 +02:00
5ac98afeec
Fix compiler warning sketch/optiboot_w25x20cl.cpp: In function 'void optiboot_w25x20cl_enter()':
...
sketch/optiboot_w25x20cl.cpp:275:15: warning: variable 'desttype' set but not used [-Wunused-but-set-variable]
2018-08-02 14:55:38 +02:00
660a4c0d75
Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void process_commands()':
...
sketch/Marlin_main.cpp:6311:3: warning: 'filament' may be used uninitialized in this function [-Wmaybe-uninitialized]
switch (filament) {
sketch/Marlin_main.cpp:6310:44: warning: 'extruder' may be used uninitialized in this function [-Wmaybe-uninitialized]
printf_P(PSTR("Extruder: %d; "), extruder);
2018-08-02 14:28:39 +02:00
79057f070b
Fix compiler warning sketch/lcd.cpp:509:1: warning: label 'end' defined but not used [-Wunused-label].
2018-08-02 14:13:29 +02:00
1b299618c1
Fix compiler warnings: sketch/fsensor.cpp: In function 'void __vector_11()':
...
sketch/fsensor.cpp:370:50: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (pat9125_y > 0) if (fsensor_oq_yd_min > pat9125_y) fsensor_oq_yd_min = (fsensor_oq_yd_min + pat9125_y) / 2;
^
sketch/fsensor.cpp:371:51: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (pat9125_y >= 0) if (fsensor_oq_yd_max < pat9125_y) fsensor_oq_yd_max = (fsensor_oq_yd_max + pat9125_y) / 2;
2018-08-02 14:13:29 +02:00
25c00393ff
Fix compiler warning sketch/fsensor.cpp:221:10: warning: unused variable 'fsensor_autoload_c_old' [-Wunused-variable]
2018-08-02 14:13:29 +02:00
904fe7e886
Fix compiler warning: In file included from sketch/Marlin_main.cpp:67:0:
...
sketch/temperature.h: In function 'void M600_wait_for_user()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
2018-08-02 14:13:29 +02:00
d66da30843
Fix compiler warning: sketch/Dcodes.cpp: In function 'void dcode_3()':
...
sketch/Dcodes.cpp:117:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (int i = 0; i < count; i++)
2018-08-02 14:13:29 +02:00
15c598fd6a
Fix compiler warning: sketch/Dcodes.cpp: In function 'void print_eeprom(uint16_t, uint16_t, uint8_t)':
...
sketch/Dcodes.cpp:37:12: warning: unused variable 'data' [-Wunused-variable]
2018-08-02 14:13:29 +02:00
1685f83020
Merge pull request #971 from mkbel/fix_menuData_compiler_warnings
...
Fix 98 compiler warnings of type: warning: dereferencing type-punned …
2018-08-02 09:42:54 +02:00
ef8921d45e
Fix 10 compiler warnings of type: sketch/menu.cpp: In function 'void _menu_edit_int3()':
...
sketch/menu.cpp:272:51: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
#define _menu_data (*((menu_data_edit_t*)menu_data))
2018-08-01 22:43:36 +02:00
93d2b37b5c
Fix 98 compiler warnings of type: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
2018-08-01 22:43:27 +02:00
bafd290141
Sound
...
& TuneMenu
2018-08-01 22:34:58 +02:00
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
...
M600 updated
2018-08-01 19:39:08 +02:00
618aea25d6
Merge pull request #995 from PavelSindler/filament_type
...
snmm v2: send filament type to mmu
2018-08-01 19:33:44 +02:00
24e7f0d0ec
mmures fix
2018-08-01 19:29:50 +02:00
06063118bd
M600 updated
2018-08-01 18:47:28 +02:00
ca97e2232f
Merge remote-tracking branch 'ledvinap/MK3' into fix_compiler_warnings
2018-08-01 18:44:05 +02:00
b0077182e5
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:53:49 +02:00
1a2d7657dc
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:39:54 +02:00
6f824730af
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:37:09 +02:00
a8f73b3915
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:19:34 +02:00
97ec616dd1
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:14:36 +02:00
ab5593e673
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:58:09 +02:00
54adb0beea
missing eol added
2018-08-01 16:54:26 +02:00
b7ba0c5f14
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:50:44 +02:00
b35ef498f0
comments updated
2018-08-01 16:46:46 +02:00
665a885a21
Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings
2018-08-01 16:44:17 +02:00
98e921d456
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:24:07 +02:00
135c4db5da
gcode for filemant type initial version: just re-sending information to mmu
2018-08-01 15:43:13 +02:00
43cc789602
feedrate symbol changed back to double-arrow
2018-08-01 15:15:54 +02:00
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +02:00
1f5026eed7
Merge pull request #991 from XPila/MK3-new_lang
...
FSensor improvement
2018-08-01 10:43:34 +02:00
d363bd071d
Merge pull request #990 from PavelSindler/snmm_v2
...
Snmm v2: M600, communication timeouts with mmu
2018-08-01 10:43:22 +02:00
e153a29bdb
messages corrected, 5 minutes timeout when communicating with mmu
2018-08-01 10:42:09 +02:00
45ac42caff
snmm v2: manage response: wait for nozzle temp only when heating
2018-08-01 09:58:07 +02:00
c2fe3b920c
FSensor - chunk defined in mm, runout detection distance tunning
2018-08-01 01:24:35 +02:00
9509a60549
FSensor improovement
...
autoload sensitivity decreased (false triggering on MK25)
filtering algorithm more robust
additional check - fixed sync with autoload and better condition
2018-07-31 20:23:31 +02:00
be1167fae3
M600 for multimaterial: don't check if filament unload was succesfull
2018-07-31 19:18:09 +02:00
b99b73c924
missing declaration
2018-07-31 19:03:53 +02:00
40da6deef8
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
2018-07-31 19:00:42 +02:00
7731898b58
FSensor - optical quality meassurement - ignore reflexivity for materials with low data deviation
2018-07-31 16:28:11 +02:00
04d0178150
automatic M600 initial version
2018-07-31 12:24:22 +02:00
fa30353646
Live adjust Z format fix
2018-07-30 19:24:04 +02:00
67f56d3de9
merge with upstream
2018-07-30 17:24:58 +02:00
9195167541
Merge pull request #984 from MRprusa3d/MK3
...
Sound
2018-07-30 10:55:06 +02:00
f5ed37a88f
Sound
...
"stepper.cpp" revert (debug mode only)
2018-07-30 10:52:31 +02:00
970ba6fa2a
Sound
...
all cases
2018-07-29 22:59:14 +02:00
dd23835480
fsensor - fix - do not report poor filament response when disabled
2018-07-27 20:53:25 +02:00
26bc28cf89
menu_draw_float31 fixed (one digit after decimal point instead of thre)
2018-07-27 20:28:44 +02:00
e73f84279e
EEPROM offset fixed - added dummy lcd_contrast
2018-07-26 21:05:16 +02:00
4fb27866f4
Merge pull request #972 from PavelSindler/end_file_section
...
End file section for searching M84 in gcode file enlarged
2018-07-26 19:59:37 +02:00
5bc40aff85
Merge pull request #975 from XPila/MK3-new_lang
...
EEPROM dump (code D3)
2018-07-26 19:59:09 +02:00
2f9003dbdd
fsensor - better state handling
2018-07-26 19:50:33 +02:00
f819b6b304
debug output from EEPROM_WRITE_VAR and EEPROM_READ_VAR
2018-07-26 19:43:33 +02:00
d51b2666ac
no levels used in store settings function
2018-07-26 19:09:52 +02:00
1232d2dae6
M503: print autoretract value fixed
2018-07-26 17:26:05 +02:00
9235ffb497
T code for SNMM_V2 fix
2018-07-26 17:03:43 +02:00
285f2ccbd9
Merge pull request #976 from PavelSindler/MK3_for_merging
...
config for mmu updated
2018-07-26 15:00:33 +02:00
5bda19b9f7
config for mmu updated
2018-07-26 14:59:49 +02:00
691e7a24ed
EEPROM dump (code D3)
2018-07-26 13:20:35 +02:00
9c1ef5e414
Merge pull request #974 from mkbel/fix_compiler_warnings
...
Save 88B FLASH and fix compiler warnings:
2018-07-26 09:41:31 +02:00
cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3
...
PowerPanic IV
2018-07-26 09:40:57 +02:00
716e6c209c
Save 88B FLASH and fix compiler warnings:
...
sketch/cmdqueue.cpp: In function 'bool cmdqueue_pop_front()':
sketch/cmdqueue.cpp:67:56: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (++ bufindr; bufindr < sizeof(cmdbuffer) && cmdbuffer[bufindr] == 0; ++ bufindr) ;
^
sketch/cmdqueue.cpp: In function 'bool cmdqueue_could_enqueue_back(int, bool)':
sketch/cmdqueue.cpp:170:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
^
sketch/cmdqueue.cpp:172:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
^
sketch/cmdqueue.cpp:196:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
^
sketch/cmdqueue.cpp:198:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
^
sketch/cmdqueue.cpp: In function 'void get_command()':
sketch/cmdqueue.cpp:380:10: warning: variable 'rx_buffer_full' set but not used [-Wunused-but-set-variable]
bool rx_buffer_full = false; //flag that serial rx buffer is full
^
sketch/cmdqueue.cpp: In function 'uint16_t cmdqueue_calc_sd_length()':
sketch/cmdqueue.cpp:697:54: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (++ _bufindr; _bufindr < sizeof(cmdbuffer) && cmdbuffer[_bufindr] == 0; ++ _bufindr) ;
^
2018-07-25 21:18:29 +02:00
5be82962ee
PowerPanic IV
2018-07-25 19:24:41 +02:00
da82062d41
End file section for searching M84 in gcode file were enlarged (compatibility with mmu Slic3r)
2018-07-25 18:26:22 +02:00
9b4f786325
Merge pull request #970 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-07-25 17:08:07 +02:00
59c0127b77
automatic M600 for mmu v2: work in progress
2018-07-25 16:48:39 +02:00
620c015b65
Fix compiler warning: sketch/ultralcd.cpp:855:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
...
for (int dots = 0; dots < heating_status_counter; dots++)
2018-07-25 16:30:50 +02:00
58155cacbc
Fix compiler warning sketch/ultralcd.cpp:6711:24: warning: suggest parentheses around comparison in operand of '^' [-Wparentheses].
...
Add parentheses to match expressions on following lines. This changed expression, as == has precedence over ^, but truth table of expression is anyway the same regardless of parentheses.
2018-07-25 16:24:08 +02:00
08b56fe1a4
Fix compiler warning sketch/cardreader.cpp:706:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare].
...
Remove redundant and masked int d variable.
Fix indentation of presort() to make it clear, that it is not part of for loop.
2018-07-25 15:51:00 +02:00
5f8e87e649
Fix compiler warning: sketch/SdFatUtil.cpp:49:7: warning: unused variable 'i' [-Wunused-variable]
2018-07-25 15:19:10 +02:00
702fa307bb
Fix compiler warning sketch/Marlin_main.cpp:478:14: warning: 'delta' defined but not used [-Wunused-variable].
...
Variable was never used since "Initial commit".
2018-07-25 15:08:17 +02:00
904db96cd1
Fix compiler warning sketch/tmc2130.h:123:3: warning: 'tmc2130_axis_config' defined but not used [-Wunused-variable]
2018-07-25 15:03:38 +02:00
98ba79e518
Fix out of array bounds access.
...
Manifested as compiler warnings:
In file included from sketch/Marlin_main.cpp:67:0:
sketch/temperature.h: In function 'bool gcode_M45(bool, int8_t)':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h: In function 'void long_pause()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h: In function 'void process_commands()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
2018-07-25 12:52:02 +02:00
e6dcbedf82
Fix compiler warning: sketch/Marlin_main.cpp:8833:16: warning: variable 'nplanner_blocks' set but not used [-Wunused-but-set-variable]
2018-07-25 11:58:48 +02:00
b357399c6b
Fix compiler warning sketch/Marlin_main.cpp:1846:1: warning: control reaches end of non-void function [-Wreturn-type].
2018-07-25 11:54:55 +02:00
d6021d047d
Merge pull request #969 from mkbel/fix_compiler_warnings
...
Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer o…
2018-07-25 11:36:34 +02:00
c7de8a91bb
Fix compiler warning sketch/Marlin_main.cpp:8811:10: warning: unused variable 'extruder_abs_pos' [-Wunused-variable]
...
Variable started to be unused in commit
fde0efc75c
2018-07-25 11:33:32 +02:00
0f577cace6
Fix compiler warning: sketch/Marlin_main.cpp:8759:8: warning: unused variable 'c' [-Wunused-variable]
2018-07-24 19:40:43 +02:00
bd868132cc
Fix compiler warnings:
...
sketch/Marlin_main.cpp:8756:8: warning: unused variable 'x_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:15: warning: unused variable 'y_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:22: warning: unused variable 'z_pos' [-Wunused-variable]
2018-07-24 19:31:18 +02:00
c19bf72ba9
Fix compiler warning sketch/Marlin_main.cpp:8220:15: warning: unused variable 'k' [-Wunused-variable].
2018-07-24 18:33:44 +02:00
3f0684ea30
Fix compiler warning - remove unused variable.
2018-07-24 18:27:05 +02:00
f7754faaf1
Fix compiler warning sketch/Marlin_main.cpp:7092:14: warning: variable 'make_move' set but not used [-Wunused-but-set-variable]
2018-07-24 18:06:38 +02:00
68a3ae5456
Fix compiler warning sketch/Marlin_main.cpp:6331:11: warning: unused variable 'cnt' [-Wunused-variable]
2018-07-24 17:57:26 +02:00
b44f71fd33
Fix compiler warning sketch/Marlin_main.cpp:6267:16: warning: variable 'TooLowZ' set but not used [-Wunused-but-set-variable]
...
int8_t TooLowZ = 0;
This variable was unused even in "Initial commit".
2018-07-24 17:30:37 +02:00
d5ab657cdf
Fix compiler warnings:
...
file included from sketch/Configuration_prusa.h:2:0,
from sketch/Configuration.h:43,
from sketch/Marlin.h:22,
from sketch/Marlin_main.cpp:46:
sketch/Marlin_main.cpp: In function 'void process_commands()':
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:106:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
#define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2
^
sketch/Marlin_main.cpp:5772:16: note: in expansion of macro 'NORMAL_MAX_ACCEL_XY'
if (val > NORMAL_MAX_ACCEL_XY)
^
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:102:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
#define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2
^
sketch/Marlin_main.cpp:5774:23: note: in expansion of macro 'SILENT_MAX_ACCEL_XY'
if (val_silent > SILENT_MAX_ACCEL_XY)
2018-07-24 17:22:29 +02:00
3a532a46bb
Fix compiler warning sketch/Marlin_main.cpp:5737:15: warning: unused variable 'area' [-Wunused-variable]
...
This variable was unused even in "Initial commit".
2018-07-24 17:17:44 +02:00
97ec55b951
Fix compiler warning sketch/Marlin_main.cpp:4307:7: warning: unused variable 'Z_PROBE_FEEDRATE' [-Wunused-variable].
...
This variable was unused even in "Initial commit".
2018-07-24 17:07:21 +02:00
8575645eec
Fix compiler warning: sketch/Marlin_main.cpp:4193:15: warning: statement has no effect [-Wunused-value]
...
fan_speed[1];
2018-07-24 16:56:56 +02:00
9edb07afa5
Fix compiler warning sketch/Marlin_main.cpp:4218:10: warning: variable 'verbosity_level' set but not used [-Wunused-but-set-variable]
2018-07-24 16:54:12 +02:00
219b98b7e1
Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void setup()':
...
sketch/Marlin_main.cpp:1478:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == 0xFFFF)) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
^
sketch/Marlin_main.cpp:1479:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (farm_no == 0xFFFF) farm_no = 0;
^
2018-07-24 16:25:10 +02:00
5ceece08f8
Fix compiler warning sketch/Marlin_main.cpp:1072:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
...
if ((state * LANGBOOT_BLOCKSIZE) < header.size)
2018-07-24 16:07:28 +02:00
3811e30df9
Fix compiler warning: sketch/Marlin_main.cpp:1042:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-07-24 16:04:19 +02:00
0bde84983b
Fix compiler warning sketch/Marlin_main.cpp:798:6: warning: unused variable 'cursor_pos' [-Wunused-variable]
2018-07-24 15:47:39 +02:00
fd3e0115b6
Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer overflow in expression [-Woverflow]
...
lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);
Use public interface instead of manipulating lcd_next_update_millis timer.
2018-07-24 15:20:03 +02:00
6cf17fa760
Delete TMP file added accidentally by commit "timeout when waiting for mmu OK ".
2018-07-24 14:20:13 +02:00
77cc55ed76
Merge pull request #951 from PavelSindler/use_timer
...
Use timer
2018-07-24 09:31:45 +02:00
90b763775c
Merge pull request #966 from PavelSindler/MK3_for_merging
...
config for MK2.5 change
2018-07-23 21:13:22 +02:00
e47656df97
config for MK2.5 change
2018-07-23 21:12:50 +02:00
3fd705d763
Merge pull request #965 from PavelSindler/MK3_for_merging
...
config for MK25 Rambo1.0 changed
2018-07-23 21:09:46 +02:00
e4641d3db4
config for MK25 Rambo1.0 changed
2018-07-23 21:09:07 +02:00
064b8a4f24
Merge pull request #964 from MRprusa3d/MK3
...
PowerPanic & Sound III
2018-07-23 20:31:32 +02:00
2d078f17b0
Merge pull request #963 from PavelSindler/MK3_for_merging
...
SUPPORT_VERBOSITY temporary solution
2018-07-23 20:12:05 +02:00
f72f385c82
SUPPORT_VERBOSITY temporary solution
2018-07-23 20:11:16 +02:00
d35124f637
Merge pull request #962 from PavelSindler/MK3_for_merging
...
config file updated
2018-07-23 20:06:35 +02:00
c65efd0114
config file updated
2018-07-23 20:05:42 +02:00
c7d7389e27
PowerPanic & Sound
2018-07-23 20:04:47 +02:00
2911b92b8f
Merge pull request #961 from mkbel/fix_compiler_warnings
...
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 20:00:28 +02:00
e77a54034c
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp]
2018-07-23 18:12:08 +02:00
d347cdaf1a
Merge pull request #960 from XPila/MK3-new_lang
...
BOOTAPP support defined for EINSY
2018-07-23 17:32:08 +02:00
0659cf0287
Merge pull request #953 from PavelSindler/farm_mode_fix
...
G98 saves farm number
2018-07-23 17:31:42 +02:00
6444573c92
BOOTAPP support defined for EINSY
...
W25x20CL test before entering optiboot (in some error cases it hangs in optiboot and then message not shown)
2018-07-23 17:14:18 +02:00
87a9a721ee
Merge pull request #955 from mkbel/fix_compiler_warnings
...
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 15:15:24 +02:00
4eb4924d81
Optiboot enabled
2018-07-23 14:41:10 +02:00
b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings
2018-07-23 14:38:43 +02:00
dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang
...
FSensor - optical quality meassurement
2018-07-23 14:37:16 +02:00
896734c06b
Display '!' instead of 'FR' on status screen when feedrate or acceleration limit reached.
2018-07-23 14:30:41 +02:00
7cfa3156c7
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp]
2018-07-23 13:47:15 +02:00
88cce94cf9
Revert "Revert "Save 80B of flash and 8B of RAM and fix compiler warning:""
...
This reverts commit 77426b563a
2018-07-23 13:35:38 +02:00
f0d939140b
Menu extruder info fixed
2018-07-23 12:54:48 +02:00
1a9643c892
G98 saves farm no
2018-07-23 11:49:06 +02:00
18419eefc4
no timeouts when communicating with mmu (temporarily ?)
2018-07-23 10:50:58 +02:00
efd03b426f
final edits to fit changes on upstream
2018-07-23 09:14:22 +02:00
565a6db3e4
use timer class
2018-07-22 16:26:12 +02:00
60b4db15e0
FSensor - M600 fix + cond. translation + tunning filter and params
2018-07-22 16:14:13 +02:00
5b6fb9e49b
Use Timer class for button blanking. Save 74B FLASH and 1B RAM.
2018-07-22 15:05:24 +02:00
c6a3f073dd
FSensor - M600/autoload fix + optical quality meassurement
2018-07-21 17:04:29 +02:00
612e83b473
max_feedrate and max_acceleration limitation (ConfigurationStore)
2018-07-21 12:33:29 +02:00
f07d08697a
max_feedrate and max_acceleration limitation fix (M201, M203)
2018-07-21 12:24:57 +02:00
980c044dac
FSensor - code cleaning
2018-07-21 01:57:41 +02:00
2e260aeccc
FSensor - autoload fixed
2018-07-21 01:30:16 +02:00
1309c52bcf
FSensor - code cleaning + simplification
...
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
2018-07-20 23:48:00 +02:00
ca2d69271c
filament_autoload_enabled renamed to fsensor_watch_autoload
2018-07-20 20:37:50 +02:00
328cae1147
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-07-20 20:35:00 +02:00
0f91bf9527
FSensor - optical quality meassurement durring load filament
2018-07-20 20:30:08 +02:00
eac963e3a0
timeout prolonged
2018-07-20 18:03:52 +02:00
80ca5f3d33
merge with upstream fixes
2018-07-20 17:51:44 +02:00
a7e139ad8d
limist added to configuration files
2018-07-20 17:38:24 +02:00
814572fed5
merge with upstream
2018-07-20 17:22:06 +02:00
5fd1acaf81
Revert "PowerPanic"
2018-07-20 15:20:57 +02:00
3c1f13377c
mmu first layer cal. status line message order changed
2018-07-20 14:58:36 +02:00
cfe49a243a
first layer calibration: intitial version
2018-07-20 14:37:01 +02:00
fd9b9acf4e
FSensor, code cleaning + optical quality meassurement
2018-07-20 14:03:22 +02:00
b0ebea0c61
mmu: switching extruders simplified
2018-07-20 13:20:07 +02:00
bbec1ccfd4
Add files via upload
2018-07-20 04:34:12 +00:00
a09d44b869
PowerPanic
...
experimental
2018-07-20 04:47:33 +02:00
5483bee885
FSensor - meassuring filament optical quality
2018-07-19 20:55:38 +02:00
045cb5bb41
stop print for mmu initial version
2018-07-19 20:46:46 +02:00
538f8a8858
Merge remote-tracking branch 'upstream/MK3' into snmm_v2
2018-07-19 20:27:51 +02:00
231a6dcf1b
M600 for single material fix
2018-07-19 20:27:39 +02:00
86882ae10a
M600 for snmm_v2 intial working version
2018-07-19 20:16:42 +02:00
2a66251170
_DISABLE_M42_M226 removed
2018-07-19 19:33:28 +02:00
fd0b7c25e5
TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode
2018-07-19 19:12:46 +02:00
2ce210a8bb
TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode
2018-07-19 18:56:01 +02:00
c3e28b490c
TMC2130 old style limits removed
...
+menu draw_edit fix
2018-07-19 17:42:59 +02:00
b46953c790
LCD menu optimalization - lcd_draw_edit removed
2018-07-19 16:57:31 +02:00
5fecb7a2dc
M600
2018-07-19 16:17:46 +02:00
3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
...
Filament sensor tunning
2018-07-19 15:22:47 +02:00
fa9d4550f0
PFW-448 menu items displaying fix
2018-07-19 15:21:46 +02:00
42d2f31248
PFW-446 Stop print fix (recursion in lcd_update)
2018-07-19 14:23:45 +02:00
6db1c6dc3b
Long press Move Z fixed
2018-07-19 13:54:56 +02:00
7600848533
load to nozzle function, M600 work in progress
2018-07-19 13:14:29 +02:00
afb9ca4687
FSensor - removed fsensor blocking while load, added filament quality meassurement
2018-07-18 17:45:54 +02:00
2006ae58f1
typo fix
2018-07-18 16:54:40 +02:00
5676550452
missing get response readded
2018-07-18 16:52:10 +02:00
b9be718deb
timeout used everywhere where we are waiting for mmu reponse
2018-07-18 16:25:31 +02:00
0a43b9ce6b
timeout when waiting for mmu OK
2018-07-18 16:17:45 +02:00
6e760ef76d
merge with upstream cleanup
2018-07-18 15:34:33 +02:00
2c06cb68d1
FSensor tunning - filtering changed, chunk length = 0.64mm and MAX_ERR = 10
2018-07-17 20:04:12 +02:00
d3e9543fee
Fix undefined behaviour
...
Argument evaluation order is undefined
2018-07-17 19:12:48 +02:00
48d6ebffd8
Fix code_seen
...
char/string version was mixed
2018-07-17 18:57:28 +02:00
2af973bfba
Remove uninitialized variables
2018-07-17 18:57:28 +02:00
3f17364589
Fix various warnings
2018-07-17 18:57:28 +02:00
33bf363798
Fix st_get_position_mm
...
call it, do not index function pointer
2018-07-17 18:57:28 +02:00
ef93de95d8
Fix int overflow
2018-07-17 18:57:28 +02:00
ba8bcf76be
Use signed value where appropriate
2018-07-17 17:57:38 +02:00
7bbf9953f2
Fix missing return warnings
2018-07-17 17:57:38 +02:00
6cebf09b88
Fix operator priority
...
== has higher precedence to &, test was always false
2018-07-17 17:57:38 +02:00
ceeb97f38c
Parentheses around macro argument
...
Not triggering error in this case
2018-07-17 17:57:38 +02:00
baddf38dbc
Make card filename `const`
...
Fixes warning in filename_wldsd
2018-07-17 17:55:05 +02:00
f2981bf322
Fix type coversion warnings in language.c
2018-07-17 17:55:05 +02:00
d64754468a
Fix undefined function warnings
2018-07-17 17:55:05 +02:00
fd332c1ff1
Fix ADC index overflow
...
Use bitmap bitcount to map pin number to adc_values array index. Old
code fails for TEMP_AMBIENT_PIN and VOLT_BED_PIN
2018-07-17 17:55:04 +02:00
3f92630fd1
Fix setTargetHotend array overflow
...
Special function may be used instead (setTargetHotends(temp))
2018-07-17 17:55:04 +02:00
33f9af65c8
merge with upstream/MK3
2018-07-17 16:36:53 +02:00
64929a78f5
Linearity correction menu disabled
2018-07-17 13:35:04 +02:00
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang
2018-07-17 11:47:01 +02:00
9e2985dfba
Revert "Use timer"
2018-07-17 11:38:38 +02:00
77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"
2018-07-17 11:28:44 +02:00
85c37d1225
Merge branch 'MK3' into fix_compiler_warnings
2018-07-17 10:56:25 +02:00
322978c920
Merge branch 'MK3_mk_prep' into MK3
2018-07-17 10:03:31 +02:00
e1a71118f9
Merge pull request #917 from mkbel/use_Timer
...
Use timer
2018-07-17 09:57:56 +02:00
eb3307e8fc
Merge pull request #889 from mkbel/fix_PRUSA_RESET
...
Do not skip bootloader when initiating reset by farm PRUSA RESET comm…
2018-07-17 09:52:41 +02:00
2451455974
LCD menu optimalization - initial lcd update fix
2018-07-16 23:54:46 +02:00
19a72ef9eb
LCD menu optimalization - LiquidCrystal_Prusa removed
2018-07-16 23:23:15 +02:00
fddc02adfa
version changed
2018-07-16 21:01:40 +02:00
d1de75eb19
LCD menu optimalization - createChar
...
+code order
2018-07-16 19:53:34 +02:00
e22d204e8e
LCD menu optimalization - print functions
...
+removed unused code
2018-07-16 19:29:27 +02:00
a575c028bf
resend request sends OK
2018-07-16 19:20:39 +02:00
68e59399af
LCD menu optimalization - lcd_printPGM replaced with lcd_puts_P
2018-07-16 18:08:01 +02:00
0eaabed50c
LCD menu optimalization - renamed lcd_implementation clear
...
+code order
2018-07-16 17:54:16 +02:00
fd3fc31304
LCD menu optimalization - conversion functions - source separation
2018-07-16 17:23:35 +02:00
0924ad50d5
New localization vs octoprint fix - do not translate protocol messages
2018-07-16 04:50:43 +02:00
a7df5f368b
LCD menu optimalization - sdcard menu fixed
2018-07-16 04:24:27 +02:00
b6223d5623
LCD menu optimalization
2018-07-16 04:13:26 +02:00
268d2634f0
LCD menu optimalization - lcd and menu
...
removed unused code and conditional translation
2018-07-16 02:13:52 +02:00
0e15a4025b
whitespace
2018-07-15 20:24:24 +02:00
6824ab65dd
G28 fix
2018-07-15 20:00:29 +02:00
39bb855333
LCD menu optimalization - menu_item_edit_int3
...
MenuStack removed
FILAMENT_LCD_DISPLAY and ENCODER_STEPS_PER_MENU_ITEM removed (unused)
EXPERIMENTAL_FEATURES menu removed
2018-07-15 18:37:59 +02:00
42893b7a94
Fix compiler warnings:
...
sketch/Marlin_main.cpp:806:6: warning: unused variable 'cursor_pos' [-Wunused-variable]
sketch/Marlin_main.cpp:1922:7: warning: unused variable 'stack_integrity' [-Wunused-variable]
sketch/Marlin_main.cpp:4254:8: warning: unused variable 'clamped' [-Wunused-variable]
2018-07-13 20:47:40 +02:00
83081b0fba
Fix compiler warning: sketch/LiquidCrystal_Prusa.cpp:502:1: warning: label 'end' defined but not used [-Wunused-label].
2018-07-13 20:00:20 +02:00
ea59d8a6e6
Fix compiler warnings:
...
In file included from sketch/ConfigurationStore.cpp:4:0:
sketch/ultralcd.h:40:15: warning: 'void lcd_selftest_v()' declared 'static' but never defined [-Wunused-function]
static void lcd_selftest_v();
^
sketch/ultralcd.h:42:15: warning: 'bool lcd_selfcheck_endstops()' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_endstops();
^
sketch/ultralcd.h:45:15: warning: 'void reset_crash_det(char)' declared 'static' but never defined [-Wunused-function]
static void reset_crash_det(char axis);
^
sketch/ultralcd.h:46:15: warning: 'bool lcd_selfcheck_axis_sg(char)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_axis_sg(char axis);
^
sketch/ultralcd.h:47:15: warning: 'bool lcd_selfcheck_axis(int, int)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_axis(int _axis, int _travel);
^
sketch/ultralcd.h:54:15: warning: 'bool lcd_selfcheck_check_heater(bool)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_check_heater(bool _isbed);
^
sketch/ultralcd.h:55:15: warning: 'int lcd_selftest_screen(int, int, int, bool, int)' declared 'static' but never defined [-Wunused-function]
static int lcd_selftest_screen(int _step, int _progress, int _progress_scale, bool _clear, int _delay);
^
sketch/ultralcd.h:56:15: warning: 'void lcd_selftest_screen_step(int, int, int, const char*, const char*)' declared 'static' but never defined [-Wunused-function]
static void lcd_selftest_screen_step(int _row, int _col, int _state, const char *_name, const char *_indicator);
^
sketch/ultralcd.h:57:15: warning: 'bool lcd_selftest_manual_fan_check(int, bool)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite);
^
sketch/ultralcd.h:58:15: warning: 'bool lcd_selftest_fan_dialog(int)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selftest_fan_dialog(int _fan);
^
sketch/ultralcd.h:59:15: warning: 'bool lcd_selftest_fsensor()' declared 'static' but never defined [-Wunused-function]
static bool lcd_selftest_fsensor();
^
sketch/ultralcd.h:60:15: warning: 'void lcd_selftest_error(int, const char*, const char*)' declared 'static' but never defined [-Wunused-function]
static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2);
sketch/ultralcd.h:68:24: warning: 'blink' defined but not used [-Wunused-variable]
static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD
sketch/ultralcd.h:222:13: warning: 'void lcd_colorprint_change()' declared 'static' but never defined [-Wunused-function]
static void lcd_colorprint_change();
^
sketch/ultralcd.h:223:12: warning: 'int get_ext_nr()' declared 'static' but never defined [-Wunused-function]
static int get_ext_nr();
^
sketch/ultralcd.h:225:13: warning: 'void extr_adj_0()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_0();
^
sketch/ultralcd.h:226:13: warning: 'void extr_adj_1()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_1();
^
sketch/ultralcd.h:227:13: warning: 'void extr_adj_2()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_2();
^
sketch/ultralcd.h:228:13: warning: 'void extr_adj_3()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_3();
^
sketch/ultralcd.h:229:13: warning: 'void fil_load_menu()' declared 'static' but never defined [-Wunused-function]
static void fil_load_menu();
^
sketch/ultralcd.h:230:13: warning: 'void fil_unload_menu()' declared 'static' but never defined [-Wunused-function]
static void fil_unload_menu();
^
sketch/ultralcd.h:231:13: warning: 'void extr_unload_0()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_0();
^
sketch/ultralcd.h:232:13: warning: 'void extr_unload_1()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_1();
^
sketch/ultralcd.h:233:13: warning: 'void extr_unload_2()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_2();
^
sketch/ultralcd.h:234:13: warning: 'void extr_unload_3()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_3();
^
sketch/ultralcd.h:235:13: warning: 'void lcd_disable_farm_mode()' declared 'static' but never defined [-Wunused-function]
static void lcd_disable_farm_mode();
^
sketch/ultralcd.h:236:13: warning: 'void lcd_set_fan_check()' declared 'static' but never defined [-Wunused-function]
static void lcd_set_fan_check();
^
sketch/ultralcd.h:240:13: warning: 'char snmm_stop_print_menu()' declared 'static' but never defined [-Wunused-function]
static char snmm_stop_print_menu();
^
sketch/ultralcd.h:242:14: warning: 'void lcd_sort_type_set()' declared 'static' but never defined [-Wunused-function]
static void lcd_sort_type_set();
^
sketch/ultralcd.h:244:14: warning: 'float count_e(float, float, float)' declared 'static' but never defined [-Wunused-function]
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
^
sketch/ultralcd.h:245:13: warning: 'void lcd_babystep_z()' declared 'static' but never defined [-Wunused-function]
static void lcd_babystep_z();
^
sketch/ultralcd.h:290:13: warning: 'void lcd_send_status()' declared 'static' but never defined [-Wunused-function]
static void lcd_send_status();
^
sketch/ultralcd.h:291:13: warning: 'void lcd_connect_printer()' declared 'static' but never defined [-Wunused-function]
static void lcd_connect_printer();
sketch/ultralcd.h:227:13: warning: 'char snmm_stop_print_menu()' declared 'static' but never defined [-Wunused-function]
static char snmm_stop_print_menu();
^
sketch/ultralcd.h:229:14: warning: 'void lcd_sort_type_set()' declared 'static' but never defined [-Wunused-function]
static void lcd_sort_type_set();
^
sketch/ultralcd.h:231:14: warning: 'float count_e(float, float, float)' declared 'static' but never defined [-Wunused-function]
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
^
sketch/ultralcd.h:232:13: warning: 'void lcd_babystep_z()' declared 'static' but never defined [-Wunused-function]
static void lcd_babystep_z();
2018-07-13 19:50:51 +02:00
6bd8e60176
Fix compiler warning:
...
In file included from sketch/ConfigurationStore.cpp:4:0:
sketch/ultralcd.h:12:14: warning: 'void lcd_language_menu()' declared 'static' but never defined [-Wunused-function]
static void lcd_language_menu();
2018-07-13 19:27:25 +02:00
ee366ce3b5
Fix compiler warnings:
...
In file included from sketch/ConfigurationStore.cpp:3:0:
sketch/temperature.h:193:14: warning: 'temp_runaway_status' defined but not used [-Wunused-variable]
static float temp_runaway_status[4];
^
sketch/temperature.h:194:14: warning: 'temp_runaway_target' defined but not used [-Wunused-variable]
static float temp_runaway_target[4];
^
sketch/temperature.h:195:14: warning: 'temp_runaway_timer' defined but not used [-Wunused-variable]
static float temp_runaway_timer[4];
^
sketch/temperature.h:196:12: warning: 'temp_runaway_error_counter' defined but not used [-Wunused-variable]
static int temp_runaway_error_counter[4];
2018-07-13 19:18:54 +02:00
ff56e491e8
Save 2B flash, fix compiler warning:
...
In file included from sketch/ConfigurationStore.cpp:5:0:
sketch/ConfigurationStore.h: In function 'uint8_t calibration_status_store(uint8_t)':
sketch/ConfigurationStore.h:24:124: warning: no return statement in function returning non-void [-Wreturn-type]
inline uint8_t calibration_status_store(uint8_t status) { eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS, status); }
2018-07-13 18:49:14 +02:00
c251777590
Fix compiler warning:
...
In file included from sketch/BlinkM.cpp:5:0:
sketch/Marlin.h:422:13: warning: 'void print_time_remaining_init()' declared 'static' but never defined [-Wunused-function]
static void print_time_remaining_init();
Make local functions static. Saves 6B of flash.
2018-07-13 18:44:54 +02:00
bc99db8233
Fix compiler warning: sketch/uart2.c:48:1: warning: control reaches end of non-void function [-Wreturn-type]
2018-07-13 18:35:42 +02:00
f620a66211
Use public interface instead of manipulating lcd_next_update_millis timer.
2018-07-13 18:26:52 +02:00
49dd8d83fb
Fix indentation in lcd_update() and split some of the preprocessor disabled functionality into separate functions. No change in resulting binary.
2018-07-13 18:06:33 +02:00
9d72062cd7
Save 82B flash and 1B RAM, fix compiler warning:
...
sketch/ultralcd.cpp:7212:61: warning: integer overflow in expression [-Woverflow]
lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);
2018-07-13 17:42:47 +02:00
68a5a4b74e
FEEDRATE_LIMIT fix
2018-07-12 23:51:15 +02:00
f9f718e787
Config_PrintSettings fix
2018-07-12 23:50:41 +02:00
37f34a1ba3
Config_PrintSettings (M503) - printf optimized (~800 bytes flash saved)
2018-07-12 23:40:04 +02:00
007717bfd2
Disabled TMC2130 feedrate and acceleration limits (should be properly limited with M201-M203)
2018-07-12 19:04:44 +02:00
070e6f49e8
Fix error in sine wave compression algorithm in tmc2130. This problem could manifest itself only for negative function slope, which is not used.
2018-07-12 18:56:11 +02:00
2116262845
Fix *_MAX_ACCEL integer overflow.
2018-07-12 18:46:12 +02:00
7c78559b0e
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-12 18:27:06 +02:00
bc1f416602
Fix compiler warning symbol __AVR redefined.
2018-07-12 18:26:29 +02:00
b35a212d15
PAT9125 optimalization (rewrited to C, 8bit sampling)
2018-07-12 18:11:07 +02:00
2c00f065fd
Fix error in recovering after power panic. (Function pointer was passed instead of function been called.)
...
It manifested istself as following compiler warnings:
sketch/Marlin_main.cpp: In function 'void print_physical_coordinates()':
sketch/Marlin_main.cpp:9065:86: warning: pointer to a function used in arithmetic [-Wpointer-arith]
printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
^
sketch/Marlin_main.cpp:9065:114: warning: pointer to a function used in arithmetic [-Wpointer-arith]
printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
^
sketch/Marlin_main.cpp:9065:142: warning: pointer to a function used in arithmetic [-Wpointer-arith]
printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
^
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
}
^
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
2018-07-12 18:06:07 +02:00
410e911364
SWI2C for PAT9125 simplified/optimized
2018-07-12 17:55:38 +02:00
fb6aa72de9
Fix compiler warnings in sm4.c
2018-07-12 17:38:13 +02:00
2b5e63eb7f
Fix compiler warnings in language.c and document _SEC_LANG_TABLE macro.
2018-07-12 17:23:50 +02:00
f24c71d5a9
removed unused variable SDscrool
2018-07-12 17:01:03 +02:00
8d5e6a65cd
LCD sdcard menu fix
...
+removed debug code
2018-07-12 16:27:02 +02:00
bf0bbb215e
Merge branch 'MK3' into fix_compiler_warnings
2018-07-12 14:10:02 +02:00
07f6ddfb69
filament loading corrected
2018-07-11 22:34:32 +02:00
9b7cc60b42
filament statistics hotfix, load filament move Z simplified
2018-07-11 21:59:43 +02:00
11aa775322
move in Z before filament loading: intial version
2018-07-11 21:59:23 +02:00
29d1052f0e
Save 80B of flash and 8B of RAM and fix compiler warning:
...
sketch/adc.c: In function 'adc_init':
sketch/adc.c:20:2: warning: implicit declaration of function 'printf' [-Wimplicit-function-declaration]
printf(("adc_init\n"));
^
sketch/adc.c:20:2: warning: incompatible implicit declaration of built-in function 'printf' [enabled by default]
2018-07-11 21:58:49 +02:00
d18160cab5
splash screen
2018-07-11 21:58:06 +02:00
1357e27b55
FilamentAutoload setting by shipping preparation
2018-07-11 21:56:25 +02:00
d658bf56cf
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 21:55:21 +02:00
29d73029ae
Merge pull request #916 from MRprusa3d/MK3
...
FilamentAutoload setting by shipping preparation
2018-07-11 21:42:42 +02:00
fc657bc31e
Merge branch 'MK3' into use_Timer
2018-07-11 21:24:18 +02:00
02bd319a6c
Merge pull request #818 from 3d-gussner/MK3_fix7
...
Fix warning #7
2018-07-11 21:04:13 +02:00
4b295c4091
FilamentAutoload setting by shipping preparation
2018-07-11 20:45:56 +02:00
066c044396
fixed tmc2130_wr_CHOPCONF
...
backlash - initial implementation (disabled by default)
removed menu "W25x20CL init"
splashscreen displayed before entering optiboot
2018-07-11 20:02:46 +02:00
d167b631fb
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 18:52:58 +02:00
1ad49dc5e9
first working version
2018-07-10 10:45:45 +02:00
c7745dfb83
Merge pull request #908 from XPila/MK3-new_lang
...
TMC2130 gcodes for live motor tunning:
2018-07-09 16:58:09 +02:00
771cead291
TMC2130 gcodes for live motor tunning:
...
TMC_SET_WAVE_X..E (linearity correction)
TMC_SET_CHOP_X..E (chopper configuration - 4 args - toff, hstr, hend, tbl)
2018-07-09 16:44:10 +02:00
bde81de984
load and unload filament functions for snmm_v2
2018-07-09 15:24:59 +02:00
18f007d7b2
Merge remote-tracking branch 'upstream/MK3' into snmm_v2
2018-07-09 14:47:10 +02:00
928dcb1417
missing initialization fix
2018-07-09 14:45:59 +02:00
9d0a15da90
init
2018-07-09 14:20:56 +02:00
5979bf5e0c
T-codes for MMU_V2: initial version
2018-07-09 13:57:36 +02:00
8d2acd02a5
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-09 12:44:58 +02:00
e2ff00b05f
Menu optimalization - SDcard menu - initial implementation for async variant
2018-07-09 12:44:19 +02:00
c8d5648ea8
Version changed
2018-07-02 16:53:10 +02:00
3248edc1ca
Do not skip bootloader when initiating reset by farm PRUSA RESET command.
...
Set bootloader magic and run flag before watchdog reset in PRUSA RESET command.
2018-06-26 20:12:09 +02:00
6abde828fa
version changed
2018-06-26 18:53:11 +02:00
65880fac67
Merge pull request #875 from PavelSindler/fix_crash_restore
...
dummy "ok" reponse readded (fix for SD card print with Octoprint: fix…
2018-06-25 19:08:43 +02:00
6f617696ac
dummy "ok" reponse readded (fix for SD card print with Octoprint: fixes communication timeout issues)
2018-06-25 18:52:22 +02:00
01f04cc406
Merge pull request #874 from XPila/MK3
...
XYZ cal. details screen fixed
2018-06-25 18:29:58 +02:00
3ff4105024
XYZ cal. details screen fixed
2018-06-25 18:28:43 +02:00
3674673faa
Merge pull request #873 from PavelSindler/MK3_for_merging
...
status screen update
2018-06-25 17:56:53 +02:00
81c0c01825
status screen update
2018-06-25 17:50:37 +02:00
20f98d487a
Merge pull request #872 from XPila/MK3
...
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:58 +02:00
fe9b4e5f1f
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:07 +02:00
0fccf5a737
Merge pull request #870 from XPila/MK3
...
Mk3
2018-06-25 17:36:22 +02:00
5d531b0f66
save extruder relative mode correctly
2018-06-25 17:30:20 +02:00
12de2f95e6
Farm mode: PFW360, PFW361, PFW362, PFW363
2018-06-25 17:29:34 +02:00
6d4c3b8b27
Farm mode - reset using watchdog for MK3
2018-06-25 16:04:47 +02:00
bd5b51c7e4
LCD menu optimalization
2018-06-24 12:41:36 +02:00
3a1c004848
LCD menu optimalization
2018-06-23 14:42:58 +02:00
f7262637f8
LCD menu optimalization
2018-06-23 14:33:54 +02:00
4d42617b21
LCD menu optimalization, saved ~12k of flash space
2018-06-23 03:22:39 +02:00
febca066f2
New ML support - multiple languages in internal flash (MK25/MK2)
2018-06-23 01:31:38 +02:00
7f9c9c153a
Rambo 1.0 pinout changed - SCL/21 (used for ENC button) rewired to PH2/84
2018-06-22 18:37:18 +02:00
49ad60f0ff
Merge pull request #851 from PavelSindler/confused_display
...
set default printer message when recovering from crash detection
2018-06-22 08:48:33 +02:00
f365150e3a
Merge pull request #860 from PavelSindler/crash_det_issue
...
Crash detection/stop print erroneous movements hotfix
2018-06-22 08:48:24 +02:00
a83475bf7c
whitespace
2018-06-21 22:18:10 +02:00
7b81663883
crash detection/stop print erroneous movements hotfix
2018-06-21 22:16:45 +02:00
603ed49001
New ML support - MK25 (without W25x20CL)
2018-06-21 20:57:22 +02:00
79afb76839
New ML support - includes fixed
2018-06-21 19:58:13 +02:00
5674208eda
New ML support - removed menu + hardcoded W25x20CL
2018-06-21 19:17:41 +02:00
ee1e8dfccc
set default printer message when recovering from crash detection and at the end of mesh bed leveling
2018-06-20 17:58:31 +02:00
2be36f626f
Merge pull request #845 from PavelSindler/crash_movements
...
crash detection fix for absolute E coordinates
2018-06-19 18:46:39 +02:00
650d8cc643
Merge pull request #844 from mkbel/add_farm_PRUSA_RESET
...
Add PRUSA RESET command in farm mode.
2018-06-19 18:44:00 +02:00
88a19432b7
whitespace
2018-06-19 17:48:31 +02:00
1e60390545
dont process data from serial line if print is saved (crash detection and filament detection)
2018-06-19 16:51:22 +02:00
a53b02567a
New ML support - signature check
...
+updated scripts
+new script lang-build.sh (in future this script will replace make_lang.sh)
2018-06-18 19:37:20 +02:00
209209459d
Merge remote-tracking branch 'upstream/MK3' into crash_movements
2018-06-18 18:29:12 +02:00
2070c01b62
LCD menu printf test
2018-06-18 14:53:42 +02:00
21f9f46698
Use Timer class for lcd_timeoutToStatus. Save 188B FLASH and costs 2B RAM.
2018-06-16 02:39:47 +02:00
7619e94040
New ML support - checksum and signature
2018-06-15 20:37:33 +02:00
29e045f502
Use Timer class for button blanking. Save 74B FLASH and 1B RAM.
2018-06-15 20:27:49 +02:00
ac1e089a7f
crash detection fix for absolute E coordinates
2018-06-15 20:03:48 +02:00
32165dedb0
Add PRUSA RESET command in farm mode.
2018-06-15 17:07:44 +02:00
296f3ab23a
New ML support - resized reserved space, skip optiboot durring sec_lang update process
2018-06-14 23:07:54 +02:00
f162fce7a7
New ML support - fixed menu + resized reserved space
2018-06-14 22:46:01 +02:00
9ba49affc6
Merge pull request #835 from PavelSindler/safety_timer_gcode
...
Safety timer gcode
2018-06-14 20:49:25 +02:00
9fc9a70f22
Merge pull request #842 from XPila/MK3-new_lang
...
New ML support - menu + es translation fixed
2018-06-14 20:02:21 +02:00
ed2f87f4f5
documentation updated
2018-06-14 17:29:40 +02:00
9d31c8a4b3
New ML support - menu + es translation fixed
2018-06-14 15:34:40 +02:00
eef6c68c9f
Added support for a secondary boot loader, based on the OptiBoot project,
...
modified to update the external flash memory on Einsy boards.
Due to a bug in the USB to serial converter firmware on the Prusa Einsy
boards, the STK500 protocol has been modified to never send semicolon
characters towards the main processor.
This firmware updater is compatible with a modified avrdude using
the "arduino" protocol, see the following commit.
https://github.com/prusa3d/Slic3r/tree/fwupdater_languages
2018-06-14 15:13:21 +02:00
2026e7fe4d
Revert changes in Timer class; disable safety timer in handleSafetyTimer function if safetytimer inactive time was set to zero
2018-06-14 13:14:14 +02:00
2a219143fe
Merge remote-tracking branch 'upstream/MK3' into safety_timer_gcode
2018-06-14 13:09:15 +02:00
8af08cd641
New ML support - fixed es translation (too long strings)
...
+ temporary disabled E-correct menu
2018-06-13 20:55:15 +02:00
3616c2a55c
Merge pull request #834 from PavelSindler/power_panic_short_filenames
...
Power panic short filenames
2018-06-13 18:54:46 +02:00
1077895fd4
Don't return "Not SD printing" in case that SD card print is paused
2018-06-13 18:22:58 +02:00
75c6f0b937
variant files updated
2018-06-13 16:27:11 +02:00
c1425aece3
gcode: set safety timer period
2018-06-13 16:22:06 +02:00
3ca7c82e08
power panic: restore dir names
2018-06-12 19:45:59 +02:00
3aa28c8c11
Merge pull request #833 from XPila/MK3-new_lang
...
Mk3 new lang
2018-06-12 19:11:35 +02:00
e904188b4f
New ML support - w25x20cl chiperase menu (for testing)
2018-06-12 18:56:40 +02:00
fb6f4c6c8f
break
2018-06-12 15:06:11 +02:00
0ab0519c01
power panic fix: short filenames
2018-06-12 14:35:25 +02:00
73b0c65bda
Merge pull request #832 from mkbel/add_Timer_remaining
...
Add timer remaining
2018-06-12 07:57:11 +02:00
d669b4e93a
Fix off by one error in TimerRemaining::remaining(). Add test cases for Timer.
2018-06-12 02:24:52 +02:00
490f0c9620
Store timer period in TimerRemaining.
2018-06-11 23:41:36 +02:00
9772905ade
Add TimerRemaining class.
2018-06-11 21:19:58 +02:00
db9c82acef
M600 communication timeout fix
2018-06-11 20:28:18 +02:00
d6ccaa7c08
Merge pull request #830 from PavelSindler/crash_det_cool_hotend
...
Crash detection: set nozzle target temp to zero when waiting for user
2018-06-11 15:43:54 +02:00
5178675cdd
Merge pull request #829 from PavelSindler/temp_cal_fix2
...
Home XYZ: first move Z higher to protect steel sheet/heatbed
2018-06-11 15:42:59 +02:00
2f5bb80e98
crash detection: turn off nozzle when waiting for user
2018-06-11 15:34:16 +02:00
d4106c2fe3
If homing all axes, move Z little bit higher before X and Y movements to protect steel sheet/heatbed
2018-06-11 11:13:49 +02:00
4a659ed86a
New ML support - lcd optimalization
...
lcd_menu_xyz_y_min
lcd_menu_xyz_skew
2018-06-11 02:54:31 +02:00
30a7530b47
New ML support - lcd optimalization - lcd_menu_statistics
...
+fix LiquidCrystal_Prusa/createChar
2018-06-11 01:06:47 +02:00
80db01e48e
New ML support - lcd optimalization - lcd_menu_extruder_info
2018-06-10 23:45:35 +02:00
0cf7d12ae3
New ML support - lcd optimalization
...
lcd_puts_P and lcd_printf_P functions
LineFeed implemented in LiquidCrystal_Prusa
2018-06-10 22:06:00 +02:00
0f75bcb442
New ML support - flash usage optimalization
...
used flash space 252826bytes (MK3 + ML support), free ~1kbyte
2018-06-10 20:44:36 +02:00
c25fec9f0a
New ML support
...
printf float library enabled - platform.txt must be modified!
+flash usage optimalization - printing to serial line
current flash usage: 253206bytes (MK3 + ML support)
platform.txt original line 20:
compiler.c.elf.flags=-w -Os -Wl,--gc-sections
platform.txt modified line 20 (enable printf float library)
compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections
2018-06-10 20:04:25 +02:00
a1ea5019dc
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-10 16:29:29 +02:00
076258ff99
New ML support - cond.trans. for LANG_MODE 0
2018-06-10 16:28:15 +02:00
1e35067c3f
fixed variant files, removed bool constants
2018-06-10 16:13:29 +02:00
4567d2feca
removed unused cond. trans. for NEW_SPI
2018-06-10 16:11:39 +02:00
fcfb4cdcae
New ML support - menu tunning, startup
...
+config headers (bool - true/false replaced with 0/1)
+fixed include hierarchy
+removed comments
2018-06-10 16:04:32 +02:00
f098707021
New ML support - W25X20CL - update process UI tunning
2018-06-10 00:22:28 +02:00
5de0a6437d
New ML support - W25X20CL - lang switching
...
+removed unused code
2018-06-09 23:49:26 +02:00
dcd58d002c
New ML support - W25X20CL
...
language selection from menu is working
2018-06-09 19:16:36 +02:00
a9446cc6b3
New ML support - W25x20CL
2018-06-09 18:26:53 +02:00
ebd8375313
New ML support - external flash W25X20CL - upgrade is working!!! (hardcoded to german)
...
+print test (LT_PRINT_TEST)
2018-06-09 17:49:41 +02:00
c0946d8f04
New ML support - w25x20cl spi external flash support
...
+fixed some messages
+sec lang update test
2018-06-09 01:23:04 +02:00
31357379ff
Merge branch 'MK3' into time_remaining
2018-06-08 18:31:32 +02:00
8963757c3c
Merge branch 'MK3' into crash_detection_stop
2018-06-08 18:28:43 +02:00
5e120e6e52
power panic flow factor hotfix
2018-06-08 18:13:50 +02:00
332a23bef5
Crash detection stops and waits for user if it fails multiple times in short time frame
2018-06-08 16:08:07 +02:00
70bb851c62
New ML support - added missing file
2018-06-08 15:38:16 +02:00
739de5224e
Merge branch 'MK3' into MK3-new_lang
2018-06-08 14:38:00 +02:00
e69fd05fce
Optimized LiquidCrystal class
...
removed dependecies to arduino Print and String classes
spared 522 bytes of flash and 84bytes of ram
2018-06-08 14:35:47 +02:00
c29042dead
Fix warning:
...
Another fix from PR https://github.com/prusa3d/Prusa-Firmware/pull/138 and discussed in Issue https://github.com/prusa3d/Prusa-Firmware/issues/807
Ardunio IDE 1.6.8 and 1.8.5 result with Compiler warnings set to "More" or "All"
´´´
sketch\mesh_bed_calibration.cpp: In function 'sample_mesh_and_store_reference':
sketch\mesh_bed_calibration.cpp:2852:53: warning: 'zmax' may be used uninitialized in this function [-Wmaybe-uninitialized]
zmax = min(zmax, mbl.z_values[j][i]);
^
sketch\mesh_bed_calibration.cpp:2848:15: note: 'zmax' was declared here
float zmax = zmax;
^
´´´
2018-06-08 10:13:43 +02:00
8f032ad122
Fix MK3 compilation issue with Arduino 1.8.x
...
see https://github.com/prusa3d/Prusa-Firmware/issues/614#issuecomment-385034066
2018-06-08 09:44:58 +02:00
37f82118c8
New ML support - lang select menu fix
2018-06-08 02:03:25 +02:00
59e65b7f47
New ML support - language select menu
...
+cond. translation for W25X20CL
2018-06-08 01:19:49 +02:00
bd1e410228
New ML support - W25X20CL external spi flash support
2018-06-08 00:20:28 +02:00
877f8f2a61
Merge pull request #795 from 3d-gussner/MK3_fix5
...
Fix warning: This is kind of important
2018-06-07 22:22:54 +02:00
a15f0138de
show estimated time to end of the print if available in gcode: initial version
2018-06-07 20:50:30 +02:00
42cfcb2601
Merge pull request #794 from stahlfabrik/M860-enhanced
...
Improved M860 - now wait for cooling of PINDA, too
2018-06-06 12:01:06 +02:00
eb1d17c3c6
Compile without c++11.
2018-06-05 21:55:54 +02:00
1290326210
Merge pull request #790 from PavelSindler/power_panic_flow_rate
...
power panic: extruder_multipliers added
2018-06-05 20:58:15 +02:00
6a8425f62d
Merge pull request #809 from mkbel/Use_Timer
...
Use timer
2018-06-05 20:54:41 +02:00
7f7f1e4560
Merge pull request #808 from zavorka/MK3
...
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp
2018-06-05 20:53:03 +02:00
d49c4508a7
removing some debug code
2018-06-05 20:39:42 +02:00
264daaf715
typo fixed
2018-06-05 20:33:05 +02:00
aacaf67eaa
Crash detection/filament sensor: restore print from stored line number in case that we are printing over USB, retraction fix; debug: cmd queue on LCD
2018-06-05 20:28:41 +02:00
01af8a806b
Merge branch 'MK3' into Use_Timer
2018-06-05 19:03:11 +02:00
f819392d10
Do not create static object in function. Saves 8B RAM and 16B flash, because there is no need to guard constructor against concurrent calls.
2018-06-05 18:38:25 +02:00
7cc8b743c2
Add .gitignore. Setup doxyfile. Create project documentation main page. Document property of static object constructors on gcc-avr.
2018-06-05 18:30:02 +02:00
75f048ac4b
Add default doxyfile.
2018-06-05 18:23:48 +02:00
5f033d5a1a
Do not create static object in global function. Saves 8B RAM and 14B flash, because there is no need to guard constructor against concurrent calls.
2018-06-05 17:47:18 +02:00
e25b869b5e
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp
2018-06-05 13:49:58 +02:00
746ac17e4e
debugging
2018-06-04 16:40:56 +02:00
47c68c884c
New ML support - fixed duplicate strings
2018-06-01 14:35:03 +02:00
53d9d8bd8a
New ML support - lang codes
...
+script tunning
2018-06-01 10:47:47 +02:00
5004433b20
Fix warning: This is kind of important
...
Again another fix from https://github.com/prusa3d/Prusa-Firmware/pull/138 made by @Thess for the MK2 branch which i think is quite important.
Ardunio IDE 1.8.5 result with Compiler warnings set to "More" or "All"
```
sketch\Marlin_main.cpp:3265:44: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover
^
sketch\Marlin_main.cpp:3265:82: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover
^
sketch\Marlin_main.cpp:3268:28: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
retract(!retracted);
^
sketch\Marlin_main.cpp:3870:15: warning: statement has no effect [-Wunused-value]
```
I don't know if that helps making small pull requests as they are easier to review or it would make sense to combine few more.
Prusa should really review this pull [request](https://github.com/prusa3d/Prusa-Firmware/pull/138 ) again for the MK3 branch, as it was one that made warnings disapear in the MK2 branch and made finding new flaws in the code much much easier.
2018-06-01 10:17:03 +02:00
5a2b056d47
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-01 00:43:16 +02:00
7c4fce7876
whitespace correction
2018-05-31 18:55:14 +02:00
73708ec883
Improved M860 - now wait for cooling of PINDA, too
...
The M860 - wait for PINDA temperature - gcode has been improved. Until now it could only wait until the PINDA has been warmed up to a set temperature. Now it also can wait until the PINDA has cooled down to a set temperature. The calling syntax has not been changed at all. The logic now looks if the bed or hotend have a target temperature different from 0. If so, the code waits until PINDA has warmed up. Otherwise it waits until PINDA has cooled down.
Applications:
- Possibility to start a Print at exactly the right PINDA temperature. (Do not start the heater until PINDA is cooled down)
- Much easier manual temperature calibration (automating the wait for cool down in between calibration runs)
- Possibility for temp calibration verification on one heat bed by printing multiple objects with different PINDA temperatures one after the other
2018-05-31 16:41:59 +02:00
957b3cfac5
Merge pull request #783 from 3d-gussner/MK3_fix1
...
Fixed redefined warning
2018-05-31 14:21:41 +02:00
d70d38bb0c
Merge pull request #784 from 3d-gussner/MK3_fix2
...
Fixed unused variable c as in pull request #138
2018-05-31 14:15:17 +02:00
80c641ae5d
Merge pull request #789 from 3d-gussner/MK3_fix4
...
Fixed warning: invalid suffix on literal; C++11 requires a space betw…
2018-05-31 14:09:49 +02:00
731fef3d32
Fix remaining forgotten comments
2018-05-30 23:15:01 +02:00
77f3160531
language.h - debug output conditional translation
2018-05-30 20:15:43 +02:00
37e575f4bc
New ML support - debug output, bootloader
...
bootapp - automaticaly erase flash when necessary
+test code
2018-05-30 19:29:52 +02:00
9104b0601a
power panic: extruder_multipliers added
2018-05-30 18:59:33 +02:00
eeca0f683b
Fixed warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix]
2018-05-30 16:06:22 +02:00
3bf47d7f83
"run xyz cal first" message
2018-05-30 15:29:59 +02:00
dcb77e8c7e
Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix
2018-05-30 15:22:20 +02:00
987f8969c0
Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix
2018-05-30 15:20:40 +02:00
72a382b34d
fix in macro definition
2018-05-30 15:07:24 +02:00
2561ab9c7d
Merge pull request #786 from XPila/MK3-new_lang
...
Mk3 new lang
2018-05-30 14:54:47 +02:00
3e29312b41
fixed compilation (c++11)
2018-05-30 14:53:14 +02:00
d8706be8de
Fixed forgotten comment
2018-05-30 13:39:24 +02:00
dce2d45499
Fixed forgotten comment
2018-05-30 13:35:48 +02:00
2f9b63275f
Fixed unused variable c as in pull request #138
2018-05-30 13:26:31 +02:00
167bc61ef9
Fixed redefined warning
2018-05-30 12:57:51 +02:00
4746c77195
New ML support - bootloader support and update proces test
2018-05-29 21:03:47 +02:00
0ddb31d4eb
Removed hexfile
2018-05-29 17:28:33 +02:00
b47a29b388
New ML support - fixed invalid characters, added some cz translations
2018-05-29 15:56:00 +02:00
d307868a90
merge with upstream
2018-05-28 20:38:55 +02:00
26724c4a48
removed message
2018-05-28 20:31:57 +02:00
7e79ce8e53
MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved
2018-05-28 20:26:15 +02:00
b3f4e1f6e4
New ML support - language menu
2018-05-28 19:41:16 +02:00
baa66a0887
New ML support - secondary language name, language selection
2018-05-28 17:14:55 +02:00
3bf2552b6c
fixed #761 from hzapper (#elif instead of #else if)
2018-05-28 13:41:36 +02:00
28a767b460
Merge pull request #760 from PavelSindler/safety_timer_fixes
...
Safety timer not active during filament runout procedure
2018-05-28 13:28:24 +02:00
58ae70c4e1
Merge branch 'MK3' into MK3-new_lang
2018-05-28 13:22:14 +02:00
15207e4d5e
Linearity correction fix - (eeprom storage changed to byte instead of word)
...
+enabled for XYZ axes
2018-05-28 01:47:08 +02:00
def9ab56f6
New ML support - language.c - fixed return origial string for zero length translation
2018-05-27 16:24:21 +02:00
55157640c5
New ML support - czech version is working!!!
...
postbuild.sh, make_lang.sh - fixed (id and offset calculation)
language.c, language.h - fixed (==||==)
config.h - reserved space for _SEC_LANG changed
Marlin_main.cpp - debug output + hardcoded lang_select(1) //means cz
2018-05-27 15:14:04 +02:00
2ffb95c72a
bugfix: use absolute coordinates for steel sheet removal position, because there is no homing at the beginning of calibration in case that position is already known
2018-05-24 20:28:00 +02:00
64f7272ea7
M27: returns print saved (fixes setting temperatures to zero during crash detection)
2018-05-24 18:49:35 +02:00
2cf20c8c99
New ML support - migration - fix_source_1.sh script (replace 'MSG_xx' with '_T(MSG_xx)')
...
+ output + fixed source
2018-05-23 16:37:08 +02:00
da3432e237
New ML support - changed _SEC_LANG reserved space to 10kb, added debug code
2018-05-23 16:11:12 +02:00
f00a9ce636
New ML support - language.c, language.h - code fixed, Marlin_main.cpp - debug output
2018-05-23 15:46:08 +02:00
d979c3dffc
New ML support - messages.c - some strings fixed
2018-05-23 14:18:37 +02:00
0091b41fb5
Merge pull request #744 from PavelSindler/M860_fix
...
M860 fix: send busy messages
2018-05-23 13:15:46 +02:00
7e3f675469
New ML support - migration - fixed some messages
...
all variants verified according to lang_en.txt (release only)
config.h updated (enabled ML support)
2018-05-22 20:30:55 +02:00
8c9b670c76
Merge pull request #746 from MRprusa3d/MK3
...
menu returns corrections
2018-05-22 16:08:08 +02:00
137e1c5027
whitespace
2018-05-22 13:33:31 +02:00
d63a17c696
Safety timer not active during filament runout detection
2018-05-22 13:31:21 +02:00
bd587faab9
New ML support - migration - replaced source, removed original ML support files (backup)
2018-05-22 03:20:03 +02:00
8573b65b05
_MIN_ENDSTOP_INVERTING redefinition in variant files (constant -> define)
2018-05-21 23:28:28 +02:00
a184d2b824
Merge pull request #756 from XPila/MK3-new_lang
...
Mk3 new lang
2018-05-20 13:26:28 +02:00
a528f8837c
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-05-20 13:24:52 +02:00
5b015907aa
New localization - macro declarations fixed
2018-05-20 13:15:46 +02:00
9b7eeaecaa
version changed
2018-05-18 14:42:35 +02:00
503d5551e6
Fix build of MK2. Global variable distance_from_min was removed, do not update it.
...
Expression
float y = vec_x[1] * pgm_read_float(bed_ref_points_4+mesh_point*2) + vec_y[1] * pgm_read_float(bed_ref_points_4+mesh_point*2+1) + cntr[1];
is identical with expression in count_xyz_details().
2018-05-16 18:40:36 +02:00
3eb21b65ed
wizard fix: don't reset calibration status when repeating first layer cal.
2018-05-15 23:19:23 +02:00
83aa710da6
menu returns corrections
...
Settings::FilamentSensor & FilamentAutoload
removing Calibration::ShowEndStops @ MK3
2018-05-15 20:23:22 +02:00
c59e9bd6be
M860 fix: send busy messages
2018-05-15 18:27:25 +02:00
553779a65d
Merge pull request #723 from mkbel/refactor_bed_geometry
...
Refactor bed geometry
2018-05-14 17:18:03 +02:00
b71a29ad96
Use ShortTimer instead of long_press_timer global variable.
2018-05-11 17:05:12 +02:00
02ecd08786
Convert Time class to template, instantiate LongTimer for longer and ShortTimer for shorter periods.
2018-05-11 16:31:42 +02:00
07a7ce1acf
Remove unused lcd_ping_allert().
2018-05-11 15:09:27 +02:00
e8730c2899
Merge branch 'MK3' into read_xyz_cal
...
# Conflicts:
# Firmware/ultralcd.cpp
2018-05-10 18:31:31 +02:00
329ea199ec
Show measured bed offset from expected position even if not homed. Remove redundant lcd_quick_feedback() calls.
2018-05-10 18:24:49 +02:00
dd89226537
Merge pull request #722 from MRprusa3d/MK3
...
build instructions update
2018-05-10 14:44:55 +02:00
2bfc7475a8
version changed
2018-05-09 18:58:24 +02:00
2a5a7ab9d2
Add bed calibration points macro definitions to MK25 variants.
...
Homing and full print area printing tested on MK25.
2018-05-09 17:09:57 +02:00
59f3f9d8ec
New localization - includes fixed
2018-05-09 16:55:41 +02:00
80efafd7b9
menu returns corrections
...
Statistics
Calibration::ShowEndStops
Support::ExtruderInfo
Support::BeltStatus
Support::Temperatures
Support::Voltages
2018-05-09 00:27:32 +02:00
f00bde09a4
Re-factor bed calibration point coordinates to match bed CAD data. Tested successfully on MK3 (auto home position not calibrated and calibrated printer and print area position of calibrated printer). MK25 not tested.
2018-05-08 21:54:11 +02:00
737cb9608c
Merge pull request #716 from mkbel/calibrate_Z_via_live_adjust
...
Set calibration status to calibrated also by using live adjust Z.
2018-05-04 16:40:34 +02:00
c359d11858
Do not disable bed heating, when the print is paused.
...
Also remove duplicate handleSafetyTimer() call.
2018-05-04 15:21:22 +02:00
1d7b3ea2de
Set calibration status to calibrated also by using live adjust Z.
...
This fixes problem, that if the first layer calibration is never done, live adjusting Z during printing is not applied after printer reset. Also repeatedly using live adjust Z on uncalibrated printer leads to steadily decreasing meaningless stored live adjust Z value.
2018-05-03 22:03:38 +02:00
777beac66a
Merge pull request #713 from PavelSindler/fan_error_fix
...
fan error synchronization with planner
2018-05-03 16:01:00 +02:00
cd3851e175
Merge pull request #715 from MRprusa3d/MK3
...
Mk3
2018-05-03 14:54:43 +02:00
8a92d9b6a3
MaR::180501b
2018-05-02 23:49:21 +02:00
d02333918f
MaR::180501
2018-05-02 22:13:47 +02:00
72364648dd
Hot fix: Can not move X and Y axis in stealth mode, when the printer is not homed.
...
Disable endstops in move axis menu.
2018-05-02 20:50:47 +02:00
d86d1beeaa
fan error synchronization with planner
2018-05-02 16:16:48 +02:00
3d595cc523
Merge pull request #712 from XPila/MK3-V3_2
...
Mk3 v3 2
2018-05-02 13:43:07 +02:00
964d019dd1
MK3 - extruder current = 30
2018-05-02 13:42:05 +02:00
420d1079af
terminate temperature calibration in case that Z probing function returns false
2018-04-30 17:51:44 +02:00
b691225d0b
Merge pull request #701 from XPila/MK3-V3_2
...
Decreased stallguard sensitivity for Z axis because meshbedleveling f…
2018-04-30 16:58:18 +02:00
1fc3f9816c
Merge remote-tracking branch 'upstream/MK3' into MK3-V3_2
2018-04-30 16:29:02 +02:00
47868145e6
Decreased stallguard sensitivity for Z axis because meshbedleveling failed on some printers (PFW298).
2018-04-30 16:28:26 +02:00
e2b3553aee
Merge pull request #689 from PavelSindler/MK3_for_merging
...
version change
2018-04-27 20:01:37 +02:00
e1b95ed2a7
version change
2018-04-27 19:59:22 +02:00
12dda6a6ca
Merge pull request #688 from PavelSindler/MK3_for_merging
...
MK3 variants file change
2018-04-27 18:41:49 +02:00
068ee08454
MK3 variants file change
2018-04-27 18:41:00 +02:00
2a57325bd5
Merge pull request #685 from mkbel/add_safety_timer_notice
...
Show full screen blocking notification message after heater turned off
2018-04-27 17:24:33 +02:00
2b42db8ace
Merge pull request #687 from PavelSindler/MK3_for_merging
...
M861: steps value for 35C
2018-04-27 17:24:18 +02:00
265d4761a3
M861: steps value for 35C
2018-04-27 17:07:10 +02:00
e69134eb1c
Rambo 1.0 support (MK25, MK2)
2018-04-27 17:04:55 +02:00
eced66f0f6
Show full screen blocking notification message after heater turning off by safety timer.
2018-04-27 16:23:20 +02:00
6fb0fa1458
variants for MK3: temporary change
2018-04-27 15:19:28 +02:00
99be28d335
variants file: force selftest enabled again
2018-04-27 14:59:56 +02:00
986f9fd3a6
selftest correction
2018-04-27 14:49:37 +02:00
acd308e3d4
safety timer prolonged to 30 minutes
2018-04-27 14:03:09 +02:00
ce855f30e2
Merge pull request #678 from PavelSindler/calibrate_autohome
...
MK3 selftest: move Z axis higher before calibrating autohome
2018-04-27 13:35:45 +02:00
9e0e152279
Merge pull request #674 from mkbel/hot_fix_print_area_crop
...
Hot fix print area crop on MK3.
2018-04-27 13:35:31 +02:00
254804cc8d
MK3 selftest: move Z axis higher before calibrating autohome
2018-04-27 09:23:56 +02:00
75075bed31
Hot fix print area crop on MK3. Move print area -2mm in Y axis (Y_PROBE_OFFSET_FROM_EXTRUDER to 3). Do not limit print area for skewed axis (increase Y_MAX_POS to 212.5). Preserve Z homing point for uncalibrated printer (DEFAULT_Y_OFFSET to 2.f).
2018-04-26 22:01:28 +02:00
aeca8cbf69
Merge pull request #671 from PavelSindler/temp_comp_unsigned
...
M861 update: unsigned values
2018-04-26 21:07:45 +02:00
84d5771845
Merge pull request #670 from XPila/MK3-V3_2
...
XYZcal - findpointcenter starting Z coordinate down by 50um
2018-04-26 19:56:50 +02:00
e7cf68e038
whitespace
2018-04-26 19:27:07 +02:00
2dd0d84845
M861: usteps and z_shift variables correction
2018-04-26 19:14:28 +02:00
9c3e0aab36
M861 update: use signed values
2018-04-26 18:55:08 +02:00
d50dd9a6e9
XYZcal - findpointcenter starting Z coordinate down by 50um
2018-04-26 18:41:56 +02:00
ab68221976
Always show XYZ cal. details menu.
2018-04-26 16:36:03 +02:00
1a80fc28e8
Add zero point offset information support menu.
...
Note: XYZ menu is shown only if not printing and printer must me homed to show non-zero value.
2018-04-26 16:36:03 +02:00
b6888470cf
Save 42 bytes of flash by removing duplicate string "--------------------".
2018-04-26 16:36:02 +02:00
c1dd269a92
Fix missing degree symbol after returning to status screen. Those lcd_set_custom_characters* calls were redundant.
2018-04-26 16:36:02 +02:00
d6aa149cfa
Conserve 58 bytes of flash by returning by reference.
2018-04-26 16:36:02 +02:00
ae08788c99
Split lcd_service_mode_show_result screens to separate functions. Make them non blocking. Remove global array distance_from_min, pass it as function return value. Make Support submenus returning to Support menu.
2018-04-26 16:36:02 +02:00
2657d3febd
MK25: SILENT_MODE_NORMAL changed to SILENT_MODE_POWER
2018-04-26 15:12:45 +02:00
14cf4abb64
Merge pull request #668 from XPila/MK3-V3_2
...
Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1)
2018-04-26 14:53:49 +02:00
84a53370d3
temporary change in MK3 variants file: disable forced selftest
2018-04-26 14:50:16 +02:00
f64d266c89
Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1)
2018-04-26 14:50:01 +02:00
4681361883
correction in M27 message
2018-04-26 11:50:48 +02:00
9a6cc8a035
Merge pull request #664 from MRprusa3d/MK3
...
Mk3
2018-04-25 22:20:45 +02:00
cf0c83a6c1
M27 fix
2018-04-25 21:23:38 +02:00
7e462b3224
Merge branch 'MK3' into MK3
2018-04-25 19:15:36 +00:00
2f49574822
Add files via upload
2018-04-25 18:48:15 +00:00
0b6644915a
Add files via upload
2018-04-25 18:47:19 +00:00
d85a8077a8
M115 update
2018-04-25 20:39:10 +02:00
e7ad81e159
Merge pull request #660 from mkbel/fix_z_home_point
...
Update documentation of mesh_bed_calibration.cpp.
2018-04-25 17:27:22 +02:00
d2736fdacf
Merge pull request #662 from mkbel/fix_return_autoload
...
Return from Autoload filament and Load filament menu item to parent m…
2018-04-25 17:26:56 +02:00
f207145752
Return from Autoload filament and Load filament menu item to parent menu.
...
Exception is Load filament, when temperature is sufficient to load filament, in such case, load filament is started and GUI returns to status screen.
2018-04-25 16:51:35 +02:00
0271ab3643
Meshbedleveling, calibration Z
...
check crash Z (MK3)
check deviation of Z-probe (>50um == error, all printers)
kill with message "debris on nozzle..."
2018-04-25 16:19:16 +02:00
5f12289339
CalibrationZ/MK3 - check crash Z after homeaxis (kill with message "debris on nozzle...")
2018-04-25 14:43:32 +02:00
3abfeb831f
Update documentation of mesh_bed_calibration.cpp.
2018-04-25 12:21:20 +02:00
5bb9451b5d
Merge pull request #658 from XPila/MK3-V3_2
...
Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message…
2018-04-24 20:54:53 +02:00
1553e99d8e
Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message "debris on nozzle...")
2018-04-24 20:12:29 +02:00
5a9cc39562
Merge pull request #654 from XPila/MK3-V3_2
...
New current setting for MK3
2018-04-24 17:10:19 +02:00
f9d64bdfb1
Merge pull request #655 from mkbel/fix_z_home_point
...
Fix z home point
2018-04-24 16:51:57 +02:00
79b9f736aa
Merge pull request #657 from PavelSindler/temp_cal_update
...
Temp calibration update
2018-04-24 15:16:13 +02:00
8efe66ef99
remove tab
2018-04-24 14:34:49 +02:00
ffe93b2ca9
whitespace correction
2018-04-24 14:33:48 +02:00
cc74edfa13
whitespace
2018-04-24 14:23:52 +02:00
010ceceff9
add another homing after steel sheet is removed; added timeout for pinda cooling; if PINDA doesn't trigger before reaching Z = -1mm, temp. calibration fails
2018-04-24 13:43:51 +02:00
468645e92e
Set DEFAULT_Y_OFFSET to 4 mm for MK3 printer.
2018-04-23 20:34:04 +02:00
37ebe5c35d
Move default correction matrix of not calibrated printer to world2machine_default() function. Use world2machine_reset() to uncorrected matrix. Call it from world2machine_revert_to_uncorrected() and from world2machine_default() if there is no default shift to remove code duplication.
2018-04-23 20:33:39 +02:00
9bd4d580d7
Use right calibration point. This change is only formal, as both original and new point have same coordinates.
2018-04-23 20:33:25 +02:00
cccd8246ab
Fix world2machine(const float &x, const float &y, float &out_x, float &out_y) not using input parameters if only WORLD2MACHINE_CORRECTION_SHIFT is applied.
2018-04-23 20:33:14 +02:00
864284f043
New current setting for MK3
...
X, Y: no change
Z: +26.1%
E: -28.5%
2018-04-23 20:17:45 +02:00
2467b19dd2
Merge pull request #647 from XPila/MK3-V3_2
...
XYZ cal fix (better histogram processing)
2018-04-23 14:54:23 +02:00
82b31e8552
Set [0;0] point offset for uncalibrated printer.
2018-04-20 15:01:11 +02:00
65aa62ebab
XYZ cal fix (better histogram processing)
2018-04-20 13:17:18 +02:00
043c8c66be
waiting for pinda probe cooling
2018-04-19 16:55:00 +02:00
31ae097dba
mesh bed leveling / auto home Y coordinates updated
2018-04-18 17:09:12 +02:00
5791d9f0d8
EEPROM address conflict fix; forcing selftest can happen only in case that we have TMC2130 drivers
2018-04-18 14:17:28 +02:00
cf99808aef
Merge pull request #624 from mkbel/update_version
...
Update version.
2018-04-13 19:55:21 +02:00
af6c1f8acb
Update version.
2018-04-13 19:53:51 +02:00
b90e8999df
Merge pull request #623 from mkbel/fix_safety_timer
...
Fix safety timer.
2018-04-13 19:43:36 +02:00
c88f0108af
Fix safety timer.
...
Constant parameter greater than 16 bits must by stated as unsigned long.
2018-04-13 19:30:08 +02:00
c5af3aaaf2
Merge pull request #622 from mkbel/fix_menu_return_fail_stats
...
Fix returning from Fail stats menu.
2018-04-13 18:35:03 +02:00
6f985d23d6
Fix returning from Fail stats menu.
2018-04-13 17:20:30 +02:00
03d03aeac4
Return to main menu from filament unloading.
2018-04-13 16:51:47 +02:00
e4a4c88be9
Merge pull request #615 from PavelSindler/selftest_MK25_fix
...
selftest for MK2.5: fan error fix
2018-04-13 13:59:15 +02:00
f3209e1aec
fixed possible feedmultiply change cause by entering main menu with negative encoder position
2018-04-13 10:27:55 +02:00
b1bb6841c9
Merge pull request #617 from mkbel/fix_farm_reset_1
...
Fix farm reset
2018-04-13 10:02:54 +02:00
5f3fed33cf
Merge pull request #613 from MRprusa3d/MK3
...
Add files via upload
2018-04-13 10:02:44 +02:00
388d6eea36
Fix printer resets in farm mode if command "PRUSA SN" is received and 32U2 processor is not responding.
2018-04-12 18:44:33 +02:00
08740356b8
Move "PRUSA SN" gcode to separate function.
2018-04-12 18:41:11 +02:00
591cb881cc
selftest: false fan error fix, added message in case that manual fan error fails
2018-04-12 18:24:30 +02:00
d09f190c2b
Add files via upload
2018-04-11 18:48:50 +00:00
78245ce566
farm preheat temperature for heatbed
2018-04-11 18:54:27 +02:00
e150d502ac
removed configuration_prusa
2018-04-11 18:49:42 +02:00
53d903e600
Merge pull request #610 from MRprusa3d/MK3
...
Add files via upload
2018-04-11 18:46:18 +02:00
6b5835fd9f
Merge pull request #612 from PavelSindler/M861_gcode
...
M861 gcode, temp cal is automaticly activated after calibration process
2018-04-11 18:45:57 +02:00
45d1dbbfe0
temp cal. active set to false
2018-04-11 18:37:07 +02:00
ce66699340
dont use default temp table for new printers and dont automaticly activate temp. cal. (new pinda probes have different characteristics)
2018-04-11 18:36:38 +02:00
52de4891fe
typo fixed
2018-04-11 18:32:27 +02:00
47eab97d2d
temp. calibration is automaticly activated after calibration process
2018-04-11 18:16:16 +02:00
0ba7850146
pinda temp table changed back
2018-04-11 17:40:04 +02:00
c69524c3fb
Merge pull request #611 from XPila/MK3-V3_2
...
removed Configuration_prusa.h
2018-04-11 17:33:37 +02:00
89efcb84b1
removed Configuration_prusa.h
...
fixed - compilation for MK25
2018-04-11 17:32:31 +02:00
919fba531a
wait for PINDA gcode changed
2018-04-11 16:48:47 +02:00
c8f1c55ec0
Add files via upload
2018-04-11 14:41:41 +00:00
f70685a92d
Merge pull request #542 from stahlfabrik/MK3_PINDA_TEMP_WAIT_GCODE
...
MK3 Add Gcode to wait for minimum PINDA temp
2018-04-11 16:40:21 +02:00
1e1531a4f8
Merge pull request #608 from MRprusa3d/MK3
...
Mk3
2018-04-11 16:37:34 +02:00
8da2330b93
FSensor PAT9125 - i2c ACK check + two attempts in init function (PFW).
...
ultralcd_implementation_hitachi - fixed link
2018-04-11 16:03:54 +02:00
716f1c63bf
Add files via upload
2018-04-10 18:08:57 +00:00
6b77e68924
Add files via upload
2018-04-10 18:07:08 +00:00
02fda70529
farm mode: preheat menu updated
2018-04-10 14:07:44 +02:00
da43aa0250
XYZ calibration tunning
2018-04-04 20:03:39 +02:00
3b26e1635a
XYZcal - better filtering.
2018-04-03 20:10:50 +02:00
630041ecb2
XYZcal - threshold changed from 32 to 16
2018-04-03 18:49:15 +02:00
339d2ebdef
Z-axis stealth mode
...
XYZcal fix
2018-04-03 18:26:39 +02:00
869a99d8ad
XYZ calibration - diagonal find_point_center
2018-04-03 15:05:57 +02:00
92997204a1
Linearity correction - TMC codes for calibration object, variable stored as uint8, range from 1.03 to 1.20
2018-04-03 12:30:35 +02:00
baade7db61
Removed unused files (ST7565R-dogm, digipot)
...
renamed functions digipot_init and digipot_current
fixed cond. trans. (menus)
fixed variant files - MK25, MK3
2018-03-29 23:01:13 +02:00
dba2fd7e75
Merge pull request #589 from XPila/MK3-V3_2
...
New SPI, LiquidCrystal renamed
2018-03-29 18:20:29 +02:00
363a9d24b3
LiquidCrystal class renamed to LiquidCrystal_Prusa
2018-03-29 17:50:43 +02:00
186e630299
New SPI (do not use Arduino SPI class)
...
saved ~300bytes flash, 4bytes ram
2018-03-29 17:42:41 +02:00
cedb30303f
Add possible action on menu item back. This fixes broken Merge pull request #586 from mkbel/ustep_linearity_2 06d5ec5.
2018-03-29 11:42:44 +02:00
d5636fd023
Merge pull request #585 from PavelSindler/farm_mode_MK3
...
checking if file is complete temporarily not active in farm mode
2018-03-28 19:39:00 +02:00
06d5ec5659
Merge pull request #586 from mkbel/ustep_linearity_2
...
Ustep linearity
2018-03-28 19:38:34 +02:00
ffdd11e960
Merge pull request #587 from XPila/MK3-V3_2
...
Mk3 v3 2
2018-03-28 19:38:20 +02:00
bde097cad1
bugfix - PFW233 - first homing in silent mode Y crash.
2018-03-28 19:22:20 +02:00
9cb036fbcb
Merge remote-tracking branch 'prusa3d/MK3' into ustep_linearity_2
2018-03-28 19:11:02 +02:00
40a064ffbc
Add extruder linearity correction to settings menu.
2018-03-28 18:53:37 +02:00
6e15a77c9b
preheat menu update
2018-03-28 17:50:16 +02:00
95e751dd65
farm mode: preheat menu update
2018-03-28 17:04:46 +02:00
2c3c6c54f3
checking if file is complete temporarily not active in farm mode
2018-03-28 17:00:17 +02:00
8ba83a9789
bugfix - PFW226 - selftest error
2018-03-28 16:13:54 +02:00
678cd17e7b
Increase size of EEPROM_TMC2130_WAVE_*_FAC to 16 bits.
2018-03-28 16:13:16 +02:00
cf43b85de9
XYZ calibration - accuracy improvement
2018-03-27 17:27:41 +02:00
57bbb0e17d
Fix wraparound from lowest value to highest value in menu value edit.
2018-03-26 20:25:23 +02:00
397e7d4791
Increase resolution of wave factor.
2018-03-26 15:17:06 +02:00
903dce9716
Merge pull request #576 from PavelSindler/MK3_for_merging
...
stealth mode / silent mode
2018-03-23 20:42:08 +01:00
2ce75293f3
stealth mode / silent mode
2018-03-23 19:49:59 +01:00
5a7e76e02b
Merge pull request #575 from PavelSindler/adc_pins
...
Adc pins, pinda temp table
2018-03-23 19:36:23 +01:00
dc32bd24fc
correction
2018-03-23 18:20:55 +01:00
2d30261976
bed voltage menu hidden
2018-03-23 16:49:06 +01:00
7ad6fb526c
typo removed
2018-03-23 15:53:44 +01:00
78f9f6b611
use defines for adc pins, temp table for PIDNA update
2018-03-16 11:01:06 +01:00
e5faba7226
serial port set back (was previously changed for debugging purposes)
2018-03-15 14:42:03 +01:00
08ec920d33
merge with upstream
2018-03-15 14:25:17 +01:00
3d299cc412
Document.
2018-03-14 21:05:47 +01:00
4bc1671953
version=3.2.0-alpha buildnumber=370 repository=Unknown
2018-03-14 16:33:50 +01:00
67e90b576a
Disabled force selftest
...
XYZ calibration tunning
2018-03-14 16:25:32 +01:00
863fe1f054
show message that printer is not connected to monitoring on printer start
2018-03-14 15:35:39 +01:00
3ff5686336
MK2-25-3 variant files
2018-03-14 13:53:36 +01:00
2f98ac989a
Variant file for MK2 + cond. translation
2018-03-13 23:14:44 +01:00
81cd96b8fe
Variant file for MK25 + cond. translation
2018-03-13 23:02:46 +01:00
c163d8a9f7
Variant file for MK3
2018-03-13 22:40:20 +01:00
46cecb1bdf
deleted unused file
2018-03-13 20:44:06 +01:00
ac1a56b493
Merge branch 'MK25' into MK3
2018-03-13 20:43:19 +01:00
27cc5e51c3
removed duplicit declaration of prusa_statistics function
2018-03-13 19:12:36 +01:00
5d389a2c36
Farm mode: when print finishes, ask which filament was used for print; statistics modified
2018-03-13 19:11:02 +01:00
a3ad74a6be
status screen fix
2018-03-13 19:08:19 +01:00
8ec3c0fd7e
removed "Printer disconnected" message
2018-03-13 18:50:56 +01:00
f45f206faf
sorting files disabled in farm mode, start printer status needs reponse from monitoring
2018-03-13 18:50:11 +01:00
ddeb7b8c84
statistics improved, initial version of function which forces user to connect printer to monitoring
2018-03-13 18:43:42 +01:00
16f9f35451
static_assert replaced with error directive
2018-03-13 16:47:38 +01:00
0c97f46f25
Merge pull request #551 from XPila/MK3-new_xyz_cal
...
New XYZ calibration with image processing
2018-03-13 16:17:50 +01:00
a23ac6db7d
Merge pull request #550 from mkbel/safety_timer_MK3
...
Safety timer (disable heaters after 15min idle)
2018-03-13 15:03:45 +01:00
701dc55f4e
Merge pull request #549 from mkbel/safety_timer
...
Safety timer (disable heaters after 15min idle)
2018-03-13 15:02:09 +01:00
f487691070
Merge pull request #536 from mkbel/menu_return
...
Menu return
2018-03-13 14:30:48 +01:00
98e96c9182
Merge pull request #457 from bubnikv/MK3_fast_dbg
...
Mk3 fast dbg
2018-03-13 14:13:29 +01:00
65a91b366d
New XYZ calibration with image processing
2018-03-13 12:55:35 +01:00
6b08cdeaf1
Safety timer (disable heaters after 15min idle)
2018-03-12 23:45:10 +01:00
262e800db7
Safety timer (disable heaters after 15min idle)
2018-03-12 23:35:50 +01:00
1df91e5656
MK3 Add Gcode to wait for minimum PINDA temp
...
The PINDA temperature compensation is defined for values above 35C. To achieve an optimal first layer consistently it is vital to start the print with a temperature of >= 35C on the pinda probe.
When doing a manual pinda temperature calibration it is necessary to begin homing and mesh bed leveling at an exact temperature. This gcode is perfect for this.
Example startup code:
G28 W ; home all without mesh bed level
G0 Z50 ; raise Z to not heat PINDA before bed is warm
M104 S215 ; set extruder temp
M140 S60 ; set bed temp
M190 S60 ; wait for bed temp
M109 S215 ; wait for extruder temp
G0 X50 Y50 Z0.15 ; this is a good PINDA heating position
M666 S35 ; the new code - wait until PINDA is >= 35C
G28 W ; home all without mesh bed level
G80 ; mesh bed leveling
See my forum post later for more explaination on my manual temperature calibration procedure. I will link it then.
2018-03-09 20:46:07 +01:00
66dc65ecd4
version changed
2018-03-09 14:15:47 +01:00
d512c9c9c2
version changed
2018-03-08 14:48:01 +01:00
976e5a6a19
Temperature calibration - remove steel
2018-03-07 21:45:55 +01:00
b902d91760
changed version
2018-03-07 21:02:07 +01:00
b41d680adf
Replace problematic character in comment.
2018-03-07 20:58:15 +01:00
8ff028820a
Remove redundant parameter.
2018-03-07 20:55:01 +01:00
abb9aa0a16
not using homing currents in axis selftest
2018-03-07 20:42:15 +01:00
2a53686d2f
Document valid usage of lcd_goto_menu(), remove redundant parameter.
2018-03-07 20:40:59 +01:00
1aba608133
Document valid usage of lcd_goto_menu(), wrap lcd_second_serial_set() by HAS_SECOND_SERIAL_PORT macro.
2018-03-07 18:30:33 +01:00
0c961dedc4
Reset menu stack in lcd_return_to_status().
...
Mark menuStack.reset() as redundant in lcd_status_screen(), but leave it there to be sure.
2018-03-07 18:15:24 +01:00
716098c434
Preserve position in menu move axis Extruder.
2018-03-07 17:27:27 +01:00
d0a98dc6cc
Document valid usage of lcd_goto_menu().
2018-03-07 17:18:10 +01:00
0871925353
Remove special handling of lcd_move_z after long button press. Convert lcd_move_z after long button press to ordinary menu_action_submenu.
...
Known bug (feature) is, that with current maximum stack depth, when long press is activated in menu > settings > move axis > Move X and then Move Z is deactivated, menu is returned to "move axis" and not to "Move X".
2018-03-07 17:03:17 +01:00
77c3d7d7f7
Review and document lcd_adjust_bed_reset() lcd_goto_menu() usage.
2018-03-07 16:47:20 +01:00
f41584524e
Merge pull request #534 from PavelSindler/M221_fix
...
Fix of a regression bug, caused by pre-calculating the extrudemultiply
2018-03-07 16:13:16 +01:00
6ba07a358b
Fix of a regression bug, caused by pre-calculating the extrudemultiply
...
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
2018-03-07 16:08:19 +01:00
33a7723fba
Merge pull request #533 from bubnikv/M221_fix
...
Fix of a regression bug, caused by pre-calculating the extrudemultiply
2018-03-07 16:03:50 +01:00
fb4230f80d
Fix of a regression bug, caused by pre-calculating the extrudemultiply
...
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
2018-03-07 15:46:46 +01:00
e3967e444b
SafetyTimer disabled
...
Watchdog disabled
watchdog.cpp and watchdog.h source code removed (using directly <avr/wdt.h>)
2018-03-07 14:13:34 +01:00
b7df176a46
Preserve position in menu Live adjust Z.
2018-03-06 22:45:47 +01:00
ed0e7a8b58
Preserve position in menu move axis.
2018-03-06 21:27:06 +01:00
020269a83c
Fix unable to go back from main menu to status screen.
2018-03-06 21:26:14 +01:00
e551ed1f6e
Replace lcd_goto_menu(...) by menu_action_back() in lcd_menu_fails_stats();
2018-03-06 19:51:13 +01:00
235803bc2a
Move encoder stack to separate class MenuStack. Add menu record to MenuStack.
...
It was needed to add menuFunc_t menu to stack, as in some places in menu, it is impossible to hardcode parent menu. Example: lcd_babystep_z can be invoked both from main_menu() and settings_menu() depending on printer status.
2018-03-06 19:47:27 +01:00
55065cf124
Merge pull request #530 from PavelSindler/temp_cal_fix
...
steps per unit changed to 0.95%; changed temp cal. warnings, changed …
2018-03-06 18:26:37 +01:00
c986ac14ec
pinda thermistor pin changed
2018-03-06 18:09:25 +01:00
27659ae69e
steps per unit changed to 0.95%; changed temp cal. warnings, changed pin for PINDA probe
2018-03-06 16:48:39 +01:00
a6f900fd3c
Merge remote-tracking branch 'upstream/MK25' into MK25
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-03-06 15:11:50 +01:00
2b7e50e45b
Fix of calculate_extrusion_multipliers().
...
This is a fix of a bug made in the previous commit.
2018-03-06 13:03:38 +01:00
15e7b88834
Merge pull request #528 from bubnikv/M221_fix
...
Fix of calculate_extrusion_multipliers().
2018-03-06 13:00:57 +01:00
54749cbcba
Merge pull request #524 from mkbel/Add_fail_stats
...
Add fail statistics menu item for MK25.
2018-03-06 11:55:22 +01:00
115416dc60
Merge pull request #520 from mkbel/MK25
...
Remove Rpi port menu item for MK25.
2018-03-06 11:53:37 +01:00
ee2de71d26
searching for point xy updated to be more reliable, max z error enlarged to speed up calibration
2018-03-06 11:51:31 +01:00
67fd467ebe
Add fail statistics menu item for MK25.
...
As there is only filament sensor and no crash and power interruption detection, squash everything into single screen.
2018-03-05 21:42:04 +01:00
fc3af0533a
Fix of calculate_extrusion_multipliers().
...
This is a fix of a bug made in the previous commit.
2018-03-05 21:31:31 +01:00
a0bcfc7d95
Fix after merge (symbol calculate_volumetric_multipliers() renamed
...
to calculate_extruder_multipliers())
2018-03-05 19:28:57 +01:00
11e7eb27ee
Merge remote-tracking branch 'remotes/origin/M221_fix' into MK3_fast_dbg
2018-03-05 19:13:07 +01:00
c9b5ab0e88
area for improving calibration point enlarged
2018-03-05 18:09:48 +01:00
7164e66e4d
Remove Rpi port menu item for MK25.
2018-03-05 17:14:20 +01:00
74fa599f48
Remove Rpi port menu item for MK25.
2018-03-05 17:04:01 +01:00
0f082fa1f7
Merge pull request #518 from PavelSindler/auto_power_2
...
Auto power mode for MK25
2018-03-05 11:42:00 +01:00
917689b5ce
tune menu
2018-03-05 01:23:18 +01:00
1033bd3cf9
info on serial not used
2018-03-05 00:48:10 +01:00
a369c7900e
tune menu updated
2018-03-05 00:47:34 +01:00
ca3ba55ca7
initial version
2018-03-05 00:46:24 +01:00
5254044816
no points on first row for new xyz cal. version,
...
waiting for user to press knob on found points when verbosity level >=20
2018-03-05 00:17:43 +01:00
f1410a37f2
samle z after xyz cal. added, find_point_xy: initial z coordinate after first hit lowered
2018-03-04 23:49:54 +01:00
8800793dd1
removing debug code
2018-03-04 20:49:34 +01:00
ad702c6d1f
improved algorithm for first hit, improving sensor point changed, just one calibration round for 4point heatbed (no second run for improving measured coordinates)
2018-03-04 20:21:31 +01:00
15a7699fe0
max error for searching in xy
2018-03-03 20:05:43 +01:00
1f2c4fc5ad
version changed
2018-03-01 15:52:53 +01:00
644c4f771b
Merge pull request #509 from XPila/MK3
...
bugfix - beltstatus overflow
2018-03-01 14:49:13 +01:00
fb8a28d120
bugfix - beltstatus overflow
2018-03-01 14:34:21 +01:00
Marek Bel
Robert Pelnar
DRracer
Marek Běl
MRprusa3d
NotaRobotexe
Paul Bransford
PavelSindler
Voinea
PavelSindler
Harpalyke
Laurentiu
MRprusa3d
Craig Link
Joshua Hoblitt
bubnikv
Petr Ledvina
3d-gussner
Roman Beránek
Christoph Stahl
tarikku