From fd3e0115b6ea58abc5a0dcdf8a5683ceb46e39f2 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 15:20:03 +0200 Subject: [PATCH 01/18] 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. --- Firmware/ultralcd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 068624167..cfbd31425 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6544,8 +6544,7 @@ bool lcd_selftest() } lcd_reset_alert_level(); enquecommand_P(PSTR("M84")); - lcd_clear(); - lcd_next_update_millis = millis() + LCD_UPDATE_INTERVAL; + lcd_update_enable(true); if (_result) { @@ -7255,7 +7254,7 @@ static bool lcd_selftest_fan_dialog(int _fan) static int lcd_selftest_screen(int _step, int _progress, int _progress_scale, bool _clear, int _delay) { - lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000); + lcd_update_enable(false); int _step_block = 0; const char *_indicator = (_progress > _progress_scale) ? "-" : "|"; From 0bde84983b5b10aa28b0d4ad4ecd8ab3ca84d960 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 15:47:39 +0200 Subject: [PATCH 02/18] Fix compiler warning sketch/Marlin_main.cpp:798:6: warning: unused variable 'cursor_pos' [-Wunused-variable] --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 604823b1a..6d8d3fc2e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -795,7 +795,6 @@ int er_progress = 0; void factory_reset(char level, bool quiet) { lcd_clear(); - int cursor_pos = 0; switch (level) { // Level 0: Language reset From 3811e30df985302d28de0ca3e400d2980dd48638 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 16:04:19 +0200 Subject: [PATCH 03/18] Fix compiler warning: sketch/Marlin_main.cpp:1042:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6d8d3fc2e..745ce9fcc 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1039,7 +1039,7 @@ uint8_t check_printer_version() void erase_eeprom_section(uint16_t offset, uint16_t bytes) { - for (int i = offset; i < (offset+bytes); i++) eeprom_write_byte((uint8_t*)i, 0xFF); + for (unsigned int i = offset; i < (offset+bytes); i++) eeprom_write_byte((uint8_t*)i, 0xFF); } #ifdef BOOTAPP From 5ceece08f8deecefce7340682b62864f4614e4b5 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 16:07:28 +0200 Subject: [PATCH 04/18] Fix compiler warning sketch/Marlin_main.cpp:1072:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if ((state * LANGBOOT_BLOCKSIZE) < header.size) --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 745ce9fcc..c428eab30 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1052,7 +1052,7 @@ void erase_eeprom_section(uint16_t offset, uint16_t bytes) // language update from external flash -#define LANGBOOT_BLOCKSIZE 0x1000 +#define LANGBOOT_BLOCKSIZE 0x1000u #define LANGBOOT_RAMBUFFER 0x0800 void update_sec_lang_from_external_flash() From 219b98b7e1627ceb5b963682221e71fcd04a9363 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 16:25:10 +0200 Subject: [PATCH 05/18] Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void setup()': sketch/Marlin_main.cpp:1478:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == 0xFFFF)) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode ^ sketch/Marlin_main.cpp:1479:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (farm_no == 0xFFFF) farm_no = 0; ^ --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c428eab30..b5e717625 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1475,8 +1475,8 @@ void setup() #endif farm_mode = eeprom_read_byte((uint8_t*)EEPROM_FARM_MODE); EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no); - if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == 0xFFFF)) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode - if (farm_no == 0xFFFF) farm_no = 0; + if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == static_cast(0xFFFF))) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode + if (farm_no == static_cast(0xFFFF)) farm_no = 0; if (farm_mode) { prusa_statistics(8); From 9edb07afa5ffd212573e54d64e5ce9f21dbe0beb Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 16:54:12 +0200 Subject: [PATCH 06/18] Fix compiler warning sketch/Marlin_main.cpp:4218:10: warning: variable 'verbosity_level' set but not used [-Wunused-but-set-variable] --- Firmware/Marlin_main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b5e717625..995369484 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4215,14 +4215,16 @@ void process_commands() case_G80: { mesh_bed_leveling_flag = true; - int8_t verbosity_level = 0; - static bool run = false; + static bool run = false; +#ifdef SUPPORT_VERBOSITY + int8_t verbosity_level = 0; if (code_seen('V')) { // Just 'V' without a number counts as V1. char c = strchr_pointer[1]; verbosity_level = (c == ' ' || c == '\t' || c == 0) ? 1 : code_value_short(); } +#endif //SUPPORT_VERBOSITY // Firstly check if we know where we are if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])) { // We don't know where we are! HOME! From 8575645eec6854b0ea4da331c9d04fafd0aea401 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 16:56:56 +0200 Subject: [PATCH 07/18] Fix compiler warning: sketch/Marlin_main.cpp:4193:15: warning: statement has no effect [-Wunused-value] fan_speed[1]; --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 995369484..b2d2dc8a9 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4190,7 +4190,6 @@ void process_commands() delay_keep_alive(100); } - fan_speed[1]; printf_P(_N("%d: %d\n"), i, fan_speed[1]); } }break; From 97ec55b95186e3a4ab72f7999a4650d3ce6bd004 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 17:07:21 +0200 Subject: [PATCH 08/18] Fix compiler warning sketch/Marlin_main.cpp:4307:7: warning: unused variable 'Z_PROBE_FEEDRATE' [-Wunused-variable]. This variable was unused even in "Initial commit". --- Firmware/Marlin_main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b2d2dc8a9..20281bed3 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4304,7 +4304,6 @@ void process_commands() int iy = 0; int XY_AXIS_FEEDRATE = homing_feedrate[X_AXIS] / 20; - int Z_PROBE_FEEDRATE = homing_feedrate[Z_AXIS] / 60; int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40; bool has_z = is_bed_z_jitter_data_valid(); //checks if we have data from Z calibration (offsets of the Z heiths of the 8 calibration points from the first point) #ifdef SUPPORT_VERBOSITY @@ -8030,7 +8029,6 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 60, active_extruder); int XY_AXIS_FEEDRATE = homing_feedrate[X_AXIS] / 20; - int Z_PROBE_FEEDRATE = homing_feedrate[Z_AXIS] / 60; int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40; setup_for_endstop_move(false); From 3a532a46bb7ba38e03f07f56fe13f63c7c60a8fa Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 17:17:44 +0200 Subject: [PATCH 09/18] Fix compiler warning sketch/Marlin_main.cpp:5737:15: warning: unused variable 'area' [-Wunused-variable] This variable was unused even in "Initial commit". --- Firmware/Marlin_main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 20281bed3..b0ac35d1b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5733,8 +5733,6 @@ Sigma_Exit: break; } } - - float area = .0; if(code_seen('D')) { float diameter = (float)code_value(); if (diameter == 0.0) { From d5ab657cdf9312661ce578992ee77bc3067b2702 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 17:22:29 +0200 Subject: [PATCH 10/18] Fix compiler warnings: file included from sketch/Configuration_prusa.h:2:0, from sketch/Configuration.h:43, from sketch/Marlin.h:22, from sketch/Marlin_main.cpp:46: sketch/Marlin_main.cpp: In function 'void process_commands()': sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:106:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] #define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2 ^ sketch/Marlin_main.cpp:5772:16: note: in expansion of macro 'NORMAL_MAX_ACCEL_XY' if (val > NORMAL_MAX_ACCEL_XY) ^ sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:102:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] #define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2 ^ sketch/Marlin_main.cpp:5774:23: note: in expansion of macro 'SILENT_MAX_ACCEL_XY' if (val_silent > SILENT_MAX_ACCEL_XY) --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b0ac35d1b..6675bb2cf 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5764,9 +5764,9 @@ Sigma_Exit: { if (code_seen(axis_codes[i])) { - int val = code_value(); + unsigned long val = code_value(); #ifdef TMC2130 - int val_silent = val; + unsigned long val_silent = val; if ((i == X_AXIS) || (i == Y_AXIS)) { if (val > NORMAL_MAX_ACCEL_XY) From b44f71fd33246522fec88391f1634e17294b9994 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 17:30:37 +0200 Subject: [PATCH 11/18] Fix compiler warning sketch/Marlin_main.cpp:6267:16: warning: variable 'TooLowZ' set but not used [-Wunused-but-set-variable] int8_t TooLowZ = 0; This variable was unused even in "Initial commit". --- Firmware/Marlin_main.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6675bb2cf..c77c9f970 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6264,7 +6264,6 @@ Sigma_Exit: } feedmultiplyBckp=feedmultiply; - int8_t TooLowZ = 0; float HotendTempBckp = degTargetHotend(active_extruder); int fanSpeedBckp = fanSpeed; @@ -6297,9 +6296,6 @@ Sigma_Exit: current_position[Z_AXIS]+= FILAMENTCHANGE_ZADD ; if(current_position[Z_AXIS] < 10){ current_position[Z_AXIS]+= 10 ; - TooLowZ = 1; - }else{ - TooLowZ = 0; } #endif From 68a3ae5456a457c1add0f0d0d964113958c614f4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 17:57:26 +0200 Subject: [PATCH 12/18] Fix compiler warning sketch/Marlin_main.cpp:6331:11: warning: unused variable 'cnt' [-Wunused-variable] --- Firmware/Marlin_main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c77c9f970..33d3f822d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6328,7 +6328,6 @@ Sigma_Exit: st_synchronize(); KEEPALIVE_STATE(PAUSED_FOR_USER); - uint8_t cnt = 0; int counterBeep = 0; fanSpeed = 0; unsigned long waiting_start_time = millis(); @@ -6338,7 +6337,6 @@ Sigma_Exit: bool bFirst=true; while (!(wait_for_user_state == 0 && lcd_clicked())){ - //cnt++; manage_heater(); manage_inactivity(true); From f7754faaf14d2856f6aba2694b28e69d4e3f566d Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 18:06:38 +0200 Subject: [PATCH 13/18] Fix compiler warning sketch/Marlin_main.cpp:7092:14: warning: variable 'make_move' set but not used [-Wunused-but-set-variable] --- Firmware/Marlin_main.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 33d3f822d..f34431599 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7089,9 +7089,13 @@ while (!lcd_clicked() && (counterBeep < 50)) { SERIAL_ECHOLNRPGM(_n("Invalid extruder"));////MSG_INVALID_EXTRUDER c=0 r=0 } else { - boolean make_move = false; +#if EXTRUDERS > 1 + boolean make_move = false; +#endif if (code_seen('F')) { +#if EXTRUDERS > 1 make_move = true; +#endif next_feedrate = code_value(); if (next_feedrate > 0.0) { feedrate = next_feedrate; From 3f0684ea3001efb9b639eb5f3e1703e2c2a57249 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 18:27:05 +0200 Subject: [PATCH 14/18] Fix compiler warning - remove unused variable. --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f34431599..a16c0362d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8191,7 +8191,6 @@ void temp_compensation_start() { void temp_compensation_apply() { int i_add; - int compensation_value; int z_shift = 0; float z_shift_mm; From c19bf72ba9fbab1375d85b8bed4ec7fe620f7f41 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 18:33:44 +0200 Subject: [PATCH 15/18] Fix compiler warning sketch/Marlin_main.cpp:8220:15: warning: unused variable 'k' [-Wunused-variable]. --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a16c0362d..17b5d206c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8217,7 +8217,7 @@ float temp_comp_interpolation(float inp_temperature) { //cubic spline interpolation - int n, i, j, k; + int n, i, j; float h[10], a, b, c, d, sum, s[10] = { 0 }, x[10], F[10], f[10], m[10][10] = { 0 }, temp; int shift[10]; int temp_C[10]; From bd868132cce6067ba1233e944036bf6fda6d7985 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 19:31:18 +0200 Subject: [PATCH 16/18] Fix compiler warnings: sketch/Marlin_main.cpp:8756:8: warning: unused variable 'x_rec' [-Wunused-variable] sketch/Marlin_main.cpp:8756:15: warning: unused variable 'y_rec' [-Wunused-variable] sketch/Marlin_main.cpp:8756:22: warning: unused variable 'z_pos' [-Wunused-variable] --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 17b5d206c..2d0caf0d6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8753,7 +8753,6 @@ void recover_machine_state_after_power_panic(bool bTiny) } void restore_print_from_eeprom() { - float x_rec, y_rec, z_pos; int feedrate_rec; uint8_t fan_speed_rec; char cmd[30]; From 0f577cace6a7f2b412cbbe7d01cc04c2686e2b59 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 24 Jul 2018 19:40:43 +0200 Subject: [PATCH 17/18] Fix compiler warning: sketch/Marlin_main.cpp:8759:8: warning: unused variable 'c' [-Wunused-variable] --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2d0caf0d6..2a4ce2663 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8756,7 +8756,6 @@ void restore_print_from_eeprom() { int feedrate_rec; uint8_t fan_speed_rec; char cmd[30]; - char* c; char filename[13]; uint8_t depth = 0; char dir_name[9]; From c7de8a91bb1f0b56b92b4d6125ee6dbd9306912e Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 25 Jul 2018 11:33:32 +0200 Subject: [PATCH 18/18] Fix compiler warning sketch/Marlin_main.cpp:8811:10: warning: unused variable 'extruder_abs_pos' [-Wunused-variable] Variable started to be unused in commit fde0efc75c5202800a80702d8ac4f9d6c36ac0ac power panic for absolute E coordinates: initial version and its author told me that the change was intentional. --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2a4ce2663..5670023fb 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8808,7 +8808,6 @@ void restore_print_from_eeprom() { enquecommand(cmd); if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { - float extruder_abs_pos = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); enquecommand_P(PSTR("M82")); //E axis abslute mode } // Set the fan speed saved at the power panic.