From ebfd4b2f4712b4e1be6e094fe86fe294f559fc36 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 5 Mar 2019 17:02:57 +0100 Subject: [PATCH] Fix compiler warning: unused parameter 'calib' --- Firmware/Marlin.h | 2 -- Firmware/Marlin_main.cpp | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index df64338df..9706cfbb9 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -483,8 +483,6 @@ void force_high_power_mode(bool start_high_power_section); #endif //TMC2130 // G-codes -void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, long home_y_value, bool home_z_axis, long home_z_value, bool calib, bool without_mbl); -void gcode_G28(bool home_x_axis, bool home_y_axis, bool home_z_axis); bool gcode_M45(bool onlyZ, int8_t verbosity_level); void gcode_M114(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 671afe21f..73e5aa610 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2439,11 +2439,12 @@ void force_high_power_mode(bool start_high_power_section) { } #endif //TMC2130 -void gcode_G28(bool home_x_axis, bool home_y_axis, bool home_z_axis) { - gcode_G28(home_x_axis, 0, home_y_axis, 0, home_z_axis, 0, false, true); -} - -void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, long home_y_value, bool home_z_axis, long home_z_value, bool calib, bool without_mbl) { +#ifdef TMC2130 +static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, long home_y_value, bool home_z_axis, long home_z_value, bool calib, bool without_mbl) +#else +static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, long home_y_value, bool home_z_axis, long home_z_value, bool without_mbl) +#endif //TMC2130 +{ st_synchronize(); #if 0 @@ -2728,6 +2729,15 @@ void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, long home_ #endif } +static void gcode_G28(bool home_x_axis, bool home_y_axis, bool home_z_axis) +{ +#ifdef TMC2130 + gcode_G28(home_x_axis, 0, home_y_axis, 0, home_z_axis, 0, false, true); +#else + gcode_G28(home_x_axis, 0, home_y_axis, 0, home_z_axis, 0, true); +#endif //TMC2130 +} + void adjust_bed_reset() { eeprom_update_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID, 1); @@ -3834,8 +3844,12 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) home_z_value = code_value_long(); bool without_mbl = code_seen('W'); // calibrate? +#ifdef TMC2130 bool calib = code_seen('C'); gcode_G28(home_x, home_x_value, home_y, home_y_value, home_z, home_z_value, calib, without_mbl); +#else + gcode_G28(home_x, home_x_value, home_y, home_y_value, home_z, home_z_value, without_mbl); +#endif //TMC2130 if ((home_x || home_y || without_mbl || home_z) == false) { // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands.