fix: replace int by long to avoid overflow
This commit is contained in:
parent
6832f350da
commit
d759521530
12
turret.cpp
12
turret.cpp
|
|
@ -41,8 +41,8 @@ Turret& Turret::init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
Turret& Turret::gotoHome() {
|
Turret& Turret::gotoHome() {
|
||||||
int xStop = 0;
|
long xStop = 0;
|
||||||
int yStop = 0;
|
long yStop = 0;
|
||||||
|
|
||||||
_stepperX.prepareMove(-1000000l);
|
_stepperX.prepareMove(-1000000l);
|
||||||
_stepperY.prepareMove(-1000000l);
|
_stepperY.prepareMove(-1000000l);
|
||||||
|
|
@ -98,8 +98,8 @@ Turret& Turret::calibrate() {
|
||||||
}
|
}
|
||||||
|
|
||||||
Turret& Turret::moveTo(double x, double y, double z, Unit unit) {
|
Turret& Turret::moveTo(double x, double y, double z, Unit unit) {
|
||||||
int stepX;
|
long stepX;
|
||||||
int stepY;
|
long stepY;
|
||||||
|
|
||||||
if (unit == Unit::MM) {
|
if (unit == Unit::MM) {
|
||||||
cartesianToPolar(stepX, stepY, _zeroX, _zeroY, x / 10.0, y / 10.0, z / 10.0);
|
cartesianToPolar(stepX, stepY, _zeroX, _zeroY, x / 10.0, y / 10.0, z / 10.0);
|
||||||
|
|
@ -147,8 +147,8 @@ Turret& Turret::moveTo(double x, double y, double z, Unit unit) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Turret& Turret::moveBy(double x, double y, double z, Unit unit) {
|
Turret& Turret::moveBy(double x, double y, double z, Unit unit) {
|
||||||
int zeroXStored = _zeroX;
|
long zeroXStored = _zeroX;
|
||||||
int zeroYStored = _zeroY;
|
long zeroYStored = _zeroY;
|
||||||
|
|
||||||
_zeroX += _stepperX.getPos();
|
_zeroX += _stepperX.getPos();
|
||||||
_zeroY += _stepperY.getPos();
|
_zeroY += _stepperY.getPos();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue