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
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +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
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
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
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
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +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
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
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +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
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +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
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +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
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
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +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
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
e36e58f385
show sensor on/off temporarily changed to unlocalized strings
2018-12-21 21:28:57 +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
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
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
40fe52202d
stop paused print fix: saved_printing set to false when doing stop print
2018-12-19 19:20:09 +01:00
b5430c2968
M600: consume click
2018-12-18 19:10:02 +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
cb1f6d2a0e
show sensor states in calibration menu
2018-12-14 19:43:26 +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
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +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
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
8af127870d
consume click
2018-12-11 15:59:44 +01:00
6d6de67c3f
consume click
2018-12-07 18:31:30 +01:00
0ceeba38cb
Lang - text "Copy selected language from XFLASH?" shorted to "Copy selected language?"
2018-11-22 17:32:53 +01:00
37273d9fca
Lang - 'Auto Deplete' changed to 'SpoolJoin'
2018-11-22 17:19:38 +01:00
f0624a9e97
Lang - some not localized texts marked as localized, formating fixed
2018-11-22 14:37:29 +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
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
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +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
908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
...
filament quality measurements disabled
2018-11-05 19:14:34 +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
ef5be690fb
Add autodeplete setting into tune menu.
2018-11-05 13:54:22 +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
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
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
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
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
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
a9317b4d36
upstream/MK3 merge
2018-10-25 21:46:32 +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
940f436a5f
merge MK3_dev into MK3
2018-10-22 20:25:29 +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
f9d8c46802
Enable/disable optical quality meassurement in settings menu
2018-10-04 15:48:28 +02:00
e50025cc7d
static_assert - portable solution compatible with C++98
2018-09-27 19:59:29 +02:00
3f28632443
Use cs.axis_steps_per_unit from ConfigurationStore.
2018-09-24 14:54:41 +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
96aada9061
load filament messages, czech language missing translation readded
2018-09-11 18:25:38 +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
6fa798aa83
init
2018-09-10 20:08:13 +02:00
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +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
35cf3f3a61
Time info
...
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +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
705f098b1c
eject filament: initial version
2018-08-28 23:50:31 +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
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +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
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
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
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
c57fdb11b7
show active extruder: numbers corrected
2018-08-26 14:22:52 +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
df61172984
Fix linearity correction not saved and applied when menu was left by timeout.
2018-08-24 20:31:49 +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
ac5cb0989e
Uncomment linearity correction menu. Fix return from linearity correction menu.
2018-08-24 16:00:51 +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
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
dfb4bfac5b
MMU - display status while switching active extruder [PFW-465]
2018-08-22 16:38:34 +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
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
923a06c164
menu data shared memory re-design
...
+code cleaning
2018-08-10 02:59:49 +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
4e32fb7181
removed '!' signalization when accel/feedrate limits reached
2018-08-08 20:23:13 +02:00
ca25ec90bd
Disabled timeouts in support and failstats menus
2018-08-08 19:28:34 +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
cf06c5171c
merge with upstream
2018-08-03 18:43:09 +02:00
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
PavelSindler
PavelSindler
Robert Pelnar
MRprusa3d
MRprusa3d
Marek Bel
mkbel