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

Commit

Permalink
fixed issue with GY-521 reading interpreted incorrectly for front arm…
Browse files Browse the repository at this point in the history
… by the driver
  • Loading branch information
maxosprojects committed May 29, 2016
1 parent 339ddf3 commit 272e8fb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion application/python/DobotSDK.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def _initializeAccelerometers(self):
foreAngle = self._driver.accelToRadians(accelForeX, accelOffsets[1])
else:
rearAngle = math.pi / 2.0 - self._driver.accel3DXToRadians(accelRearX, accelRearY, accelRearZ)
foreAngle = self._driver.accel3DXToRadians(accelForeX, accelForeY, accelForeZ)
foreAngle = -self._driver.accel3DXToRadians(accelForeX, accelForeY, accelForeZ)
self._baseSteps = long(0)
self._rearSteps = long((rearAngle / math.pi / 2.0) * rearArmActualStepsPerRevolution + 0.5)
self._foreSteps = long((foreAngle / math.pi / 2.0) * foreArmActualStepsPerRevolution + 0.5)
Expand Down
4 changes: 2 additions & 2 deletions application/python/calibration-tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ def toEndEffectorHeight(rear, fore):
ret[1], ret[4]))
else:
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(\
driver.accel3DXToAngle(ret[1], ret[2], ret[3]), driver.accel3DXToAngle(ret[4], ret[5], ret[6]),\
toEndEffectorHeight(driver.accel3DXToRadians(ret[1], ret[2], ret[3]), driver.accel3DXToRadians(ret[4], ret[5], ret[6])),\
driver.accel3DXToAngle(ret[1], ret[2], ret[3]), -driver.accel3DXToAngle(ret[4], ret[5], ret[6]),\
toEndEffectorHeight(driver.accel3DXToRadians(ret[1], ret[2], ret[3]), -driver.accel3DXToRadians(ret[4], ret[5], ret[6])),\
ret[1], ret[2], ret[3], ret[4], ret[5], ret[6]))
else:
print('Error occurred reading data')
2 changes: 1 addition & 1 deletion firmware/src/ramps/ramps.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ RAMPS version routines.
#define Z_ENABLE_PORT PORTA
#define Z_ENABLE_DDR DDRA

#define ACCEL_SWITCH_PIN PORTA1
#define ACCEL_SWITCH_PORT PORTA
#define ACCEL_SWITCH_PORTIN PINA
#define ACCEL_SWITCH_PIN PORTA1

#define LASER_PIN PORTB4
#define LASER_PORT PORTB
Expand Down

0 comments on commit 272e8fb

Please sign in to comment.