3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,853 Commits 3 Branches 78 Tags 40 MiB
ced74b7ec2
Commit Graph

1408 Commits

Author SHA1 Message Date
MRprusa3d
bbec1ccfd4
Add files via upload 2018-07-20 04:34:12 +00:00
MRprusa3d
a09d44b869 PowerPanic 
experimental
 2018-07-20 04:47:33 +02: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
PavelSindler
538f8a8858 Merge remote-tracking branch 'upstream/MK3' into snmm_v2 2018-07-19 20:27:51 +02:00
PavelSindler
231a6dcf1b M600 for single material fix 2018-07-19 20:27:39 +02:00
PavelSindler
86882ae10a M600 for snmm_v2 intial working version 2018-07-19 20:16:42 +02:00
Robert Pelnar
2a66251170 _DISABLE_M42_M226 removed 2018-07-19 19:33:28 +02:00
Robert Pelnar
fd0b7c25e5 TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode 2018-07-19 19:12: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
5fecb7a2dc M600 2018-07-19 16:17:46 +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
fa9d4550f0 PFW-448 menu items displaying fix 2018-07-19 15:21:46 +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
7600848533 load to nozzle function, M600 work in progress 2018-07-19 13:14:29 +02:00
Robert Pelnar
afb9ca4687 FSensor - removed fsensor blocking while load, added filament quality meassurement 2018-07-18 17:45:54 +02:00
PavelSindler
2006ae58f1 typo fix 2018-07-18 16:54:40 +02:00
PavelSindler
5676550452 missing get response readded 2018-07-18 16:52:10 +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
Robert Pelnar
2c06cb68d1 FSensor tunning - filtering changed, chunk length = 0.64mm and MAX_ERR = 10 2018-07-17 20:04:12 +02:00
Petr Ledvina
d3e9543fee Fix undefined behaviour 
Argument evaluation order is undefined
 2018-07-17 19:12:48 +02:00
Petr Ledvina
48d6ebffd8 Fix code_seen 
char/string version was mixed
 2018-07-17 18:57:28 +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
33bf363798 Fix st_get_position_mm 
call it, do not index function pointer
 2018-07-17 18:57:28 +02:00
Petr Ledvina
ef93de95d8 Fix int overflow 2018-07-17 18:57:28 +02:00
Petr Ledvina
ba8bcf76be Use signed value where appropriate 2018-07-17 17:57:38 +02:00
Petr Ledvina
7bbf9953f2 Fix missing return warnings 2018-07-17 17:57:38 +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
ceeb97f38c Parentheses around macro argument 
Not triggering error in this case
 2018-07-17 17:57:38 +02:00
Petr Ledvina
baddf38dbc Make card filename const 
Fixes warning in filename_wldsd
 2018-07-17 17:55:05 +02:00
Petr Ledvina
f2981bf322 Fix type coversion warnings in language.c 2018-07-17 17:55:05 +02:00
Petr Ledvina
d64754468a Fix undefined function warnings 2018-07-17 17:55:05 +02:00
Petr Ledvina
fd332c1ff1 Fix ADC index overflow 
Use bitmap bitcount to map pin number to adc_values array  index. Old
code fails for TEMP_AMBIENT_PIN and VOLT_BED_PIN
 2018-07-17 17:55:04 +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
PavelSindler
eb3307e8fc
Merge pull request #889 from mkbel/fix_PRUSA_RESET 
Do not skip bootloader when initiating reset by farm PRUSA RESET comm…
 2018-07-17 09:52:41 +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
PavelSindler
fddc02adfa version changed 2018-07-16 21:01:40 +02:00
Robert Pelnar
d1de75eb19 LCD menu optimalization - createChar 
+code order
 2018-07-16 19:53:34 +02:00
Robert Pelnar
e22d204e8e LCD menu optimalization - print functions 
+removed unused code
 2018-07-16 19:29:27 +02:00
PavelSindler
a575c028bf resend request sends OK 2018-07-16 19:20:39 +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
PavelSindler
0e15a4025b whitespace 2018-07-15 20:24:24 +02:00
PavelSindler
6824ab65dd G28 fix 2018-07-15 20:00:29 +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
42893b7a94 Fix compiler warnings: 
sketch/Marlin_main.cpp:806:6: warning: unused variable 'cursor_pos' [-Wunused-variable]
sketch/Marlin_main.cpp:1922:7: warning: unused variable 'stack_integrity' [-Wunused-variable]
sketch/Marlin_main.cpp:4254:8: warning: unused variable 'clamped' [-Wunused-variable]
 2018-07-13 20:47:40 +02:00
Marek Bel
83081b0fba Fix compiler warning: sketch/LiquidCrystal_Prusa.cpp:502:1: warning: label 'end' defined but not used [-Wunused-label]. 2018-07-13 20:00:20 +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
ee366ce3b5 Fix compiler warnings: 
In file included from sketch/ConfigurationStore.cpp:3:0:
sketch/temperature.h:193:14: warning: 'temp_runaway_status' defined but not used [-Wunused-variable]
 static float temp_runaway_status[4];
              ^
