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
Marek Bel
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
Marek Bel
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
Marek Bel
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
Marek Bel
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
PavelSindler
77cc55ed76
Merge pull request #951 from PavelSindler/use_timer
...
Use timer
2018-07-24 09:31:45 +02:00
Martin Remiš
c7d7389e27
PowerPanic & Sound
2018-07-23 20:04:47 +02:00
PavelSindler
b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings
2018-07-23 14:38:43 +02:00
PavelSindler
dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang
...
FSensor - optical quality meassurement
2018-07-23 14:37:16 +02:00
Robert Pelnar
896734c06b
Display '!' instead of 'FR' on status screen when feedrate or acceleration limit reached.
2018-07-23 14:30:41 +02:00
Marek Bel
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
Robert Pelnar
f0d939140b
Menu extruder info fixed
2018-07-23 12:54:48 +02:00
PavelSindler
18419eefc4
no timeouts when communicating with mmu (temporarily ?)
2018-07-23 10:50:58 +02:00
PavelSindler
efd03b426f
final edits to fit changes on upstream
2018-07-23 09:14:22 +02:00
PavelSindler
565a6db3e4
use timer class
2018-07-22 16:26:12 +02:00
Robert Pelnar
60b4db15e0
FSensor - M600 fix + cond. translation + tunning filter and params
2018-07-22 16:14:13 +02:00
Robert Pelnar
1309c52bcf
FSensor - code cleaning + simplification
...
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
2018-07-20 23:48:00 +02:00
Robert Pelnar
328cae1147
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-07-20 20:35:00 +02:00
PavelSindler
814572fed5
merge with upstream
2018-07-20 17:22:06 +02:00
PavelSindler
5fd1acaf81
Revert "PowerPanic"
2018-07-20 15:20:57 +02:00
PavelSindler
3c1f13377c
mmu first layer cal. status line message order changed
2018-07-20 14:58:36 +02:00
PavelSindler
cfe49a243a
first layer calibration: intitial version
2018-07-20 14:37:01 +02:00
Robert Pelnar
fd9b9acf4e
FSensor, code cleaning + optical quality meassurement
2018-07-20 14:03:22 +02:00
MRprusa3d
bbec1ccfd4
Add files via upload
2018-07-20 04:34:12 +00:00
Robert Pelnar
5483bee885
FSensor - meassuring filament optical quality
2018-07-19 20:55:38 +02:00
PavelSindler
045cb5bb41
stop print for mmu initial version
2018-07-19 20:46:46 +02:00
Robert Pelnar
2ce210a8bb
TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode
2018-07-19 18:56:01 +02:00
Robert Pelnar
c3e28b490c
TMC2130 old style limits removed
...
+menu draw_edit fix
2018-07-19 17:42:59 +02:00
Robert Pelnar
b46953c790
LCD menu optimalization - lcd_draw_edit removed
2018-07-19 16:57:31 +02:00
PavelSindler
3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
...
Filament sensor tunning
2018-07-19 15:22:47 +02:00
Robert Pelnar
42d2f31248
PFW-446 Stop print fix (recursion in lcd_update)
2018-07-19 14:23:45 +02:00
Robert Pelnar
6db1c6dc3b
Long press Move Z fixed
2018-07-19 13:54:56 +02:00
PavelSindler
2006ae58f1
typo fix
2018-07-18 16:54:40 +02:00
PavelSindler
b9be718deb
timeout used everywhere where we are waiting for mmu reponse
2018-07-18 16:25:31 +02:00
PavelSindler
0a43b9ce6b
timeout when waiting for mmu OK
2018-07-18 16:17:45 +02:00
PavelSindler
6e760ef76d
merge with upstream cleanup
2018-07-18 15:34:33 +02:00
Petr Ledvina
2af973bfba
Remove uninitialized variables
2018-07-17 18:57:28 +02:00
Petr Ledvina
3f17364589
Fix various warnings
2018-07-17 18:57:28 +02:00
Petr Ledvina
6cebf09b88
Fix operator priority
...
== has higher precedence to &, test was always false
2018-07-17 17:57:38 +02:00
Petr Ledvina
3f92630fd1
Fix setTargetHotend array overflow
...
Special function may be used instead (setTargetHotends(temp))
2018-07-17 17:55:04 +02:00
PavelSindler
33f9af65c8
merge with upstream/MK3
2018-07-17 16:36:53 +02:00
Robert Pelnar
64929a78f5
Linearity correction menu disabled
2018-07-17 13:35:04 +02:00
XPila
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang
2018-07-17 11:47:01 +02:00
PavelSindler
9e2985dfba
Revert "Use timer"
2018-07-17 11:38:38 +02:00
PavelSindler
77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"
2018-07-17 11:28:44 +02:00
PavelSindler
85c37d1225
Merge branch 'MK3' into fix_compiler_warnings
2018-07-17 10:56:25 +02:00
PavelSindler
322978c920
Merge branch 'MK3_mk_prep' into MK3
2018-07-17 10:03:31 +02:00
PavelSindler
e1a71118f9
Merge pull request #917 from mkbel/use_Timer
...
Use timer
2018-07-17 09:57:56 +02:00
Robert Pelnar
2451455974
LCD menu optimalization - initial lcd update fix
2018-07-16 23:54:46 +02:00
Robert Pelnar
19a72ef9eb
LCD menu optimalization - LiquidCrystal_Prusa removed
2018-07-16 23:23:15 +02:00
Robert Pelnar
e22d204e8e
LCD menu optimalization - print functions
...
+removed unused code
2018-07-16 19:29:27 +02:00
Robert Pelnar
68e59399af
LCD menu optimalization - lcd_printPGM replaced with lcd_puts_P
2018-07-16 18:08:01 +02:00
Robert Pelnar
0eaabed50c
LCD menu optimalization - renamed lcd_implementation clear
...
+code order
2018-07-16 17:54:16 +02:00
Robert Pelnar
fd3fc31304
LCD menu optimalization - conversion functions - source separation
2018-07-16 17:23:35 +02:00
Robert Pelnar
0924ad50d5
New localization vs octoprint fix - do not translate protocol messages
2018-07-16 04:50:43 +02:00
Robert Pelnar
a7df5f368b
LCD menu optimalization - sdcard menu fixed
2018-07-16 04:24:27 +02:00
Robert Pelnar
b6223d5623
LCD menu optimalization
2018-07-16 04:13:26 +02:00
Robert Pelnar
268d2634f0
LCD menu optimalization - lcd and menu
...
removed unused code and conditional translation
2018-07-16 02:13:52 +02:00
Robert Pelnar
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
Marek Bel
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
Marek Bel
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
Marek Bel
f620a66211
Use public interface instead of manipulating lcd_next_update_millis timer.
2018-07-13 18:26:52 +02:00
Marek Bel
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
Marek Bel
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
Robert Pelnar
7c78559b0e
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-12 18:27:06 +02:00
Robert Pelnar
f24c71d5a9
removed unused variable SDscrool
2018-07-12 17:01:03 +02:00
Robert Pelnar
8d5e6a65cd
LCD sdcard menu fix
...
+removed debug code
2018-07-12 16:27:02 +02:00
PavelSindler
9b7cc60b42
filament statistics hotfix, load filament move Z simplified
2018-07-11 21:59:43 +02:00
MRprusa3d
1357e27b55
FilamentAutoload setting by shipping preparation
2018-07-11 21:56:25 +02:00
Marek Bel
fc657bc31e
Merge branch 'MK3' into use_Timer
2018-07-11 21:24:18 +02:00
MRprusa3d
4b295c4091
FilamentAutoload setting by shipping preparation
2018-07-11 20:45:56 +02:00
Robert Pelnar
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
PavelSindler
1ad49dc5e9
first working version
2018-07-10 10:45:45 +02:00
PavelSindler
bde81de984
load and unload filament functions for snmm_v2
2018-07-09 15:24:59 +02:00
PavelSindler
9d0a15da90
init
2018-07-09 14:20:56 +02:00
Robert Pelnar
8d2acd02a5
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-09 12:44:58 +02:00
Robert Pelnar
e2ff00b05f
Menu optimalization - SDcard menu - initial implementation for async variant
2018-07-09 12:44:19 +02:00
Robert Pelnar
3ff4105024
XYZ cal. details screen fixed
2018-06-25 18:28:43 +02:00
Robert Pelnar
12de2f95e6
Farm mode: PFW360, PFW361, PFW362, PFW363
2018-06-25 17:29:34 +02:00
Robert Pelnar
bd5b51c7e4
LCD menu optimalization
2018-06-24 12:41:36 +02:00
Robert Pelnar
3a1c004848
LCD menu optimalization
2018-06-23 14:42:58 +02:00
Robert Pelnar
f7262637f8
LCD menu optimalization
2018-06-23 14:33:54 +02:00
Robert Pelnar
4d42617b21
LCD menu optimalization, saved ~12k of flash space
2018-06-23 03:22:39 +02:00
Robert Pelnar
5674208eda
New ML support - removed menu + hardcoded W25x20CL
2018-06-21 19:17:41 +02:00
Robert Pelnar
a53b02567a
New ML support - signature check
...
+updated scripts
+new script lang-build.sh (in future this script will replace make_lang.sh)
2018-06-18 19:37:20 +02:00
Robert Pelnar
2070c01b62
LCD menu printf test
2018-06-18 14:53:42 +02:00
Marek Bel
21f9f46698
Use Timer class for lcd_timeoutToStatus. Save 188B FLASH and costs 2B RAM.
2018-06-16 02:39:47 +02:00
Robert Pelnar
7619e94040
New ML support - checksum and signature
2018-06-15 20:37:33 +02:00
Marek Bel
29e045f502
Use Timer class for button blanking. Save 74B FLASH and 1B RAM.
2018-06-15 20:27:49 +02:00
Robert Pelnar
f162fce7a7
New ML support - fixed menu + resized reserved space
2018-06-14 22:46:01 +02:00
Robert Pelnar
9d31c8a4b3
New ML support - menu + es translation fixed
2018-06-14 15:34:40 +02:00
Robert Pelnar
8af08cd641
New ML support - fixed es translation (too long strings)
...
+ temporary disabled E-correct menu
2018-06-13 20:55:15 +02:00
XPila
3616c2a55c
Merge pull request #834 from PavelSindler/power_panic_short_filenames
...
Power panic short filenames
2018-06-13 18:54:46 +02:00
Robert Pelnar
e904188b4f
New ML support - w25x20cl chiperase menu (for testing)
2018-06-12 18:56:40 +02:00
PavelSindler
fb6f4c6c8f
break
2018-06-12 15:06:11 +02:00
PavelSindler
0ab0519c01
power panic fix: short filenames
2018-06-12 14:35:25 +02:00
Robert Pelnar
4a659ed86a
New ML support - lcd optimalization
...
lcd_menu_xyz_y_min
lcd_menu_xyz_skew
2018-06-11 02:54:31 +02:00
Robert Pelnar
30a7530b47
New ML support - lcd optimalization - lcd_menu_statistics
...
+fix LiquidCrystal_Prusa/createChar
2018-06-11 01:06:47 +02:00
Robert Pelnar
80db01e48e
New ML support - lcd optimalization - lcd_menu_extruder_info
2018-06-10 23:45:35 +02:00
Robert Pelnar
0cf7d12ae3
New ML support - lcd optimalization
...
lcd_puts_P and lcd_printf_P functions
LineFeed implemented in LiquidCrystal_Prusa
2018-06-10 22:06:00 +02:00
Robert Pelnar
c25fec9f0a
New ML support
...
printf float library enabled - platform.txt must be modified!
+flash usage optimalization - printing to serial line
current flash usage: 253206bytes (MK3 + ML support)
platform.txt original line 20:
compiler.c.elf.flags=-w -Os -Wl,--gc-sections
platform.txt modified line 20 (enable printf float library)
compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections
2018-06-10 20:04:25 +02:00
Robert Pelnar
fcfb4cdcae
New ML support - menu tunning, startup
...
+config headers (bool - true/false replaced with 0/1)
+fixed include hierarchy
+removed comments
2018-06-10 16:04:32 +02:00
Robert Pelnar
f098707021
New ML support - W25X20CL - update process UI tunning
2018-06-10 00:22:28 +02:00
Robert Pelnar
5de0a6437d
New ML support - W25X20CL - lang switching
...
+removed unused code
2018-06-09 23:49:26 +02:00
Robert Pelnar
dcd58d002c
New ML support - W25X20CL
...
language selection from menu is working
2018-06-09 19:16:36 +02:00
Robert Pelnar
c0946d8f04
New ML support - w25x20cl spi external flash support
...
+fixed some messages
+sec lang update test
2018-06-09 01:23:04 +02:00
XPila
739de5224e
Merge branch 'MK3' into MK3-new_lang
2018-06-08 14:38:00 +02:00
Robert Pelnar
37f82118c8
New ML support - lang select menu fix
2018-06-08 02:03:25 +02:00
Robert Pelnar
59e65b7f47
New ML support - language select menu
...
+cond. translation for W25X20CL
2018-06-08 01:19:49 +02:00
Robert Pelnar
bd1e410228
New ML support - W25X20CL external spi flash support
2018-06-08 00:20:28 +02:00
XPila
6a8425f62d
Merge pull request #809 from mkbel/Use_Timer
...
Use timer
2018-06-05 20:54:41 +02:00
Marek Bel
01af8a806b
Merge branch 'MK3' into Use_Timer
2018-06-05 19:03:11 +02:00
Marek Bel
5f033d5a1a
Do not create static object in global function. Saves 8B RAM and 14B flash, because there is no need to guard constructor against concurrent calls.
2018-06-05 17:47:18 +02:00
Roman Beránek
e25b869b5e
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp
2018-06-05 13:49:58 +02:00
Robert Pelnar
47c68c884c
New ML support - fixed duplicate strings
2018-06-01 14:35:03 +02:00
Robert Pelnar
5a2b056d47
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-01 00:43:16 +02:00
tarikku
731fef3d32
Fix remaining forgotten comments
2018-05-30 23:15:01 +02:00
Robert Pelnar
37e575f4bc
New ML support - debug output, bootloader
...
bootapp - automaticaly erase flash when necessary
+test code
2018-05-30 19:29:52 +02:00
Robert Pelnar
b47a29b388
New ML support - fixed invalid characters, added some cz translations
2018-05-29 15:56:00 +02:00
Robert Pelnar
b3f4e1f6e4
New ML support - language menu
2018-05-28 19:41:16 +02:00
Robert Pelnar
3bf2552b6c
fixed #761 from hzapper (#elif instead of #else if)
2018-05-28 13:41:36 +02:00
XPila
28a767b460
Merge pull request #760 from PavelSindler/safety_timer_fixes
...
Safety timer not active during filament runout procedure
2018-05-28 13:28:24 +02:00
PavelSindler
58ae70c4e1
Merge branch 'MK3' into MK3-new_lang
2018-05-28 13:22:14 +02:00
Robert Pelnar
15207e4d5e
Linearity correction fix - (eeprom storage changed to byte instead of word)
...
+enabled for XYZ axes
2018-05-28 01:47:08 +02:00
Robert Pelnar
2cf20c8c99
New ML support - migration - fix_source_1.sh script (replace 'MSG_xx' with '_T(MSG_xx)')
...
+ output + fixed source
2018-05-23 16:37:08 +02:00
PavelSindler
8c9b670c76
Merge pull request #746 from MRprusa3d/MK3
...
menu returns corrections
2018-05-22 16:08:08 +02:00
PavelSindler
137e1c5027
whitespace
2018-05-22 13:33:31 +02:00
PavelSindler
d63a17c696
Safety timer not active during filament runout detection
2018-05-22 13:31:21 +02:00
Robert Pelnar
bd587faab9
New ML support - migration - replaced source, removed original ML support files (backup)
2018-05-22 03:20:03 +02:00
PavelSindler
3eb21b65ed
wizard fix: don't reset calibration status when repeating first layer cal.
2018-05-15 23:19:23 +02:00
MRprusa3d
83aa710da6
menu returns corrections
...
Settings::FilamentSensor & FilamentAutoload
removing Calibration::ShowEndStops @ MK3
2018-05-15 20:23:22 +02:00
Marek Bel
b71a29ad96
Use ShortTimer instead of long_press_timer global variable.
2018-05-11 17:05:12 +02:00
Marek Bel
02ecd08786
Convert Time class to template, instantiate LongTimer for longer and ShortTimer for shorter periods.
2018-05-11 16:31:42 +02:00
Marek Bel
07a7ce1acf
Remove unused lcd_ping_allert().
2018-05-11 15:09:27 +02:00
Marek Bel
e8730c2899
Merge branch 'MK3' into read_xyz_cal
...
# Conflicts:
# Firmware/ultralcd.cpp
2018-05-10 18:31:31 +02:00
Marek Bel
329ea199ec
Show measured bed offset from expected position even if not homed. Remove redundant lcd_quick_feedback() calls.
2018-05-10 18:24:49 +02:00
MRprusa3d
80efafd7b9
menu returns corrections
...
Statistics
Calibration::ShowEndStops
Support::ExtruderInfo
Support::BeltStatus
Support::Temperatures
Support::Voltages
2018-05-09 00:27:32 +02:00
Marek Bel
1d7b3ea2de
Set calibration status to calibrated also by using live adjust Z.
...
This fixes problem, that if the first layer calibration is never done, live adjusting Z during printing is not applied after printer reset. Also repeatedly using live adjust Z on uncalibrated printer leads to steadily decreasing meaningless stored live adjust Z value.
2018-05-03 22:03:38 +02:00
PavelSindler
cd3851e175
Merge pull request #715 from MRprusa3d/MK3
...
Mk3
2018-05-03 14:54:43 +02:00
MRprusa3d
d02333918f
MaR::180501
2018-05-02 22:13:47 +02:00
Marek Bel
72364648dd
Hot fix: Can not move X and Y axis in stealth mode, when the printer is not homed.
...
Disable endstops in move axis menu.
2018-05-02 20:50:47 +02:00
PavelSindler
986f9fd3a6
selftest correction
2018-04-27 14:49:37 +02:00
PavelSindler
254804cc8d
MK3 selftest: move Z axis higher before calibrating autohome
2018-04-27 09:23:56 +02:00
Marek Bel
ab68221976
Always show XYZ cal. details menu.
2018-04-26 16:36:03 +02:00
Marek Bel
1a80fc28e8
Add zero point offset information support menu.
...
Note: XYZ menu is shown only if not printing and printer must me homed to show non-zero value.
2018-04-26 16:36:03 +02:00
Marek Bel
b6888470cf
Save 42 bytes of flash by removing duplicate string "--------------------".
2018-04-26 16:36:02 +02:00
Marek Bel
c1dd269a92
Fix missing degree symbol after returning to status screen. Those lcd_set_custom_characters* calls were redundant.
2018-04-26 16:36:02 +02:00
Marek Bel
d6aa149cfa
Conserve 58 bytes of flash by returning by reference.
2018-04-26 16:36:02 +02:00
Marek Bel
ae08788c99
Split lcd_service_mode_show_result screens to separate functions. Make them non blocking. Remove global array distance_from_min, pass it as function return value. Make Support submenus returning to Support menu.
2018-04-26 16:36:02 +02:00
Robert Pelnar
f64d266c89
Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1)
2018-04-26 14:50:01 +02:00
MRprusa3d
7e462b3224
Merge branch 'MK3' into MK3
2018-04-25 19:15:36 +00:00
MRprusa3d
0b6644915a
Add files via upload
2018-04-25 18:47:19 +00:00
Marek Bel
f207145752
Return from Autoload filament and Load filament menu item to parent menu.
...
Exception is Load filament, when temperature is sufficient to load filament, in such case, load filament is started and GUI returns to status screen.
2018-04-25 16:51:35 +02:00
PavelSindler
010ceceff9
add another homing after steel sheet is removed; added timeout for pinda cooling; if PINDA doesn't trigger before reaching Z = -1mm, temp. calibration fails
2018-04-24 13:43:51 +02:00
PavelSindler
043c8c66be
waiting for pinda probe cooling
2018-04-19 16:55:00 +02:00
PavelSindler
c5af3aaaf2
Merge pull request #622 from mkbel/fix_menu_return_fail_stats
...
Fix returning from Fail stats menu.
2018-04-13 18:35:03 +02:00
Marek Bel
6f985d23d6
Fix returning from Fail stats menu.
2018-04-13 17:20:30 +02:00
Marek Bel
03d03aeac4
Return to main menu from filament unloading.
2018-04-13 16:51:47 +02:00
mkbel
e4a4c88be9
Merge pull request #615 from PavelSindler/selftest_MK25_fix
...
selftest for MK2.5: fan error fix
2018-04-13 13:59:15 +02:00
PavelSindler
5f3fed33cf
Merge pull request #613 from MRprusa3d/MK3
...
Add files via upload
2018-04-13 10:02:44 +02:00
PavelSindler
591cb881cc
selftest: false fan error fix, added message in case that manual fan error fails
2018-04-12 18:24:30 +02:00
MRprusa3d
d09f190c2b
Add files via upload
2018-04-11 18:48:50 +00:00
PavelSindler
e150d502ac
removed configuration_prusa
2018-04-11 18:49:42 +02:00
PavelSindler
53d903e600
Merge pull request #610 from MRprusa3d/MK3
...
Add files via upload
2018-04-11 18:46:18 +02:00
PavelSindler
52de4891fe
typo fixed
2018-04-11 18:32:27 +02:00
MRprusa3d
c8f1c55ec0
Add files via upload
2018-04-11 14:41:41 +00:00
PavelSindler
02fda70529
farm mode: preheat menu updated
2018-04-10 14:07:44 +02:00
Robert Pelnar
92997204a1
Linearity correction - TMC codes for calibration object, variable stored as uint8, range from 1.03 to 1.20
2018-04-03 12:30:35 +02:00
Robert Pelnar
baade7db61
Removed unused files (ST7565R-dogm, digipot)
...
renamed functions digipot_init and digipot_current
fixed cond. trans. (menus)
fixed variant files - MK25, MK3
2018-03-29 23:01:13 +02:00
Marek Bel
cedb30303f
Add possible action on menu item back. This fixes broken Merge pull request #586 from mkbel/ustep_linearity_2 06d5ec5
.
2018-03-29 11:42:44 +02:00
XPila
d5636fd023
Merge pull request #585 from PavelSindler/farm_mode_MK3
...
checking if file is complete temporarily not active in farm mode
2018-03-28 19:39:00 +02:00
XPila
06d5ec5659
Merge pull request #586 from mkbel/ustep_linearity_2
...
Ustep linearity
2018-03-28 19:38:34 +02:00
XPila
ffdd11e960
Merge pull request #587 from XPila/MK3-V3_2
...
Mk3 v3 2
2018-03-28 19:38:20 +02:00
Marek Bel
9cb036fbcb
Merge remote-tracking branch 'prusa3d/MK3' into ustep_linearity_2
2018-03-28 19:11:02 +02:00
Marek Bel
40a064ffbc
Add extruder linearity correction to settings menu.
2018-03-28 18:53:37 +02:00
PavelSindler
6e15a77c9b
preheat menu update
2018-03-28 17:50:16 +02:00
PavelSindler
95e751dd65
farm mode: preheat menu update
2018-03-28 17:04:46 +02:00
PavelSindler
2c3c6c54f3
checking if file is complete temporarily not active in farm mode
2018-03-28 17:00:17 +02:00
Robert Pelnar
8ba83a9789
bugfix - PFW226 - selftest error
2018-03-28 16:13:54 +02:00
Marek Bel
678cd17e7b
Increase size of EEPROM_TMC2130_WAVE_*_FAC to 16 bits.
2018-03-28 16:13:16 +02:00
Marek Bel
57bbb0e17d
Fix wraparound from lowest value to highest value in menu value edit.
2018-03-26 20:25:23 +02:00
Marek Bel
397e7d4791
Increase resolution of wave factor.
2018-03-26 15:17:06 +02:00
XPila
903dce9716
Merge pull request #576 from PavelSindler/MK3_for_merging
...
stealth mode / silent mode
2018-03-23 20:42:08 +01:00
PavelSindler
2ce75293f3
stealth mode / silent mode
2018-03-23 19:49:59 +01:00
XPila
5a7e76e02b
Merge pull request #575 from PavelSindler/adc_pins
...
Adc pins, pinda temp table
2018-03-23 19:36:23 +01:00
PavelSindler
dc32bd24fc
correction
2018-03-23 18:20:55 +01:00
PavelSindler
2d30261976
bed voltage menu hidden
2018-03-23 16:49:06 +01:00
PavelSindler
7ad6fb526c
typo removed
2018-03-23 15:53:44 +01:00
PavelSindler
78f9f6b611
use defines for adc pins, temp table for PIDNA update
2018-03-16 11:01:06 +01:00
PavelSindler
08ec920d33
merge with upstream
2018-03-15 14:25:17 +01:00
PavelSindler
863fe1f054
show message that printer is not connected to monitoring on printer start
2018-03-14 15:35:39 +01:00
Robert Pelnar
2f98ac989a
Variant file for MK2 + cond. translation
2018-03-13 23:14:44 +01:00
Robert Pelnar
81cd96b8fe
Variant file for MK25 + cond. translation
2018-03-13 23:02:46 +01:00
Robert Pelnar
ac1a56b493
Merge branch 'MK25' into MK3
2018-03-13 20:43:19 +01:00
PavelSindler
5d389a2c36
Farm mode: when print finishes, ask which filament was used for print; statistics modified
2018-03-13 19:11:02 +01:00
PavelSindler
8ec3c0fd7e
removed "Printer disconnected" message
2018-03-13 18:50:56 +01:00
PavelSindler
f45f206faf
sorting files disabled in farm mode, start printer status needs reponse from monitoring
2018-03-13 18:50:11 +01:00
PavelSindler
ddeb7b8c84
statistics improved, initial version of function which forces user to connect printer to monitoring
2018-03-13 18:43:42 +01:00
XPila
f487691070
Merge pull request #536 from mkbel/menu_return
...
Menu return
2018-03-13 14:30:48 +01:00
PavelSindler
98e96c9182
Merge pull request #457 from bubnikv/MK3_fast_dbg
...
Mk3 fast dbg
2018-03-13 14:13:29 +01:00
Marek Bel
b41d680adf
Replace problematic character in comment.
2018-03-07 20:58:15 +01:00
Marek Bel
8ff028820a
Remove redundant parameter.
2018-03-07 20:55:01 +01:00
PavelSindler
abb9aa0a16
not using homing currents in axis selftest
2018-03-07 20:42:15 +01:00
Marek Bel
2a53686d2f
Document valid usage of lcd_goto_menu(), remove redundant parameter.
2018-03-07 20:40:59 +01:00