PavelSindler
18eb9ad69e
Merge pull request #1344 from PavelSindler/progress_bar_fix
...
progress bar fix
2018-11-20 14:50:04 +01:00
Marek Bel
ab5b57df11
Style.
2018-11-19 20:41:14 +01:00
PavelSindler
cb7c701791
whitespace
2018-11-19 20:09:03 +01:00
PavelSindler
7d538cde6c
Retrieve settings (M501): initialize each item in feedrate and acceleration arrays separately
2018-11-19 20:05:58 +01:00
PavelSindler
e5dd4d757a
progress bar fix
2018-11-16 15:45:55 +01:00
MRprusa3d
ffe906c733
MeshBed Levelling Fail V
2018-11-14 16:45:49 +01:00
PavelSindler
0398c3c26b
Merge pull request #1335 from PavelSindler/T_codes
...
version change
2018-11-13 17:49:26 +01:00
PavelSindler
51c80352e8
version change
2018-11-13 17:48:42 +01:00
PavelSindler
51b4858a87
Merge pull request #1334 from XPila/V3_5
...
PFW658 - disable extruder motor while changing filament with mmu2 (pr…
2018-11-13 16:10:24 +01:00
XPila
c41b045ea7
Merge pull request #1333 from PavelSindler/T_codes
...
T-code fix
2018-11-13 16:09:52 +01:00
Robert Pelnar
bfc343c7c5
PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating)
2018-11-13 16:04:46 +01:00
PavelSindler
15d0b083ed
whitespace
2018-11-13 15:58:21 +01:00
PavelSindler
17a1049f23
T-codes fix
2018-11-13 15:56:19 +01:00
PavelSindler
f297e72864
Merge pull request #1332 from XPila/V3_5
...
Fix PFW657 - filament runout detection is not working after autoload …
2018-11-13 14:10:11 +01:00
Robert Pelnar
d886ba1100
Fix PFW657 - filament runout detection is not working after autoload disabled from menu.
2018-11-13 14:05:15 +01:00
XPila
3d97d81734
Merge pull request #1329 from PavelSindler/M600_load_fil_message
...
M600 filament load progress bar changes
2018-11-12 20:52:06 +01:00
PavelSindler
27db32cbd0
Merge pull request #1331 from XPila/V3_5
...
M907 fix - value in mA (PFW655)
2018-11-12 20:49:09 +01:00
Robert Pelnar
41b885c537
M907 fix - value in mA (PFW)
2018-11-12 20:39:25 +01:00
MRprusa3d
5e8e96b5d7
MMU module adjustment
...
MMU module conditional compilation adjustment for MMU v1
2018-11-12 20:09:54 +01:00
PavelSindler
32da5bc039
progress bar time counted from feedrate and E - distance
2018-11-12 19:55:53 +01:00
PavelSindler
f4c1e7924f
M600: show progress bar during first filament load
2018-11-12 18:35:06 +01:00
PavelSindler
10a81ea768
version change
2018-11-09 19:16:53 +01:00
PavelSindler
5931d15566
whitespace
2018-11-09 18:31:28 +01:00
PavelSindler
c991c8b314
resume print fix: wait for heater() never disable steppers
2018-11-09 18:29:35 +01:00
XPila
10b79e918b
Merge pull request #1321 from PavelSindler/M600_load_fix
...
M600 load messages synchronization fixed
2018-11-09 15:40:00 +01:00
PavelSindler
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +01:00
PavelSindler
7022373885
Merge pull request #1320 from XPila/V3_5
...
localization - lang-export.sh + po files + tmc2130_print_currents fixed (M913)
2018-11-09 15:27:43 +01:00
Robert Pelnar
3afebcc9cc
tmc2130_print_currents fixed (for obsolete M913)
2018-11-09 15:20:25 +01:00
PavelSindler
5f166374ab
Merge pull request #1319 from XPila/V3_5
...
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compil…
2018-11-09 13:10:51 +01:00
Robert Pelnar
6c13225f49
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compiled on linux arduino 1.8.5 + lto)
2018-11-09 10:45:16 +01:00
PavelSindler
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
...
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
PavelSindler
6d59f88a8e
Merge pull request #1315 from MRprusa3d/PFW-639
...
Bed PowerMonitor III
2018-11-08 10:08:31 +01:00
MRprusa3d
ccb58ae7c9
Revert "MeshBed Levelling Fail IV"
...
This reverts commit bd554df02e
.
2018-11-08 04:02:32 +01:00
MRprusa3d
bd554df02e
MeshBed Levelling Fail IV
2018-11-08 03:54:05 +01:00
MRprusa3d
fd45dd64dc
Bed PowerMonitor III
2018-11-08 03:32:00 +01:00
PavelSindler
3cccb125f7
Merge pull request #1313 from MRprusa3d/PFW-639
...
Bed PowerMonitor II
2018-11-07 13:50:50 +01:00
MRprusa3d
4ae857136d
Bed PowerMonitor II
2018-11-07 13:38:39 +01:00
PavelSindler
b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
...
Fix long press modal
2018-11-07 10:28:24 +01:00
PavelSindler
a5bbc75035
Merge pull request #1309 from mkbel/fix_1st_lay_cal
...
PFW-634 Move T<nr> code just before extrude code to properly load fil…
2018-11-07 10:28:13 +01:00
Marek Bel
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
Marek Bel
95b0506284
Make lcd_long_press_active private.
2018-11-06 20:48:28 +01:00
Marek Bel
676434111e
Disable long press handler in modal dialogs (LCD update disabled).
2018-11-06 20:43:19 +01:00
Marek Bel
02e31433f4
PFW-634 Move T<nr> code just before extrude code to properly load filament in first layer calibration with MMUv2.
2018-11-06 15:46:37 +01:00
Robert Pelnar
9a68501039
MK2 variants compilable
2018-11-06 14:17:43 +01:00
PavelSindler
c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
MRprusa3d
46b2c93d60
MeshBed Leveling Fail III
2018-11-06 01:44:53 +01:00
MRprusa3d
9953518681
MeshBed Leveling Fail II
2018-11-06 01:28:47 +01:00
PavelSindler
908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
...
filament quality measurements disabled
2018-11-05 19:14:34 +01:00
PavelSindler
0a6ca7ffd0
Merge pull request #1305 from XPila/V3_5
...
PFW643 - removed M910-M918, implemented M907
2018-11-05 19:14:19 +01:00
PavelSindler
89ad02ac8c
filament quality measurements disabled
2018-11-05 18:37:36 +01:00
Marek Bel
50f9bf06be
Save 74B of flash memory.
2018-11-05 18:02:46 +01:00
Marek Bel
e95c2ad592
Display auto deplete as not available if filament sensor is disabled.
2018-11-05 17:43:07 +01:00
Robert Pelnar
d6b5f5a1c7
PFW643 - removed M910-M918, implemented M907
2018-11-05 16:15:27 +01:00
Marek Bel
ef5be690fb
Add autodeplete setting into tune menu.
2018-11-05 13:54:22 +01:00
PavelSindler
7e43b15b54
Merge pull request #1303 from PavelSindler/m600_idler
...
M600: move extruder to the left to make space for idler opening
2018-11-05 10:38:51 +01:00
PavelSindler
78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
...
Wizard improvements
2018-11-05 10:38:41 +01:00
PavelSindler
688c10247e
Merge pull request #1291 from XPila/MK3-new_bs
...
lang update
2018-11-05 10:38:29 +01:00
PavelSindler
0a2ad97bc6
Merge pull request #1290 from PavelSindler/mmu_improvements
...
mmu improvements: load to nozzle, gcodes for single material mode, M600 fix
2018-11-05 10:38:05 +01:00
PavelSindler
2619c6f7a1
Merge pull request #1283 from PavelSindler/crashdet_cancel
...
canceling print after crash detection sets saved_priting flag to false
2018-11-05 10:37:51 +01:00
PavelSindler
aeeb2af0a4
whitespace
2018-11-05 00:15:36 +01:00
PavelSindler
b058ec7120
whitespace
2018-11-05 00:14:16 +01:00
PavelSindler
934b76ade3
wait message added
2018-11-05 00:12:46 +01:00
PavelSindler
3d24f5437c
leave Z move menu (hotfix)
2018-11-04 23:44:29 +01:00
PavelSindler
daef0eeb67
Merge pull request #1297 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail
2018-11-04 23:33:29 +01:00
mkbel
e177c2b669
Merge pull request #1295 from PavelSindler/feedrate_change
...
choosing filament from T? menu changes feedrate fixed
2018-11-04 23:13:03 +01:00
PavelSindler
515f2723d7
Merge pull request #1301 from XPila/V3_5
...
PFW644 + PFW638
2018-11-04 23:10:10 +01:00
PavelSindler
8afb83406e
Wizard for assembled printers (contains more steps now)
2018-11-04 23:08:23 +01:00
Robert Pelnar
33a29cd416
Fix PFW638 - remaining/elapsed time >100h displayed in hours
2018-11-04 20:27:09 +01:00
PavelSindler
e2d2fb58aa
Z calibraion: always ask user to clean nozzle
2018-11-04 18:47:08 +01:00
XPila
35fae8be1c
Merge pull request #1294 from PavelSindler/manage_response_heating
...
mmu manage response: possibility to resume saved nozzle temperature
2018-11-04 18:31:47 +01:00
Robert Pelnar
1e05e1189d
Fix PFW644 - MK25 reports stopped, arduino 1.8.5.
2018-11-03 22:44:42 +01:00
MRprusa3d
73794b56cf
MeshBed Leveling Fail
...
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
PavelSindler
e304319e15
choosing filament from T? menu changes feedrate fixed
2018-11-02 20:25:24 +01:00
PavelSindler
d18013e5a2
manage response now contains showing nozzle temperature and possibility to resume saved nozzle temperature
2018-11-02 19:31:10 +01:00
MRprusa3d
18a8ae5b8f
Bed PowerMonitor
...
bed power monitoring correction
2018-11-01 20:55:42 +01:00
PavelSindler
aaf65051f9
M600: "is color clear?" menu synchronization
2018-11-01 18:28:52 +01:00
PavelSindler
1342c312a0
use feedrate 200mm/min for final feed (faster and better filament sensor function), show default welcome message when load is finished
2018-11-01 16:51:18 +01:00
PavelSindler
96ce324b7c
load to nozzle improved, unified feedrate and E-distance for final feed used in load filament function, M600 etc.
2018-11-01 16:29:09 +01:00
Robert Pelnar
a0e4acead3
lang - removed unused code and some service messages changed to "not translated"
2018-11-01 14:07:16 +01:00
PavelSindler
e80af46503
load to nozzle and Tx and Tc codes: intial version
2018-10-31 21:48:05 +01:00
PavelSindler
f445b6018e
canceling print after crash detection sets saved_priting flag to false
2018-10-28 11:06:10 +01:00
PavelSindler
4ecc00e4e3
M600: move extruder 100mm to the left to make space for opening idler
2018-10-26 18:19:00 +02:00
PavelSindler
6a82af487e
Merge pull request #1278 from XPila/MK3-new_bs
...
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-26 13:18:48 +02:00
mkbel
16c2f6fe8e
Merge pull request #1279 from PavelSindler/turn_on_FINDA
...
mmu2: filament senor (FINDA) menu fix
2018-10-25 21:53:11 +02:00
PavelSindler
a9317b4d36
upstream/MK3 merge
2018-10-25 21:46:32 +02:00
mkbel
cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging
...
3_4_2 branch merging into MK3
2018-10-25 21:45:51 +02:00
PavelSindler
0e0dbad871
#ifdef __cplusplus added to allow including to .c file
2018-10-25 21:06:37 +02:00
PavelSindler
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
PavelSindler
a6a81c6ea6
mmu2: filament senor (FINDA) can be switched ON/OFF from menu without dependency on pat9125 state
2018-10-25 18:26:26 +02:00
Robert Pelnar
d301aa0e8c
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-25 18:16:36 +02:00
Robert Pelnar
7e9eaf0f4b
New lang, arduino 1.8.5 - disable multilanguage support by default
2018-10-23 17:32:52 +02:00
PavelSindler
bd8ca8d652
removed redefinition of functions in fsensor.cpp
2018-10-22 20:51:44 +02:00
PavelSindler
d1de9fff60
mmu_loop: missing return added
2018-10-22 20:38:32 +02:00
PavelSindler
d005005e22
Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging
2018-10-22 20:33:38 +02:00
PavelSindler
940f436a5f
merge MK3_dev into MK3
2018-10-22 20:25:29 +02:00
PavelSindler
bc247ca02c
MK2.5 sw reset at setup function
2018-10-19 17:54:48 +02:00
Robert Pelnar
ac18eb67c0
New lang, arduino 1.8.5 - boot_app debug output
...
+ variable _uartout linkage fix
+ DEBUG_DCODE5
2018-10-18 16:20:14 +02:00
Robert Pelnar
563052d015
New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix
2018-10-18 15:39:08 +02:00
Robert Pelnar
868c79e835
New lang, arduino 1.8.5 - language.h - section names, messages.h - extern "C" added
2018-10-18 14:41:32 +02:00
PavelSindler
b8f92fdfa9
MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers
2018-10-18 02:44:16 +02:00
mkbel
0d9b502937
Merge pull request #1246 from PavelSindler/variants_max
...
MK3: default max feedrate for x and y changed to 100mm/s
2018-10-10 16:46:34 +02:00
PavelSindler
bbd4f70f41
Merge pull request #1221 from XPila/MK3
...
Update fsensor in Manage_inactivity instead of main loop.
2018-10-10 13:12:12 +02:00
PavelSindler
866d6758c3
Merge pull request #1243 from mkbel/simplify_EEPROM_M500
...
Simplify eeprom m500
2018-10-10 13:11:17 +02:00
Marek Bel
9dff6431e6
Format fsensor documentation.
2018-10-09 22:33:54 +02:00
PavelSindler
809ae5a5f0
default max feedrate for x and y changed to 100mm/s
2018-10-09 20:03:28 +02:00
Marek Bel
9cae0c378a
Rename _EEPROM_writeData to EEPROM_writeData. Rename _EEPROM_readData to EEPROM_readData. Add return value to EEPROM_writeData to detect failure to write. Do not mark data as valid, if write has failed. Remove EEPROM_WRITE_VAR and EEPROM_READ_VAR macros. Make pos input only parameter. Convert EEPROM_OFFSET macro to typed constatant EEPROM_M500_base, it was defined in two places, leave it in one place. Use Config_StoreSettings() instead of erase_eeprom_section(). Compare float with 0xff byte by byte to avoid compiler warning "Dereferencing type punned pointer will break strict aliasing rules."
2018-10-08 20:24:56 +02:00
PavelSindler
c91c878408
Merge pull request #1202 from MRprusa3d/PFW-573
...
preHeatError
2018-10-08 16:12:33 +02:00
Marek Bel
1585dc66b0
Merge remote-tracking branch 'prusa3d/MK3_dev' into simplify_EEPROM_M500
...
Known limitation: Unable to compile.
2018-10-08 15:58:49 +02:00
Marek Bel
c77672bf0f
PFW-608 Decrease wear of mass erase EEPROM and do it faster.
2018-10-05 18:11:26 +02:00
PavelSindler
436f5b5728
changed version
2018-10-04 17:40:38 +02:00
PavelSindler
d2aa13d333
Merge pull request #1199 from mkbel/document_gcodes1
...
Documentation: Put scattered and unscattered Gcode documentation toge…
2018-10-04 16:29:39 +02:00
Robert Pelnar
9960c80bf7
Additional check always with enabled oq_meassure
...
+ variant files
2018-10-04 16:12:41 +02:00
Robert Pelnar
f9d8c46802
Enable/disable optical quality meassurement in settings menu
2018-10-04 15:48:28 +02:00
Robert Pelnar
ced74b7ec2
Merge remote-tracking branch 'upstream/MK3' into MK3
2018-10-04 13:53:00 +02:00
Robert Pelnar
7882b3c975
Update fsensor in Manage_inactivity instead of main loop.
2018-10-03 17:29:24 +02:00
PavelSindler
3a58489c6a
Merge pull request #1169 from mkbel/remove_duplicate_debouncing_4
...
Remove duplicate debouncing 4
2018-10-02 11:21:17 +02:00
PavelSindler
bba1ffdb65
version change
2018-09-27 21:13:06 +02:00
PavelSindler
aefb4e5c09
Merge pull request #1200 from XPila/MK3
...
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
2018-09-27 21:05:33 +02:00
Robert Pelnar
e50025cc7d
static_assert - portable solution compatible with C++98
2018-09-27 19:59:29 +02:00
PavelSindler
7e9220ada2
Merge pull request #1198 from PavelSindler/communication_timeouts
...
communication timeouts fix
2018-09-27 11:23:58 +02:00
MRprusa3d
0184f06dcf
preHeatError
...
correction of preHeatError detection
2018-09-27 04:23:00 +02:00
Robert Pelnar
c2f535b619
Filament sensor - fix invalid calculation of fsensor_counter in LA stepper.
...
+decreased additional check sensitivity/sctrictness
2018-09-26 18:59:07 +02:00
Marek Bel
0e33db0064
Documentation: Put scattered and unscattered Gcode documentation together in process_commands documentation. Mention at least existence of all implemented commands. Document T<n> and T? commands.
2018-09-26 18:55:31 +02:00
PavelSindler
e6a00b8f53
send busy messages when checking for filament presence
2018-09-25 19:14:57 +02:00
Marek Bel
4151e19781
Remove attribute packed. It is not needed on 8-bit platform. Change of platform would be detected by static_assert (sizeof(M500_conf) == 188).
2018-09-25 16:27:20 +02:00
Marek Bel
d80fcab66c
Disable filament sensor response quality check.
2018-09-25 15:50:50 +02:00
Marek Bel
19c1ba6274
Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch.
2018-09-25 14:25:03 +02:00
Marek Bel
ccfcc6f989
Document.
2018-09-24 18:32:01 +02:00
Marek Bel
3662f60f8f
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values;
2018-09-24 18:13:20 +02:00
Marek Bel
c38fef281d
Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore.
2018-09-24 17:33:58 +02:00
Marek Bel
ca179a2d18
Use cs.filament_size from ConfigurationStore.
2018-09-24 17:29:02 +02:00
Marek Bel
e225e9cab0
Use cs.volumetric_enabled from ConfigurationStore.
2018-09-24 17:12:16 +02:00
Marek Bel
a201128b20
Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore.
2018-09-24 17:10:25 +02:00
Marek Bel
7e593e6922
Use cs.autoretract_enabled from ConfigurationStore.
2018-09-24 17:03:10 +02:00
Marek Bel
20ba2b1c79
Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore.
2018-09-24 16:57:48 +02:00
Marek Bel
54bcc8aa52
Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore.
2018-09-24 16:54:50 +02:00
Marek Bel
f2ae3fb1f7
Use cs.zprobe_zoffset from ConfigurationStore.
2018-09-24 16:47:57 +02:00
Marek Bel
959d0069fa
Use cs.add_homing from ConfigurationStore.
2018-09-24 16:42:28 +02:00
Marek Bel
ac7c062161
Use cs.max_jerk from ConfigurationStore.
2018-09-24 16:35:33 +02:00
Marek Bel
bb66bfe6a7
Use cs.minsegmenttime from ConfigurationStore.
2018-09-24 16:22:50 +02:00
mkbel
0e7afc67ca
Merge pull request #1175 from PavelSindler/eeprom_version
...
M500 EEPROM version update and M500 EEPROM block size check
2018-09-24 16:19:55 +02:00
Marek Bel
10428b30d9
Use cs.mintravelfeedrate from ConfigurationStore.
2018-09-24 16:01:58 +02:00
PavelSindler
cd438c5c00
whitespace
2018-09-24 16:01:31 +02:00
PavelSindler
740e922b87
EEPROM M500 block size check for reading stored data added
2018-09-24 16:00:23 +02:00
Marek Bel
26e2fd1c76
Use cs.minimumfeedrate from ConfigurationStore.
2018-09-24 15:57:24 +02:00
Marek Bel
b8fefceb4d
Use cs.retract_acceleration from ConfigurationStore.
2018-09-24 15:53:35 +02:00
Marek Bel
7dbe0afdc4
Use cs.acceleration from ConfigurationStore.
2018-09-24 15:47:36 +02:00
Marek Bel
cee51cf9c3
Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore.
2018-09-24 15:40:35 +02:00
Marek Bel
02becb5e6a
Use cs.max_feedrate_normal from ConfigurationStore.
2018-09-24 15:09:19 +02:00
PavelSindler
053b94b711
remove "start" duplicity in setup
2018-09-24 14:57:46 +02:00
Marek Bel
3f28632443
Use cs.axis_steps_per_unit from ConfigurationStore.
2018-09-24 14:54:41 +02:00
Marek Bel
d611cad087
Temporary hide M500_conf cs to allow automated renaming.
2018-09-24 14:42:01 +02:00
Marek Bel
e94dc1341a
Use M500_conf cs in Config_ StoreSettings, RetrieveSettings and ResetDefault.
2018-09-24 14:34:43 +02:00
Marek Bel
991db0e71d
Finish default_conf.
2018-09-23 23:36:01 +02:00
Marek Bel
d9e2dcc736
Incomplete.
2018-09-23 22:21:28 +02:00
Marek Bel
58af1ae4c4
Add configuration store struct.
2018-09-21 20:52:44 +02:00
PavelSindler
d8dc2eef7a
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; eeprom_version changed back to V2
2018-09-21 15:42:28 +02:00
PavelSindler
1c33b673c0
comment update
2018-09-19 18:43:27 +02:00
PavelSindler
3d57d504ba
Merge pull request #1174 from mkbel/fix_runout_resume
...
Fix runout resume
2018-09-19 18:29:32 +02:00
Marek Bel
2607a0c4ed
Update documentation.
2018-09-19 17:22:06 +02:00
Marek Bel
b92b307ee8
Make variables constant.
2018-09-19 17:21:45 +02:00
Marek Bel
cce8131070
Add missing s for seconds of print time.
2018-09-19 17:20:41 +02:00
Marek Bel
b5bb40474d
Fix print time overflow.
2018-09-19 17:17:32 +02:00
PavelSindler
0a5394a20e
defines moved to eeprom.h
2018-09-19 15:10:10 +02:00
PavelSindler
752aec37fb
M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored
2018-09-19 14:36:26 +02:00
Marek Bel
9868dd766e
Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out.
2018-09-19 14:22:08 +02:00
Marek Bel
a5a7b1f1d6
Move functions definitions behind variable definitions. (No change in functionality.)
2018-09-19 14:08:31 +02:00
Marek Bel
05d3b7032d
Update documentation.
2018-09-18 17:48:11 +02:00
Marek Bel
a7fdfdd258
Put repetitive code into separate function. No change in functionality.
2018-09-18 17:15:13 +02:00
Marek Bel
6ee97468ee
Remove lcd_buttons_update() call from all other places than interrupt. There is no known reason, why lcd_buttons_update() should be called from multiple places and multiple contexts. Remove mutex, which is not needed anymore, and wasn't implemented properly anyway (Operation was not atomic.).
2018-09-18 16:05:49 +02:00
Marek Bel
f532da4b17
Remove duplicate button debouncing code. Save 254B flash.
2018-09-18 14:39:01 +02:00
Marek Bel
90a10a692a
Enable button debouncing also in modal mode (!lcd_update_enabled). In lcd_clicked() consume click event immediately.
2018-09-18 14:38:50 +02:00
Marek Bel
ab2d350ed1
Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament.
2018-09-17 21:23:13 +02:00
Marek Bel
a687b8e64a
Don't enable lcd update inside mmu_eject_filament().
2018-09-17 17:12:36 +02:00
Marek Bel
f496076508
Remove redundant code. No change in functionality.
2018-09-14 18:33:03 +02:00
Marek Bel
635a1b4cd8
Add possibility to to select preheat temperature when unloading filament in first layer calibration wizard.
...
Known limitations:
During filament eject, menu is shown for some moment.
2018-09-14 18:29:14 +02:00
Marek Bel
fe30e58fb5
Add possibility to unload filament from wizard before first layer calibration, if it is not PLA.
...
Known limitations:
Preheat temperature other than PLA can not be selected.
During filament eject, menu is shown for some moment.
2018-09-14 16:06:25 +02:00
Marek Bel
d14822b22f
Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory.
2018-09-13 16:37:41 +02:00
Marek Bel
8235f0f869
Merge branch 'MK3_dev' into add_cancel
2018-09-12 19:38:26 +02:00
Marek Bel
7bc46323e2
Update pause print documentation.
2018-09-12 18:35:26 +02:00
Marek Bel
de2100ac7b
Merge branch 'MK3' into MK3_dev
2018-09-12 15:22:12 +02:00
PavelSindler
0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
...
lang fix
2018-09-12 09:38:18 +02:00
PavelSindler
45066ebddc
lang fix
2018-09-12 09:37:16 +02:00
PavelSindler
30d54be9de
Merge pull request #1142 from PavelSindler/lang2
...
changed version
2018-09-12 09:20:32 +02:00
PavelSindler
298950e601
changed version
2018-09-12 09:19:23 +02:00
Robert Pelnar
3e84bf6341
Lang update (translation + increased reserved space)
2018-09-12 02:45:13 +02:00
Marek Bel
13b67f0e0a
Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU.
2018-09-11 22:33:13 +02:00
Marek Bel
ada7cffd32
Open menu to select filament before first layer calibration if MMU unit is present.
2018-09-11 19:53:29 +02:00
PavelSindler
96aada9061
load filament messages, czech language missing translation readded
2018-09-11 18:25:38 +02:00
Marek Bel
5649d6c3c0
Precede active filament on status screen with letter F.
2018-09-11 17:27:10 +02:00
Marek Bel
98264808dc
Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5".
2018-09-11 17:16:13 +02:00
Marek Bel
46df46f482
Add possibility to use other filaments in LCD_COMMAND_V2_CAL.
2018-09-11 17:03:20 +02:00
Marek Bel
19a1ccdc76
Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.
2018-09-11 16:51:00 +02:00
Marek Bel
6c6354b2cb
Do not preheat nozzle before loading filament to MMU in first layer calibration wizard.
...
Show insert PLA filament to the first tube of MMU instead of "to the extruder".
First layer calibration wizard with MMU is now functional. But there is no option to unload filament from wizard.
2018-09-11 16:03:46 +02:00
Marek Bel
0fcd2cf2a1
Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal
2018-09-11 15:26:35 +02:00
PavelSindler
d9a2fe70ec
missing declaration fix
2018-09-11 11:06:37 +02:00
PavelSindler
c023fb12d5
add choose filament messages
2018-09-11 09:50:50 +02:00
PavelSindler
90e3ae5464
Merge pull request #1127 from XPila/MK3
...
Lang update, french translation
2018-09-11 09:44:02 +02:00
Robert Pelnar
4ca300bc39
Lang update, french translation
...
+resized reserved space
2018-09-11 03:43:05 +02:00
Marek Bel
b3bc71b45b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-09-10 23:52:51 +02:00
PavelSindler
25a46557d1
merge with upstream
2018-09-10 22:11:32 +02:00
PavelSindler
8a9f066c1b
choose_extruder_menu: extruder -> filament
2018-09-10 22:09:37 +02:00
Marek Bel
cc08d660f7
Always use filament 1 for first layer calibration when MMU is present.
...
Lift Z when moving from intro line to meander.
For MMU, print longer intro line to allow load to nozzle.
2018-09-10 20:55:50 +02:00
PavelSindler
1bb9e9ed92
MMU_DEBUG
2018-09-10 20:39:28 +02:00
PavelSindler
6fa798aa83
init
2018-09-10 20:08:13 +02:00
PavelSindler
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
Marek Bel
764e5c9769
Merge branch 'MK3' into MK3_dev
2018-09-09 22:52:01 +02:00
Marek Bel
5a6ef00cfc
Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position.
2018-09-07 10:50:23 +02:00
Marek Bel
ebfbf4ac3f
Merge branch 'MK3' into MK3_dev
2018-09-07 09:24:45 +02:00
mkbel
cbc506c379
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
...
lcd_clicked() fix (PFW-534 and PFW-546)
2018-09-07 09:07:03 +02:00
Marek Bel
001680bbdc
Merge branch 'MK3' into time_remaining_fix
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
mkbel
801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining
...
MK25: always show "normal mode" remaining time (PFW-553)
2018-09-07 08:05:16 +02:00
PavelSindler
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
PavelSindler
66305b3e04
MK25: always show "normal mode" remaining time
2018-09-06 23:05:36 +02:00
PavelSindler
48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev
...
Merge MK3 into Mk3_dev
2018-09-06 21:01:29 +02:00
PavelSindler
dbc0654b1c
Merge pull request #1108 from mkbel/pause_print
...
Pause print
2018-09-06 21:01:16 +02:00
PavelSindler
48f5da9cb8
lcd_clicked fix
2018-09-06 20:54:51 +02:00
Marek Bel
0e50c388af
Save 1K flash memory.
2018-09-06 15:06:46 +02:00
Marek Bel
0d99dc0a3f
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-06 15:06:33 +02:00
Marek Bel
5d1e59cec3
Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished.
2018-09-06 13:20:24 +02:00
Marek Bel
0fe48de4af
Remove feedmultiplyBckp global variable. Remove redundant isPrintPaused = true assignment, as it is already done in lcd_pause_print(). Remove unused saved_feedmultiply and fanSpeedBckp prototypes. Move isPrintPaused = true assignment to safer location, as LCD_COMMAND_LONG_PAUSE is not reached if lcd_commands_type is not LCD_COMMAND_IDLE.
2018-09-06 12:23:21 +02:00
Marek Bel
05a0b9c939
Remove fanSpeedBckp global variable.
2018-09-06 11:41:44 +02:00
Marek Bel
40990c4deb
Remove saved_feedmultiply global variable.
2018-09-06 11:30:06 +02:00
Marek Bel
b43c8dad74
Remove HotendTempBckp global variable.
2018-09-06 10:05:59 +02:00
Marek Bel
d71311f13f
Remove redundant HotendTempBckp from crash detection recover.
2018-09-06 09:41:37 +02:00
Marek Bel
920d828833
Rename lcd_sdcard_pause() to lcd_pause_print() to reflect, that also USB printing could be possible to pause. Unite it with pause_print() and use new (immediate) pause mechanism in all places where old mechanism was used. Rename resume_print() to lcd_resume_print() and make it global, unite it with lcd_sdcard_resume() and use it also in place, where lcd_commands_type = LCD_COMMAND_LONG_PAUSE_RESUME was used. Remove LCD_COMMAND_LONG_PAUSE_RESUME lcd_command_type. Remove unused pause_lastpos[].
2018-09-06 08:43:54 +02:00
Marek Bel
67b2456ad9
Merge branch 'MK3' into MK3_dev
2018-09-05 21:48:29 +02:00
Marek Bel
74be7677cf
Fix problem, that current_position is rewritten after long_pause() call.
2018-09-05 21:10:05 +02:00
Marek Bel
4b47a74d1d
Remove unused declarations from tmc2130.cpp. Move used declaration to Marlin.h.
2018-09-05 18:14:32 +02:00
PavelSindler
ed43913c5c
Merge pull request #1099 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-09-05 16:53:51 +02:00
PavelSindler
40679dcb3a
Merge branch 'MK3' into MK3
2018-09-05 00:06:48 +02:00
Marek Bel
a5db084b70
Move resuming nozzle temperature to restore_print_from_ram_and_continue().
...
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 14:56:20 +02:00
MRprusa3d
35cf3f3a61
Time info
...
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
Marek Bel
2abd2a6cab
Resume print fan.
...
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 11:13:51 +02:00
Marek Bel
acef0578a5
Don't move before reaching nozzle temperature when resuming the print.
...
Known limitations: Doesn't resume print fan. Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 10:07:52 +02:00
Marek Bel
d54e629950
Retract, lift Z, move away in XY, disable fan and nozzle heating. Resume nozzle heating.
...
Known limitations: Doesn't wait for nozzle temperature reaching set temperature before moving to print area. Doesn't resume print fan. Unused code not removed.
2018-09-04 08:53:27 +02:00
Marek Bel
af08e16426
Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h.
...
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
2018-09-04 08:13:56 +02:00
Marek Bel
63a215b0c3
Remove unused variable chars.
2018-09-03 20:48:03 +02:00
Marek Bel
cbf633cfd4
Remove unused variable chars.
2018-09-03 20:47:12 +02:00
Marek Bel
c95b463e0b
Remove unused variable yes. Remove redundant tmp_extruder assignment.
2018-09-03 20:44:40 +02:00
Marek Bel
517fbb66bf
Save 1K flash memory.
2018-09-03 20:00:46 +02:00
Marek Bel
d796df3f14
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-03 17:32:42 +02:00
Marek Bel
e5c0e26601
Merge branch 'MK3' into MK3_dev
2018-08-30 19:05:24 +02:00
Marek Bel
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
PavelSindler
ed49e5187b
version changed
2018-08-30 11:35:06 +02:00
PavelSindler
d96b0d5f32
linearity correction define added (menu readded)
2018-08-30 11:28:12 +02:00
MRprusa3d
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
PavelSindler
b2c94f36cc
removed unused "out of range" function
2018-08-29 14:41:39 +02:00
PavelSindler
8a453e65f8
eject filament allowed only when nozzle is hot (there can be filament loaded in printer nozzle)
2018-08-29 13:16:17 +02:00
PavelSindler
b284c70d9b
auto deplete: dont eject filament
2018-08-29 13:08:09 +02:00