091934462d
menu correction
2019-03-08 20:06:30 +01:00
315959c13a
menu update
2019-03-08 20:03:23 +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
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
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
f1031d2302
new farm statuses for pause (14) and wait for user (15)
2019-03-05 16:00:50 +01:00
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +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
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
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
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +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
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +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
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
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +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
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01: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
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +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
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +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
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
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +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
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
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
d378575a68
SNMM_V2 - default retraction declared as variable
2018-08-02 17:07:09 +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
06063118bd
M600 updated
2018-08-01 18:47:28 +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
ab5593e673
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:58:09 +02:00
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +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
40da6deef8
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
2018-07-31 19:00:42 +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
970ba6fa2a
Sound
...
all cases
2018-07-29 22:59:14 +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
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
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
77cc55ed76
Merge pull request #951 from PavelSindler/use_timer
...
Use timer
2018-07-24 09:31:45 +02:00
c7d7389e27
PowerPanic & Sound
2018-07-23 20:04:47 +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
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
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
1309c52bcf
FSensor - code cleaning + simplification
...
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
2018-07-20 23:48:00 +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
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
bbec1ccfd4
Add files via upload
2018-07-20 04:34:12 +00: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
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
3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
...
Filament sensor tunning
2018-07-19 15:22:47 +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
2006ae58f1
typo fix
2018-07-18 16:54:40 +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
2af973bfba
Remove uninitialized variables
2018-07-17 18:57:28 +02:00
3f17364589
Fix various warnings
2018-07-17 18:57:28 +02:00
6cebf09b88
Fix operator priority
...
== has higher precedence to &, test was always false
2018-07-17 17:57:38 +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
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
e22d204e8e
LCD menu optimalization - print functions
...
+removed unused code
2018-07-16 19:29:27 +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
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
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
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
7c78559b0e
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-12 18:27:06 +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
9b7cc60b42
filament statistics hotfix, load filament move Z simplified
2018-07-11 21:59:43 +02:00
1357e27b55
FilamentAutoload setting by shipping preparation
2018-07-11 21:56:25 +02:00
fc657bc31e
Merge branch 'MK3' into use_Timer
2018-07-11 21:24:18 +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
1ad49dc5e9
first working version
2018-07-10 10:45:45 +02:00
bde81de984
load and unload filament functions for snmm_v2
2018-07-09 15:24:59 +02:00
9d0a15da90
init
2018-07-09 14:20:56 +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
3ff4105024
XYZ cal. details screen fixed
2018-06-25 18:28:43 +02:00
12de2f95e6
Farm mode: PFW360, PFW361, PFW362, PFW363
2018-06-25 17:29:34 +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
PavelSindler
PavelSindler
MRprusa3d
Marek Bel
MRprusa3d
Robert Pelnar
mkbel
Petr Ledvina