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
Marek Bel
Robert Pelnar
PavelSindler
MRprusa3d
PavelSindler
mkbel