Changeset 2301

Timestamp:

02/17/10 10:52:48 (5 months ago)

Author:

fma

Message:

Fixed goto initial position

Location:

trunk/papywizard/plugins

Files:

• gigaPanBotPlugins.py (modified) (1 diff)
• merlinOrionPlugins.py (modified) (1 diff)
• pixOrbPlugins.py (modified) (4 diffs)

trunk/papywizard/plugins/gigaPanBotPlugins.py

@@ -118 +118 @@
 
         # Only move if needed
-        if abs(pos - currentPos) > AXIS_ACCURACY:
+        if abs(pos - currentPos) > AXIS_ACCURACY or not useOffset:
             self._hardware.drive(pos)
 

trunk/papywizard/plugins/merlinOrionPlugins.py

@@ -182 +182 @@
 
         if useOffset:
+            Logger().debug("MerlinOrionAxis.drive(): offset=%.1f" % self._offset)
             pos += self._offset
 
         # Only move if needed
-        if abs(pos - currentPos) > AXIS_ACCURACY:
+        if abs(pos - currentPos) > AXIS_ACCURACY or not useOffset:
             self.__setPoint = pos
             self.__driveFlag = True # Start thread action

trunk/papywizard/plugins/pixOrbPlugins.py

@@ -164 +164 @@
     def read(self):
         position = self._hardware.read()
-        position -= self._offset
 
         # Reverse direction on yaw axis
@@ -170 +169 @@
             position *= -1
 
+        position -= self._offset
+
         return position
 
@@ -176 +177 @@
 
         currentPos = self.read()
-        if abs(position - currentPos) <= self._config['AXIS_ACCURACY']:
+        if abs(position - currentPos) <= self._config['AXIS_ACCURACY'] or not useOffset:
             return
 
@@ -189 +190 @@
 
         if self._config['AXIS_WITH_BREAK']:
-            self._releaseBreak()
+            self._hardware.releaseBreak()
         self._hardware.configure(self._config['SPEED_INDEX'])
         self._hardware.drive(position)