From 8e51b37d91418e565f2de5da883c9338e827796a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 1 Mar 2019 16:57:20 +0100 Subject: [PATCH 1/7] Suppress warning: unused parameter. --- Firmware/timer02.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 827299be..8309f940 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -157,12 +157,12 @@ void delay2(unsigned long ms) } } -void tone2(uint8_t _pin, unsigned int frequency/*, unsigned long duration*/) +void tone2(__attribute__((unused)) uint8_t _pin, __attribute__((unused)) unsigned int frequency/*, unsigned long duration*/) { PIN_SET(BEEPER); } -void noTone2(uint8_t _pin) +void noTone2(__attribute__((unused)) uint8_t _pin) { PIN_CLR(BEEPER); } From a964f996fa895cfb41274daa54555235efe58a55 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 1 Mar 2019 17:08:36 +0100 Subject: [PATCH 2/7] Fix compiler warning: variable 'kill_message' set but not used kill_message is unused since: Author: MRprusa3d Date: 4 months ago (11/2/2018 11:03:14 PM) Commit hash: 73794b56cf532cb4193a6c80082652351509677a MeshBed Leveling Fail Z-leveling after MeshBed leveling failing --- Firmware/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 68292d90..1fc5a169 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4461,7 +4461,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } #endif // SUPPORT_VERBOSITY int l_feedmultiply = setup_for_endstop_move(false); //save feedrate and feedmultiply, sets feedmultiply to 100 - const char *kill_message = NULL; + while (mesh_point != nMeasPoints * nMeasPoints) { // Get coords of a measuring point. uint8_t ix = mesh_point % nMeasPoints; // from 0 to MESH_NUM_X_POINTS - 1 @@ -4511,15 +4511,15 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) // Go down until endstop is hit const float Z_CALIBRATION_THRESHOLD = 1.f; if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - kill_message = _T(MSG_BED_LEVELING_FAILED_POINT_LOW); + //Bed leveling failed. Sensor didnt trigger. Debris on nozzle? break; } if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { - kill_message = _i("Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset.");////MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 + //Bed leveling failed. Sensor disconnected or cable broken. break; } if (has_z && fabs(z0 - current_position[Z_AXIS]) > Z_CALIBRATION_THRESHOLD) { //if we have data from z calibration, max. allowed difference is 1mm for each point - kill_message = _i("Bed leveling failed. Sensor triggered too high. Waiting for reset.");////MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 + //Bed leveling failed. Sensor triggered too high. break; } #ifdef SUPPORT_VERBOSITY From 4c2d4fcf773db0eda897e88c597546a5d1bfde13 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 1 Mar 2019 17:18:05 +0100 Subject: [PATCH 3/7] Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2f0cb785..d9b6677c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4035,7 +4035,6 @@ static void lcd_print_state(uint8_t state) static void lcd_show_sensors_state() { //0: N/A; 1: OFF; 2: ON - uint8_t chars = 0; uint8_t pinda_state = STATE_NA; uint8_t finda_state = STATE_NA; uint8_t idler_state = STATE_NA; From 57cf7ee171fb7f1bc8471c3a7f6fc64c42d21c65 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 1 Mar 2019 17:21:13 +0100 Subject: [PATCH 4/7] Fix compiler warning: 'lcd_selftest_fsensor' defined but not used --- Firmware/ultralcd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d9b6677c..c54a7af9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -186,7 +186,9 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite); #ifdef FANCHECK static bool lcd_selftest_fan_dialog(int _fan); #endif //FANCHECK +#ifdef PAT9125 static bool lcd_selftest_fsensor(); +#endif //PAT9125 static bool selftest_irsensor(); static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2); static void lcd_colorprint_change(); @@ -7494,6 +7496,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * } #ifdef FILAMENT_SENSOR +#ifdef PAT9125 static bool lcd_selftest_fsensor(void) { fsensor_init(); @@ -7503,6 +7506,7 @@ static bool lcd_selftest_fsensor(void) } return (!fsensor_not_responding); } +#endif //PAT9125 //! @brief Self-test of infrared barrier filament sensor mounted on MK3S with MMUv2 printer //! From 824d11e4b0432b6900f40e4dfdf9bb88d2b4c867 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 1 Mar 2019 17:43:28 +0100 Subject: [PATCH 5/7] Remove "Press the knob to eject filament" message, as it is never shown. --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c54a7af9..2024bb02 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2344,7 +2344,6 @@ switch(eFilamentAction) lcd_puts_P(_i("to unload filament")); ////MSG_ c=20 r=1 break; case e_FILAMENT_ACTION_mmuEject: - lcd_puts_P(_i("to eject filament")); ////MSG_ c=20 r=1 break; } if(lcd_clicked()) From 83e07b5cdf4dd8ea705fe4a882ab31c9029b058a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 1 Mar 2019 18:07:19 +0100 Subject: [PATCH 6/7] Fix compiler warnings: sketch/ultralcd.cpp: In function 'void mFilamentPrompt()': sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)': sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] --- Firmware/ultralcd.cpp | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2024bb02..9fd7d652 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2344,6 +2344,8 @@ switch(eFilamentAction) lcd_puts_P(_i("to unload filament")); ////MSG_ c=20 r=1 break; case e_FILAMENT_ACTION_mmuEject: + case e_FILAMENT_ACTION_mmuCut: + case e_FILAMENT_ACTION_none: break; } if(lcd_clicked()) @@ -2357,38 +2359,23 @@ if(lcd_clicked()) menu_back(nLevel); switch(eFilamentAction) { - case e_FILAMENT_ACTION_Load: case e_FILAMENT_ACTION_autoLoad: + eFilamentAction=e_FILAMENT_ACTION_none; // i.e. non-autoLoad + // no break + case e_FILAMENT_ACTION_Load: loading_flag=true; enquecommand_P(PSTR("M701")); // load filament break; case e_FILAMENT_ACTION_unLoad: enquecommand_P(PSTR("M702")); // unload filament break; -/* case e_FILAMENT_ACTION_mmuLoad: -//./ MYSERIAL.println("mFilamentPrompt - mmuLoad"); - bFilamentAction=true; - menu_submenu(mmu_load_to_nozzle_menu); - break; -*/ -/* case e_FILAMENT_ACTION_mmuUnLoad: -//./ MYSERIAL.println("mFilamentPrompt - mmuUnLoad"); - bFilamentAction=true; - extr_unload(); - break; -*/ -/* case e_FILAMENT_ACTION_mmuEject: - MYSERIAL.println("mFilamentPrompt - mmuEject"); - bFilamentAction=true; -// menu_submenu(mmu_fil_eject_menu); + case e_FILAMENT_ACTION_mmuCut: + case e_FILAMENT_ACTION_none: break; -*/ } - if(eFilamentAction==e_FILAMENT_ACTION_autoLoad) - eFilamentAction=e_FILAMENT_ACTION_none; // i.e. non-autoLoad } } From 8812d405462258fe27bd262b7901b8fbebfe68d8 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 4 Mar 2019 15:05:14 +0100 Subject: [PATCH 7/7] Revert "Fix compiler warning: variable 'kill_message' set but not used" This reverts commit a964f996fa895cfb41274daa54555235efe58a55. --- Firmware/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1fc5a169..68292d90 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4461,7 +4461,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } #endif // SUPPORT_VERBOSITY int l_feedmultiply = setup_for_endstop_move(false); //save feedrate and feedmultiply, sets feedmultiply to 100 - + const char *kill_message = NULL; while (mesh_point != nMeasPoints * nMeasPoints) { // Get coords of a measuring point. uint8_t ix = mesh_point % nMeasPoints; // from 0 to MESH_NUM_X_POINTS - 1 @@ -4511,15 +4511,15 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) // Go down until endstop is hit const float Z_CALIBRATION_THRESHOLD = 1.f; if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - //Bed leveling failed. Sensor didnt trigger. Debris on nozzle? + kill_message = _T(MSG_BED_LEVELING_FAILED_POINT_LOW); break; } if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { - //Bed leveling failed. Sensor disconnected or cable broken. + kill_message = _i("Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset.");////MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 break; } if (has_z && fabs(z0 - current_position[Z_AXIS]) > Z_CALIBRATION_THRESHOLD) { //if we have data from z calibration, max. allowed difference is 1mm for each point - //Bed leveling failed. Sensor triggered too high. + kill_message = _i("Bed leveling failed. Sensor triggered too high. Waiting for reset.");////MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 break; } #ifdef SUPPORT_VERBOSITY