Commit Graph

565 Commits

Author SHA1 Message Date
Robert Pelnar f0624a9e97 Lang - some not localized texts marked as localized, formating fixed 2018-11-22 14:37:29 +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 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
PavelSindler 22cf2c6b6b M600 load messages synchronization fixed 2018-11-09 15:31:44 +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
PavelSindler 908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
filament quality measurements disabled
2018-11-05 19:14:34 +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
Marek Bel ef5be690fb Add autodeplete setting into tune menu. 2018-11-05 13:54:22 +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 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 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
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
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 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 a9317b4d36 upstream/MK3 merge 2018-10-25 21:46:32 +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
PavelSindler 940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +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
Robert Pelnar f9d8c46802 Enable/disable optical quality meassurement in settings menu 2018-10-04 15:48:28 +02:00
Robert Pelnar e50025cc7d static_assert - portable solution compatible with C++98 2018-09-27 19:59:29 +02:00
Marek Bel 3f28632443 Use cs.axis_steps_per_unit from ConfigurationStore. 2018-09-24 14:54:41 +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 96aada9061 load filament messages, czech language missing translation readded 2018-09-11 18:25:38 +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
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 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
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 12b1769531 Fix printer reset when changing filament during print over USB. 2018-08-30 16:02:13 +02:00
MRprusa3d 25a22120fb 1-st Layer Calibration correction
filament loading improvement
2018-08-30 03:32:33 +02:00
PavelSindler 515e78cfd1 Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament 2018-08-29 01:58:28 +02:00
PavelSindler b9808354c4 Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder 2018-08-28 23:53:35 +02:00
PavelSindler 705f098b1c eject filament: initial version 2018-08-28 23:50:31 +02:00
MRprusa3d d3869bd857 Z-endstop @ MK3
add show P.I.N.D.A. state menu item @ CalibrationMenu
2018-08-28 16:12:59 +02:00
PavelSindler 3e2cb72695
Merge branch 'MK3' into auto_deplete_2 2018-08-28 11:01:30 +02:00
Marek Bel 72cd0d26f9 Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu. 2018-08-27 21:08:40 +02:00
Marek Bel 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
Marek Bel 1cdb7a48cb Show auto deplete only when mmu unit present. 2018-08-27 16:24:21 +02:00
Marek Bel 8279aba4d7 Add auto deplete setting. 2018-08-27 16:15:46 +02:00
Marek Bel f02b0d80e3 Split settings menu into separate macros. 2018-08-27 15:48:09 +02:00
PavelSindler 2b32b41969 MK2.5 build error hotfix 2018-08-27 05:53:39 +02:00
PavelSindler 168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
Mmu filament sensor
2018-08-27 05:26:12 +02:00
PavelSindler 03fffae4c3 finda runout sensor can be turned on/off from menu 2018-08-27 05:20:42 +02:00
PavelSindler c57fdb11b7 show active extruder: numbers corrected 2018-08-26 14:22:52 +02:00
PavelSindler 815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2
Fix linearity correction 2
2018-08-25 16:56:40 +02:00
PavelSindler 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
Marek Bel df61172984 Fix linearity correction not saved and applied when menu was left by timeout. 2018-08-24 20:31:49 +02:00
Marek Bel 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
Marek Bel ac5cb0989e Uncomment linearity correction menu. Fix return from linearity correction menu. 2018-08-24 16:00:51 +02:00
Marek Bel 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
Marek Bel 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
Robert Pelnar dfb4bfac5b MMU - display status while switching active extruder [PFW-465] 2018-08-22 16:38:34 +02:00
Robert Pelnar 1cd0c6cfea Status screen - print active MMU exrtuder (1/2 PFW465) 2018-08-20 00:59:36 +02:00
Robert Pelnar 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
Robert Pelnar 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
Robert Pelnar f1ad1d22ba Menu lcd_adjust_bed fixed (Bed level correction, PFW-499) 2018-08-19 13:59:33 +02:00
Robert Pelnar 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
Robert Pelnar 923a06c164 menu data shared memory re-design
+code cleaning
2018-08-10 02:59:49 +02:00
Robert Pelnar 796079bb08 MMU2 communication - connection after reset, fw versions, state machine
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
Robert Pelnar 4e32fb7181 removed '!' signalization when accel/feedrate limits reached 2018-08-08 20:23:13 +02:00
Robert Pelnar ca25ec90bd Disabled timeouts in support and failstats menus 2018-08-08 19:28:34 +02:00
Robert Pelnar 9e09efc9f4 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
conflicts + fix
2018-08-07 20:55:08 +02:00
Robert Pelnar 71f1a1f6db MMU - communication, check after start, code cleaning 2018-08-07 20:37:59 +02:00
PavelSindler cf06c5171c merge with upstream 2018-08-03 18:43:09 +02:00
PavelSindler a1f69e0924 manage response update 2018-08-03 18:37:52 +02:00
Robert Pelnar 468873ec68 MMU2 - removed conditional translation for SNMM_V2, new module mmu 2018-08-02 18:54:00 +02:00
Robert Pelnar d378575a68 SNMM_V2 - default retraction declared as variable 2018-08-02 17:07:09 +02:00
PavelSindler 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
Marek Bel 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
Marek Bel 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
MRprusa3d bafd290141 Sound
& TuneMenu
2018-08-01 22:34:58 +02:00
PavelSindler ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
M600 updated
2018-08-01 19:39:08 +02:00
PavelSindler 06063118bd M600 updated 2018-08-01 18:47:28 +02:00
Marek Bel 1a2d7657dc Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:39:54 +02:00
Marek Bel 6f824730af Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:37:09 +02:00
Marek Bel ab5593e673 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 16:58:09 +02:00
PavelSindler 0e059f8da6 single material fix: remove semicolon, unload_filament() function definition 2018-08-01 11:33:58 +02:00
PavelSindler d363bd071d
Merge pull request #990 from PavelSindler/snmm_v2
Snmm v2: M600, communication timeouts with mmu
2018-08-01 10:43:22 +02:00
PavelSindler 40da6deef8 timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file 2018-07-31 19:00:42 +02:00
PavelSindler 04d0178150 automatic M600 initial version 2018-07-31 12:24:22 +02:00
Robert Pelnar fa30353646 Live adjust Z format fix 2018-07-30 19:24:04 +02:00
MRprusa3d 970ba6fa2a Sound
all cases
2018-07-29 22:59:14 +02:00