sketch/temperature.h:194:14: warning: 'temp_runaway_target' defined but not used [-Wunused-variable]
 static float temp_runaway_target[4];
              ^
sketch/temperature.h:195:14: warning: 'temp_runaway_timer' defined but not used [-Wunused-variable]
 static float temp_runaway_timer[4];
              ^
sketch/temperature.h:196:12: warning: 'temp_runaway_error_counter' defined but not used [-Wunused-variable]
 static int temp_runaway_error_counter[4];
 2018-07-13 19:18:54 +02:00
Marek Bel
ff56e491e8 Save 2B flash, fix compiler warning: 
In file included from sketch/ConfigurationStore.cpp:5:0:
sketch/ConfigurationStore.h: In function 'uint8_t calibration_status_store(uint8_t)':
sketch/ConfigurationStore.h:24:124: warning: no return statement in function returning non-void [-Wreturn-type]
 inline uint8_t calibration_status_store(uint8_t status) { eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS, status); }
 2018-07-13 18:49:14 +02:00
Marek Bel
c251777590 Fix compiler warning: 
In file included from sketch/BlinkM.cpp:5:0:
sketch/Marlin.h:422:13: warning: 'void print_time_remaining_init()' declared 'static' but never defined [-Wunused-function]
 static void print_time_remaining_init();

Make local functions static. Saves 6B of flash.
 2018-07-13 18:44:54 +02:00
Marek Bel
bc99db8233 Fix compiler warning: sketch/uart2.c:48:1: warning: control reaches end of non-void function [-Wreturn-type] 2018-07-13 18:35:42 +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
68a5a4b74e FEEDRATE_LIMIT fix 2018-07-12 23:51:15 +02:00
Robert Pelnar
f9f718e787 Config_PrintSettings fix 2018-07-12 23:50:41 +02:00
Robert Pelnar
37f34a1ba3 Config_PrintSettings (M503) - printf optimized (~800 bytes flash saved) 2018-07-12 23:40:04 +02:00
Robert Pelnar
007717bfd2 Disabled TMC2130 feedrate and acceleration limits (should be properly limited with M201-M203) 2018-07-12 19:04:44 +02:00
Marek Bel
070e6f49e8 Fix error in sine wave compression algorithm in tmc2130. This problem could manifest itself only for negative function slope, which is not used. 2018-07-12 18:56:11 +02:00
Marek Bel
2116262845 Fix *_MAX_ACCEL integer overflow. 2018-07-12 18:46:12 +02:00
Robert Pelnar
7c78559b0e Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-07-12 18:27:06 +02:00
Marek Bel
bc1f416602 Fix compiler warning symbol __AVR redefined. 2018-07-12 18:26:29 +02:00
Robert Pelnar
b35a212d15 PAT9125 optimalization (rewrited to C, 8bit sampling) 2018-07-12 18:11:07 +02:00
Marek Bel
2c00f065fd Fix error in recovering after power panic. (Function pointer was passed instead of function been called.) 
It manifested istself as following compiler warnings:
sketch/Marlin_main.cpp: In function 'void print_physical_coordinates()':
sketch/Marlin_main.cpp:9065:86: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                      ^
sketch/Marlin_main.cpp:9065:114: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                                                  ^
sketch/Marlin_main.cpp:9065:142: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                                                                              ^
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
 }
 ^
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
 2018-07-12 18:06:07 +02:00
Robert Pelnar
410e911364 SWI2C for PAT9125 simplified/optimized 2018-07-12 17:55:38 +02:00
Marek Bel
fb6aa72de9 Fix compiler warnings in sm4.c 2018-07-12 17:38:13 +02:00
Marek Bel
2b5e63eb7f Fix compiler warnings in language.c and document _SEC_LANG_TABLE macro. 2018-07-12 17:23:50 +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
Marek Bel
bf0bbb215e Merge branch 'MK3' into fix_compiler_warnings 2018-07-12 14:10:02 +02:00
PavelSindler
07f6ddfb69 filament loading corrected 2018-07-11 22:34:32 +02:00
PavelSindler
9b7cc60b42 filament statistics hotfix, load filament move Z simplified 2018-07-11 21:59:43 +02:00
PavelSindler
11aa775322 move in Z before filament loading: intial version 2018-07-11 21:59:23 +02:00
Marek Bel
29d1052f0e Save 80B of flash and 8B of RAM and fix compiler warning: 
sketch/adc.c: In function 'adc_init':
sketch/adc.c:20:2: warning: implicit declaration of function 'printf' [-Wimplicit-function-declaration]
  printf(("adc_init\n"));
  ^
sketch/adc.c:20:2: warning: incompatible implicit declaration of built-in function 'printf' [enabled by default]
 2018-07-11 21:58:49 +02:00
PavelSindler
d18160cab5 splash screen 2018-07-11 21:58:06 +02:00
MRprusa3d
1357e27b55 FilamentAutoload setting by shipping preparation 2018-07-11 21:56:25 +02:00
MRprusa3d
d658bf56cf ShippingPrep Reset 
statistics reset by shipping preparation & filament sensor force
 2018-07-11 21:55:21 +02:00
