From 4395ec207ec7eabd48a0577a0457775c3f757d3a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 7 Aug 2018 17:32:27 +0200 Subject: [PATCH] Fix compiler warnings: sketch/xyzcal.cpp:111:10: warning: unused parameter 'nd' [-Wunused-parameter] sketch/xyzcal.cpp:111:10: warning: unused parameter 'dd' [-Wunused-parameter] --- Firmware/xyzcal.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 1551a69a0..e1142c1ed 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -108,11 +108,9 @@ uint16_t xyzcal_sm4_ac2 = (uint32_t)xyzcal_sm4_ac * 1024 / 10000; //float xyzcal_sm4_vm = 10000; #endif //SM4_ACCEL_TEST +#ifdef SM4_ACCEL_TEST uint16_t xyzcal_calc_delay(uint16_t nd, uint16_t dd) { - return xyzcal_sm4_delay; -#ifdef SM4_ACCEL_TEST - uint16_t del_us = 0; if (xyzcal_sm4_v & 0xf000) //>=4096 { @@ -138,9 +136,13 @@ uint16_t xyzcal_calc_delay(uint16_t nd, uint16_t dd) // return xyzcal_sm4_delay; // DBG(_n("xyzcal_calc_delay nd=%d dd=%d v=%d del_us=%d\n"), nd, dd, xyzcal_sm4_v, del_us); return 0; -#endif //SM4_ACCEL_TEST } - +#else //SM4_ACCEL_TEST +uint16_t xyzcal_calc_delay(uint16_t, uint16_t) +{ + return xyzcal_sm4_delay; +} +#endif //SM4_ACCEL_TEST bool xyzcal_lineXYZ_to(int16_t x, int16_t y, int16_t z, uint16_t delay_us, int8_t check_pinda) {