Commit Graph

1061 Commits

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