PavelSindler
29d73029ae
Merge pull request #916 from MRprusa3d/MK3 
FilamentAutoload setting by shipping preparation
 2018-07-11 21:42:42 +02:00
Marek Bel
fc657bc31e Merge branch 'MK3' into use_Timer 2018-07-11 21:24:18 +02:00
mkbel
02bd319a6c
Merge pull request #818 from 3d-gussner/MK3_fix7 
Fix warning #7
 2018-07-11 21:04:13 +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
MRprusa3d
d167b631fb ShippingPrep Reset 
statistics reset by shipping preparation & filament sensor force
 2018-07-11 18:52:58 +02:00
PavelSindler
1ad49dc5e9 first working version 2018-07-10 10:45:45 +02:00
PavelSindler
c7745dfb83
Merge pull request #908 from XPila/MK3-new_lang 
TMC2130 gcodes for live motor tunning:
 2018-07-09 16:58:09 +02:00
Robert Pelnar
771cead291 TMC2130 gcodes for live motor tunning: 
TMC_SET_WAVE_X..E (linearity correction)
TMC_SET_CHOP_X..E (chopper configuration - 4 args - toff, hstr, hend, tbl)
 2018-07-09 16:44:10 +02:00
PavelSindler
bde81de984 load and unload filament functions for snmm_v2 2018-07-09 15:24:59 +02:00
PavelSindler
18f007d7b2 Merge remote-tracking branch 'upstream/MK3' into snmm_v2 2018-07-09 14:47:10 +02:00
PavelSindler
928dcb1417 missing initialization fix 2018-07-09 14:45:59 +02:00
PavelSindler
9d0a15da90 init 2018-07-09 14:20:56 +02:00
PavelSindler
5979bf5e0c T-codes for MMU_V2: initial version 2018-07-09 13:57:36 +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
c8d5648ea8 Version changed 2018-07-02 16:53:10 +02:00
Marek Bel
3248edc1ca Do not skip bootloader when initiating reset by farm PRUSA RESET command. 
Set bootloader magic and run flag before watchdog reset in PRUSA RESET command.
 2018-06-26 20:12:09 +02:00
