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