|
@@ -210,16 +210,16 @@ bool xyzcal_spiral8(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi
|
|
if (pad) ad = *pad;
|
|
if (pad) ad = *pad;
|
|
DBG(_n("xyzcal_spiral8 cx=%d cy=%d z0=%d dz=%d radius=%d ad=%d\n"), cx, cy, z0, dz, radius, ad);
|
|
DBG(_n("xyzcal_spiral8 cx=%d cy=%d z0=%d dz=%d radius=%d ad=%d\n"), cx, cy, z0, dz, radius, ad);
|
|
if (!ret && (ad < 720))
|
|
if (!ret && (ad < 720))
|
|
- if (ret = xyzcal_spiral2(cx, cy, z0 - 0*dz, dz, radius, 0, delay_us, check_pinda, &ad))
|
|
|
|
|
|
+ if ((ret = xyzcal_spiral2(cx, cy, z0 - 0*dz, dz, radius, 0, delay_us, check_pinda, &ad)) != 0)
|
|
ad += 0;
|
|
ad += 0;
|
|
if (!ret && (ad < 1440))
|
|
if (!ret && (ad < 1440))
|
|
- if (ret = xyzcal_spiral2(cx, cy, z0 - 1*dz, dz, -radius, 0, delay_us, check_pinda, &ad))
|
|
|
|
|
|
+ if ((ret = xyzcal_spiral2(cx, cy, z0 - 1*dz, dz, -radius, 0, delay_us, check_pinda, &ad)) != 0)
|
|
ad += 720;
|
|
ad += 720;
|
|
if (!ret && (ad < 2160))
|
|
if (!ret && (ad < 2160))
|
|
- if (ret = xyzcal_spiral2(cx, cy, z0 - 2*dz, dz, radius, 180, delay_us, check_pinda, &ad))
|
|
|
|
|
|
+ if ((ret = xyzcal_spiral2(cx, cy, z0 - 2*dz, dz, radius, 180, delay_us, check_pinda, &ad)) != 0)
|
|
ad += 1440;
|
|
ad += 1440;
|
|
if (!ret && (ad < 2880))
|
|
if (!ret && (ad < 2880))
|
|
- if (ret = xyzcal_spiral2(cx, cy, z0 - 3*dz, dz, -radius, 180, delay_us, check_pinda, &ad))
|
|
|
|
|
|
+ if ((ret = xyzcal_spiral2(cx, cy, z0 - 3*dz, dz, -radius, 180, delay_us, check_pinda, &ad)) != 0)
|
|
ad += 2160;
|
|
ad += 2160;
|
|
if (pad) *pad = ad;
|
|
if (pad) *pad = ad;
|
|
return ret;
|
|
return ret;
|