PavelSindler
6abde828fa version changed 2018-06-26 18:53:11 +02:00
PavelSindler
65880fac67
Merge pull request #875 from PavelSindler/fix_crash_restore 
dummy "ok" reponse readded (fix for SD card print with Octoprint: fix…
 2018-06-25 19:08:43 +02:00
PavelSindler
6f617696ac dummy "ok" reponse readded (fix for SD card print with Octoprint: fixes communication timeout issues) 2018-06-25 18:52:22 +02:00
XPila
01f04cc406
Merge pull request #874 from XPila/MK3 
XYZ cal. details screen fixed
 2018-06-25 18:29:58 +02:00
Robert Pelnar
3ff4105024 XYZ cal. details screen fixed 2018-06-25 18:28:43 +02:00
PavelSindler
3674673faa
Merge pull request #873 from PavelSindler/MK3_for_merging 
status screen update
 2018-06-25 17:56:53 +02:00
PavelSindler
81c0c01825 status screen update 2018-06-25 17:50:37 +02:00
XPila
20f98d487a
Merge pull request #872 from XPila/MK3 
Farm mode - tmc2130 extruder current setting fixed
 2018-06-25 17:45:58 +02:00
Robert Pelnar
fe9b4e5f1f Farm mode - tmc2130 extruder current setting fixed 2018-06-25 17:45:07 +02:00
PavelSindler
0fccf5a737
Merge pull request #870 from XPila/MK3 
Mk3
 2018-06-25 17:36:22 +02:00
PavelSindler
5d531b0f66 save extruder relative mode correctly 2018-06-25 17:30:20 +02:00
Robert Pelnar
12de2f95e6 Farm mode: PFW360, PFW361, PFW362, PFW363 2018-06-25 17:29:34 +02:00
Robert Pelnar
6d4c3b8b27 Farm mode - reset using watchdog for MK3 2018-06-25 16:04:47 +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
febca066f2 New ML support - multiple languages in internal flash (MK25/MK2) 2018-06-23 01:31:38 +02:00
Robert Pelnar
7f9c9c153a Rambo 1.0 pinout changed - SCL/21 (used for ENC button) rewired to PH2/84 2018-06-22 18:37:18 +02:00
PavelSindler
49ad60f0ff
Merge pull request #851 from PavelSindler/confused_display 
set default printer message when recovering from crash detection
 2018-06-22 08:48:33 +02:00
PavelSindler
f365150e3a
Merge pull request #860 from PavelSindler/crash_det_issue 
Crash detection/stop print erroneous movements hotfix
 2018-06-22 08:48:24 +02:00
PavelSindler
a83475bf7c whitespace 2018-06-21 22:18:10 +02:00
PavelSindler
7b81663883 crash detection/stop print erroneous movements hotfix 2018-06-21 22:16:45 +02:00
Robert Pelnar
603ed49001 New ML support - MK25 (without W25x20CL) 2018-06-21 20:57:22 +02:00
Robert Pelnar
79afb76839 New ML support - includes fixed 2018-06-21 19:58:13 +02:00
Robert Pelnar
5674208eda New ML support - removed menu + hardcoded W25x20CL 2018-06-21 19:17:41 +02:00
PavelSindler
ee1e8dfccc set default printer message when recovering from crash detection and at the end of mesh bed leveling 2018-06-20 17:58:31 +02:00
XPila
2be36f626f
Merge pull request #845 from PavelSindler/crash_movements 
crash detection fix for absolute E coordinates
 2018-06-19 18:46:39 +02:00
PavelSindler
650d8cc643
Merge pull request #844 from mkbel/add_farm_PRUSA_RESET 
Add PRUSA RESET command in farm mode.
 2018-06-19 18:44:00 +02:00
PavelSindler
88a19432b7 whitespace 2018-06-19 17:48:31 +02:00
PavelSindler
1e60390545 dont process data from serial line if print is saved (crash detection and filament detection) 2018-06-19 16:51:22 +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
PavelSindler
209209459d Merge remote-tracking branch 'upstream/MK3' into crash_movements 2018-06-18 18:29:12 +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
PavelSindler
ac1e089a7f crash detection fix for absolute E coordinates 2018-06-15 20:03:48 +02:00
Marek Bel
32165dedb0 Add PRUSA RESET command in farm mode. 2018-06-15 17:07:44 +02:00
Robert Pelnar
296f3ab23a New ML support - resized reserved space, skip optiboot durring sec_lang update process 2018-06-14 23:07:54 +02:00
Robert Pelnar
f162fce7a7 New ML support - fixed menu + resized reserved space 2018-06-14 22:46:01 +02:00
mkbel
9ba49affc6
Merge pull request #835 from PavelSindler/safety_timer_gcode 
Safety timer gcode
 2018-06-14 20:49:25 +02:00
PavelSindler
9fc9a70f22
Merge pull request #842 from XPila/MK3-new_lang 
New ML support - menu + es translation fixed
 2018-06-14 20:02:21 +02:00
PavelSindler
ed2f87f4f5 documentation updated 2018-06-14 17:29:40 +02:00
Robert Pelnar
9d31c8a4b3 New ML support - menu + es translation fixed 2018-06-14 15:34:40 +02:00
bubnikv
eef6c68c9f Added support for a secondary boot loader, based on the OptiBoot project, 
modified to update the external flash memory on Einsy boards.
Due to a bug in the USB to serial converter firmware on the Prusa Einsy
boards, the STK500 protocol has been modified to never send semicolon
characters towards the main processor.

This firmware updater is compatible with a modified avrdude using
the "arduino" protocol, see the following commit.
https://github.com/prusa3d/Slic3r/tree/fwupdater_languages
 2018-06-14 15:13:21 +02:00
PavelSindler
2026e7fe4d Revert changes in Timer class; disable safety timer in handleSafetyTimer function if safetytimer inactive time was set to zero 2018-06-14 13:14:14 +02:00
PavelSindler
2a219143fe Merge remote-tracking branch 'upstream/MK3' into safety_timer_gcode 2018-06-14 13:09:15 +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
PavelSindler
1077895fd4 Don't return "Not SD printing" in case that SD card print is paused 2018-06-13 18:22:58 +02:00
PavelSindler
75c6f0b937 variant files updated 2018-06-13 16:27:11 +02:00
PavelSindler
c1425aece3 gcode: set safety timer period 2018-06-13 16:22:06 +02:00
PavelSindler
3ca7c82e08 power panic: restore dir names 2018-06-12 19:45:59 +02:00
PavelSindler
3aa28c8c11
Merge pull request #833 from XPila/MK3-new_lang 
Mk3 new lang
 2018-06-12 19:11:35 +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
PavelSindler
73b0c65bda
Merge pull request #832 from mkbel/add_Timer_remaining 
Add timer remaining
 2018-06-12 07:57:11 +02:00
Marek Bel
d669b4e93a Fix off by one error in TimerRemaining::remaining(). Add test cases for Timer. 2018-06-12 02:24:52 +02:00
Marek Bel
490f0c9620 Store timer period in TimerRemaining. 2018-06-11 23:41:36 +02:00
Marek Bel
9772905ade Add TimerRemaining class. 2018-06-11 21:19:58 +02:00
PavelSindler
db9c82acef M600 communication timeout fix 2018-06-11 20:28:18 +02:00
XPila
d6ccaa7c08
Merge pull request #830 from PavelSindler/crash_det_cool_hotend 
Crash detection: set nozzle target temp to zero when waiting for user
 2018-06-11 15:43:54 +02:00
XPila
5178675cdd
Merge pull request #829 from PavelSindler/temp_cal_fix2 
Home XYZ: first move Z higher to protect steel sheet/heatbed
 2018-06-11 15:42:59 +02:00
PavelSindler
2f5bb80e98 crash detection: turn off nozzle when waiting for user 2018-06-11 15:34:16 +02:00
PavelSindler
d4106c2fe3 If homing all axes, move Z little bit higher before X and Y movements to protect steel sheet/heatbed 2018-06-11 11:13:49 +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
0f75bcb442 New ML support - flash usage optimalization 
used flash space 252826bytes (MK3 + ML support), free ~1kbyte
 2018-06-10 20:44:36 +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
a1ea5019dc Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-06-10 16:29:29 +02:00
Robert Pelnar
076258ff99 New ML support - cond.trans. for LANG_MODE 0 2018-06-10 16:28:15 +02:00
Robert Pelnar
1e35067c3f fixed variant files, removed bool constants 2018-06-10 16:13:29 +02:00
Robert Pelnar
4567d2feca removed unused cond. trans. for NEW_SPI 2018-06-10 16:11:39 +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
a9446cc6b3 New ML support - W25x20CL 2018-06-09 18:26:53 +02:00
Robert Pelnar
ebd8375313 New ML support - external flash W25X20CL - upgrade is working!!! (hardcoded to german) 
+print test (LT_PRINT_TEST)
 2018-06-09 17:49:41 +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
31357379ff
Merge branch 'MK3' into time_remaining 2018-06-08 18:31:32 +02:00
XPila
8963757c3c
Merge branch 'MK3' into crash_detection_stop 2018-06-08 18:28:43 +02:00
PavelSindler
5e120e6e52 power panic flow factor hotfix 2018-06-08 18:13:50 +02:00
PavelSindler
332a23bef5 Crash detection stops and waits for user if it fails multiple times in short time frame 2018-06-08 16:08:07 +02:00
Robert Pelnar
70bb851c62 New ML support - added missing file 2018-06-08 15:38:16 +02:00
XPila
739de5224e
Merge branch 'MK3' into MK3-new_lang 2018-06-08 14:38:00 +02:00
Robert Pelnar
e69fd05fce Optimized LiquidCrystal class 
removed dependecies to arduino Print and String classes
spared 522 bytes of flash and 84bytes of ram
 2018-06-08 14:35:47 +02:00
3d-gussner
c29042dead Fix warning: 
Another fix from PR https://github.com/prusa3d/Prusa-Firmware/pull/138 and discussed in Issue https://github.com/prusa3d/Prusa-Firmware/issues/807

Ardunio IDE 1.6.8 and 1.8.5 result with Compiler warnings set to "More" or "All"
´´´
sketch\mesh_bed_calibration.cpp: In function 'sample_mesh_and_store_reference':

sketch\mesh_bed_calibration.cpp:2852:53: warning: 'zmax' may be used uninitialized in this function [-Wmaybe-uninitialized]

                 zmax = min(zmax, mbl.z_values[j][i]);

                                                     ^

sketch\mesh_bed_calibration.cpp:2848:15: note: 'zmax' was declared here

         float zmax = zmax;

               ^

´´´
 2018-06-08 10:13:43 +02:00
3d-gussner
8f032ad122 Fix MK3 compilation issue with Arduino 1.8.x 
see https://github.com/prusa3d/Prusa-Firmware/issues/614#issuecomment-385034066
 2018-06-08 09:44:58 +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
PavelSindler
877f8f2a61
Merge pull request #795 from 3d-gussner/MK3_fix5 
Fix warning: This is kind of important
 2018-06-07 22:22:54 +02:00
PavelSindler
a15f0138de show estimated time to end of the print if available in gcode: initial version 2018-06-07 20:50:30 +02:00
PavelSindler
42cfcb2601
Merge pull request #794 from stahlfabrik/M860-enhanced 
Improved M860 - now wait for cooling of PINDA, too
 2018-06-06 12:01:06 +02:00
Marek Bel
eb1d17c3c6 Compile without c++11. 2018-06-05 21:55:54 +02:00
XPila
1290326210
Merge pull request #790 from PavelSindler/power_panic_flow_rate 
power panic: extruder_multipliers added
 2018-06-05 20:58:15 +02:00
XPila
6a8425f62d
Merge pull request #809 from mkbel/Use_Timer 
Use timer
 2018-06-05 20:54:41 +02:00
XPila
7f7f1e4560
Merge pull request #808 from zavorka/MK3 
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp
 2018-06-05 20:53:03 +02:00
PavelSindler
d49c4508a7 removing some debug code 2018-06-05 20:39:42 +02:00
PavelSindler
264daaf715 typo fixed 2018-06-05 20:33:05 +02:00
PavelSindler
aacaf67eaa Crash detection/filament sensor: restore print from stored line number in case that we are printing over USB, retraction fix; debug: cmd queue on LCD 2018-06-05 20:28:41 +02:00
Marek Bel
01af8a806b Merge branch 'MK3' into Use_Timer 2018-06-05 19:03:11 +02:00
Marek Bel
f819392d10 Do not create static object in function. Saves 8B RAM and 16B flash, because there is no need to guard constructor against concurrent calls. 2018-06-05 18:38:25 +02:00
Marek Bel
7cc8b743c2 Add .gitignore. Setup doxyfile. Create project documentation main page. Document property of static object constructors on gcc-avr. 2018-06-05 18:30:02 +02:00
Marek Bel
75f048ac4b Add default doxyfile. 2018-06-05 18:23:48 +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
PavelSindler
746ac17e4e debugging 2018-06-04 16:40:56 +02:00
Robert Pelnar
47c68c884c New ML support - fixed duplicate strings 2018-06-01 14:35:03 +02:00
Robert Pelnar
53d9d8bd8a New ML support - lang codes 
+script tunning
 2018-06-01 10:47:47 +02:00
3d-gussner
5004433b20 Fix warning: This is kind of important 
Again another fix from https://github.com/prusa3d/Prusa-Firmware/pull/138 made by @Thess for the MK2 branch which i think is quite important.

Ardunio IDE 1.8.5 result with Compiler warnings set to "More" or "All"
```
sketch\Marlin_main.cpp:3265:44: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

               if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover

                                            ^

sketch\Marlin_main.cpp:3265:82: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

               if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover

                                                                                  ^

sketch\Marlin_main.cpp:3268:28: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

                   retract(!retracted);

                            ^

sketch\Marlin_main.cpp:3870:15: warning: statement has no effect [-Wunused-value]
```

I don't know if that helps making small pull requests as they are easier to review or it would make sense to combine few more.

Prusa should really review this pull [request](https://github.com/prusa3d/Prusa-Firmware/pull/138) again for the MK3 branch, as it was one that made warnings disapear in the MK2 branch and made finding new flaws in the code much much easier.
 2018-06-01 10:17:03 +02:00
Robert Pelnar
5a2b056d47 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-06-01 00:43:16 +02:00
Christoph Stahl
7c4fce7876 whitespace correction 2018-05-31 18:55:14 +02:00
Christoph Stahl
73708ec883 Improved M860 - now wait for cooling of PINDA, too 
The M860 - wait for PINDA temperature - gcode has been improved. Until now it could only wait until the PINDA has been warmed up to a set temperature. Now it also can wait until the PINDA has cooled down to a set temperature. The calling syntax has not been changed at all. The logic now looks if the bed or hotend have a target temperature different from 0. If so, the code waits until PINDA has warmed up. Otherwise it waits until PINDA has cooled down.

Applications:
- Possibility to start a Print at exactly the right PINDA temperature. (Do not start the heater until PINDA is cooled down)
- Much easier manual temperature calibration (automating the wait for cool down in between calibration runs)
- Possibility for temp calibration verification on one heat bed by printing multiple objects with different PINDA temperatures one after the other
 2018-05-31 16:41:59 +02:00
XPila
957b3cfac5
Merge pull request #783 from 3d-gussner/MK3_fix1 
Fixed redefined warning
 2018-05-31 14:21:41 +02:00
XPila
d70d38bb0c
Merge pull request #784 from 3d-gussner/MK3_fix2 
Fixed unused variable c as in pull request #138
 2018-05-31 14:15:17 +02:00
XPila
80c641ae5d
Merge pull request #789 from 3d-gussner/MK3_fix4 
Fixed warning: invalid suffix on literal; C++11 requires a space betw…
 2018-05-31 14:09:49 +02:00
tarikku
731fef3d32 Fix remaining forgotten comments 2018-05-30 23:15:01 +02:00
Robert Pelnar
77f3160531 language.h - debug output conditional translation 2018-05-30 20:15:43 +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
PavelSindler
9104b0601a power panic: extruder_multipliers added 2018-05-30 18:59:33 +02:00
3d-gussner
eeca0f683b Fixed warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 2018-05-30 16:06:22 +02:00
PavelSindler
3bf47d7f83 "run xyz cal first" message 2018-05-30 15:29:59 +02:00
PavelSindler
dcb77e8c7e Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix 2018-05-30 15:22:20 +02:00
PavelSindler
987f8969c0 Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix 2018-05-30 15:20:40 +02:00
PavelSindler
72a382b34d fix in macro definition 2018-05-30 15:07:24 +02:00
PavelSindler
2561ab9c7d
Merge pull request #786 from XPila/MK3-new_lang 
Mk3 new lang
 2018-05-30 14:54:47 +02:00
Robert Pelnar
3e29312b41 fixed compilation (c++11) 2018-05-30 14:53:14 +02:00
3d-gussner
d8706be8de Fixed forgotten comment 2018-05-30 13:39:24 +02:00
3d-gussner
dce2d45499 Fixed forgotten comment 2018-05-30 13:35:48 +02:00
3d-gussner
2f9b63275f Fixed unused variable c as in pull request #138 2018-05-30 13:26:31 +02:00
3d-gussner
167bc61ef9 Fixed redefined warning 2018-05-30 12:57:51 +02:00
Robert Pelnar
4746c77195 New ML support - bootloader support and update proces test 2018-05-29 21:03:47 +02:00
Robert Pelnar
0ddb31d4eb Removed hexfile 2018-05-29 17:28:33 +02:00
Robert Pelnar
b47a29b388 New ML support - fixed invalid characters, added some cz translations 2018-05-29 15:56:00 +02:00
PavelSindler
d307868a90 merge with upstream 2018-05-28 20:38:55 +02:00
PavelSindler
26724c4a48 removed message 2018-05-28 20:31:57 +02:00
PavelSindler
7e79ce8e53 MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved 2018-05-28 20:26:15 +02:00
Robert Pelnar
b3f4e1f6e4 New ML support - language menu 2018-05-28 19:41:16 +02:00
Robert Pelnar
baa66a0887 New ML support - secondary language name, language selection 2018-05-28 17:14:55 +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
def9ab56f6 New ML support - language.c - fixed return origial string for zero length translation 2018-05-27 16:24:21 +02:00
Robert Pelnar
55157640c5 New ML support - czech version is working!!! 
postbuild.sh, make_lang.sh - fixed (id and offset calculation)
language.c, language.h - fixed (==||==)
config.h - reserved space for _SEC_LANG changed
Marlin_main.cpp - debug output + hardcoded lang_select(1) //means cz
 2018-05-27 15:14:04 +02:00
PavelSindler
2ffb95c72a bugfix: use absolute coordinates for steel sheet removal position, because there is no homing at the beginning of calibration in case that position is already known 2018-05-24 20:28:00 +02:00
PavelSindler
64f7272ea7 M27: returns print saved (fixes setting temperatures to zero during crash detection) 2018-05-24 18:49:35 +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
Robert Pelnar
da3432e237 New ML support - changed _SEC_LANG reserved space to 10kb, added debug code 2018-05-23 16:11:12 +02:00
Robert Pelnar
f00a9ce636 New ML support - language.c, language.h - code fixed, Marlin_main.cpp - debug output 2018-05-23 15:46:08 +02:00
Robert Pelnar
d979c3dffc New ML support - messages.c - some strings fixed 2018-05-23 14:18:37 +02:00
PavelSindler
0091b41fb5
Merge pull request #744 from PavelSindler/M860_fix 
M860 fix: send busy messages
 2018-05-23 13:15:46 +02:00
Robert Pelnar
7e3f675469 New ML support - migration - fixed some messages 
all variants verified according to lang_en.txt (release only)
config.h updated (enabled ML support)
 2018-05-22 20:30:55 +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
Robert Pelnar
8573b65b05 _MIN_ENDSTOP_INVERTING redefinition in variant files (constant -> define) 2018-05-21 23:28:28 +02:00
XPila
a184d2b824
Merge pull request #756 from XPila/MK3-new_lang 
Mk3 new lang
 2018-05-20 13:26:28 +02:00
Robert Pelnar
a528f8837c Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-05-20 13:24:52 +02:00
Robert Pelnar
5b015907aa New localization - macro declarations fixed 2018-05-20 13:15:46 +02:00
Robert Pelnar
9b7eeaecaa version changed 2018-05-18 14:42:35 +02:00
Marek Bel
503d5551e6 Fix build of MK2. Global variable distance_from_min was removed, do not update it. 
Expression
float y = vec_x[1] * pgm_read_float(bed_ref_points_4+mesh_point*2) + vec_y[1] * pgm_read_float(bed_ref_points_4+mesh_point*2+1) + cntr[1];
is identical with expression in count_xyz_details().
 2018-05-16 18:40:36 +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
PavelSindler
c59e9bd6be M860 fix: send busy messages 2018-05-15 18:27:25 +02:00
PavelSindler
553779a65d
Merge pull request #723 from mkbel/refactor_bed_geometry 
Refactor bed geometry
 2018-05-14 17:18:03 +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
PavelSindler
dd89226537
Merge pull request #722 from MRprusa3d/MK3 
build instructions update
 2018-05-10 14:44:55 +02:00
PavelSindler
2bfc7475a8 version changed 2018-05-09 18:58:24 +02:00
Marek Bel
2a5a7ab9d2 Add bed calibration points macro definitions to MK25 variants. 
Homing and full print area printing tested on MK25.
 2018-05-09 17:09:57 +02:00
Robert Pelnar
59f3f9d8ec New localization - includes fixed 2018-05-09 16:55:41 +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
f00bde09a4 Re-factor bed calibration point coordinates to match bed CAD data. Tested successfully on MK3 (auto home position not calibrated and calibrated printer and print area position of calibrated printer). MK25 not tested. 2018-05-08 21:54:11 +02:00
PavelSindler
737cb9608c
Merge pull request #716 from mkbel/calibrate_Z_via_live_adjust 
Set calibration status to calibrated also by using live adjust Z.
 2018-05-04 16:40:34 +02:00
Marek Bel
c359d11858 Do not disable bed heating, when the print is paused. 
Also remove duplicate handleSafetyTimer() call.
 2018-05-04 15:21:22 +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
777beac66a
Merge pull request #713 from PavelSindler/fan_error_fix 
fan error synchronization with planner
 2018-05-03 16:01:00 +02:00
PavelSindler
cd3851e175
Merge pull request #715 from MRprusa3d/MK3 
Mk3
 2018-05-03 14:54:43 +02:00
MRprusa3d
8a92d9b6a3 MaR::180501b 2018-05-02 23:49:21 +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
d86d1beeaa fan error synchronization with planner 2018-05-02 16:16:48 +02:00
XPila
3d595cc523
Merge pull request #712 from XPila/MK3-V3_2 
Mk3 v3 2
 2018-05-02 13:43:07 +02:00
Robert Pelnar
964d019dd1 MK3 - extruder current = 30 2018-05-02 13:42:05 +02:00
PavelSindler
420d1079af terminate temperature calibration in case that Z probing function returns false 2018-04-30 17:51:44 +02:00
PavelSindler
b691225d0b
Merge pull request #701 from XPila/MK3-V3_2 
Decreased stallguard sensitivity for Z axis because meshbedleveling f…
 2018-04-30 16:58:18 +02:00
Robert Pelnar
1fc3f9816c Merge remote-tracking branch 'upstream/MK3' into MK3-V3_2 2018-04-30 16:29:02 +02:00
Robert Pelnar
47868145e6 Decreased stallguard sensitivity for Z axis because meshbedleveling failed on some printers (PFW298). 2018-04-30 16:28:26 +02:00
PavelSindler
e2b3553aee
Merge pull request #689 from PavelSindler/MK3_for_merging 
version change
 2018-04-27 20:01:37 +02:00
PavelSindler
e1b95ed2a7 version change 2018-04-27 19:59:22 +02:00
PavelSindler
12dda6a6ca
Merge pull request #688 from PavelSindler/MK3_for_merging 
MK3 variants file change
 2018-04-27 18:41:49 +02:00
PavelSindler
068ee08454 MK3 variants file change 2018-04-27 18:41:00 +02:00
PavelSindler
2a57325bd5
Merge pull request #685 from mkbel/add_safety_timer_notice 
Show full screen blocking notification message after heater turned off
 2018-04-27 17:24:33 +02:00
PavelSindler
2b42db8ace
Merge pull request #687 from PavelSindler/MK3_for_merging 
M861: steps value for 35C
 2018-04-27 17:24:18 +02:00
PavelSindler
265d4761a3 M861: steps value for 35C 2018-04-27 17:07:10 +02:00
Robert Pelnar
e69134eb1c Rambo 1.0 support (MK25, MK2) 2018-04-27 17:04:55 +02:00
Marek Bel
eced66f0f6 Show full screen blocking notification message after heater turning off by safety timer. 2018-04-27 16:23:20 +02:00
PavelSindler
6fb0fa1458 variants for MK3: temporary change 2018-04-27 15:19:28 +02:00
PavelSindler
99be28d335 variants file: force selftest enabled again 2018-04-27 14:59:56 +02:00
PavelSindler
986f9fd3a6 selftest correction 2018-04-27 14:49:37 +02:00
PavelSindler
acd308e3d4 safety timer prolonged to 30 minutes 2018-04-27 14:03:09 +02:00
PavelSindler
ce855f30e2
Merge pull request #678 from PavelSindler/calibrate_autohome 
MK3 selftest: move Z axis higher before calibrating autohome
 2018-04-27 13:35:45 +02:00
PavelSindler
9e0e152279
Merge pull request #674 from mkbel/hot_fix_print_area_crop 
Hot fix print area crop on MK3.
 2018-04-27 13:35:31 +02:00
PavelSindler
254804cc8d MK3 selftest: move Z axis higher before calibrating autohome 2018-04-27 09:23:56 +02:00
Marek Bel
75075bed31 Hot fix print area crop on MK3. Move print area -2mm in Y axis (Y_PROBE_OFFSET_FROM_EXTRUDER to 3). Do not limit print area for skewed axis (increase Y_MAX_POS to 212.5). Preserve Z homing point for uncalibrated printer (DEFAULT_Y_OFFSET to 2.f). 2018-04-26 22:01:28 +02:00
XPila
aeca8cbf69
Merge pull request #671 from PavelSindler/temp_comp_unsigned 
M861 update: unsigned values
 2018-04-26 21:07:45 +02:00
PavelSindler
84d5771845
Merge pull request #670 from XPila/MK3-V3_2 
XYZcal - findpointcenter starting Z coordinate down by 50um
 2018-04-26 19:56:50 +02:00
PavelSindler
e7cf68e038 whitespace 2018-04-26 19:27:07 +02:00
PavelSindler
2dd0d84845 M861: usteps and z_shift variables correction 2018-04-26 19:14:28 +02:00
PavelSindler
9c3e0aab36 M861 update: use signed values 2018-04-26 18:55:08 +02:00
Robert Pelnar
d50dd9a6e9 XYZcal - findpointcenter starting Z coordinate down by 50um 2018-04-26 18:41: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
PavelSindler
2657d3febd MK25: SILENT_MODE_NORMAL changed to SILENT_MODE_POWER 2018-04-26 15:12:45 +02:00
PavelSindler
14cf4abb64
Merge pull request #668 from XPila/MK3-V3_2 
Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1)
 2018-04-26 14:53:49 +02:00
PavelSindler
84a53370d3 temporary change in MK3 variants file: disable forced selftest 2018-04-26 14:50:16 +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
PavelSindler
4681361883 correction in M27 message 2018-04-26 11:50:48 +02:00