Skip to content
This repository was archived by the owner on Dec 22, 2022. It is now read-only.

Commit 272e8fb

Browse files
committed
fixed issue with GY-521 reading interpreted incorrectly for front arm by the driver
1 parent 339ddf3 commit 272e8fb

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

application/python/DobotSDK.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def _initializeAccelerometers(self):
115115
foreAngle = self._driver.accelToRadians(accelForeX, accelOffsets[1])
116116
else:
117117
rearAngle = math.pi / 2.0 - self._driver.accel3DXToRadians(accelRearX, accelRearY, accelRearZ)
118-
foreAngle = self._driver.accel3DXToRadians(accelForeX, accelForeY, accelForeZ)
118+
foreAngle = -self._driver.accel3DXToRadians(accelForeX, accelForeY, accelForeZ)
119119
self._baseSteps = long(0)
120120
self._rearSteps = long((rearAngle / math.pi / 2.0) * rearArmActualStepsPerRevolution + 0.5)
121121
self._foreSteps = long((foreAngle / math.pi / 2.0) * foreArmActualStepsPerRevolution + 0.5)

application/python/calibration-tool.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def toEndEffectorHeight(rear, fore):
5454
ret[1], ret[4]))
5555
else:
5656
print("Rear arm: {0:6.2f} | Forearm: {1:6.2f} | End effector height: {2:7.2f} | Raw rear arm: {3:6d} {4:6d} {5:6d} | Raw forearm: {6:6d} {7:6d} {8:6d}".format(\
57-
driver.accel3DXToAngle(ret[1], ret[2], ret[3]), driver.accel3DXToAngle(ret[4], ret[5], ret[6]),\
58-
toEndEffectorHeight(driver.accel3DXToRadians(ret[1], ret[2], ret[3]), driver.accel3DXToRadians(ret[4], ret[5], ret[6])),\
57+
driver.accel3DXToAngle(ret[1], ret[2], ret[3]), -driver.accel3DXToAngle(ret[4], ret[5], ret[6]),\
58+
toEndEffectorHeight(driver.accel3DXToRadians(ret[1], ret[2], ret[3]), -driver.accel3DXToRadians(ret[4], ret[5], ret[6])),\
5959
ret[1], ret[2], ret[3], ret[4], ret[5], ret[6]))
6060
else:
6161
print('Error occurred reading data')

firmware/src/ramps/ramps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ RAMPS version routines.
5858
#define Z_ENABLE_PORT PORTA
5959
#define Z_ENABLE_DDR DDRA
6060

61+
#define ACCEL_SWITCH_PIN PORTA1
6162
#define ACCEL_SWITCH_PORT PORTA
6263
#define ACCEL_SWITCH_PORTIN PINA
63-
#define ACCEL_SWITCH_PIN PORTA1
6464

6565
#define LASER_PIN PORTB4
6666
#define LASER_PORT PORTB

0 commit comments

Comments
 (0)