Commit Graph

408 Commits

Author SHA1 Message Date
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