Changeset 33 for rc

Timestamp:

02/06/10 05:32:01 (12 years ago)

Author:

sc

Message:

rc:

• turn_left_in_reverse and turn_right_in_reverse driving swapped

emokey:

• updated bindings

Location:

rc

Files:

• emokey/puzzlebox_brainstorms.ekm (modified) (1 diff)
• puzzlebox_brainstorms_rc.py (modified) (4 diffs)

rc/emokey/puzzlebox_brainstorms.ekm

@@ -1 @@
-<EmoMappingModel mappingName="puzzlebox_brainstorms2.ekm" >
-    <EmoMapping enabled="1" name="drive_forward" keys="w" sendOnce="1" sendToFocus="0" targetApp="Puzzlebox Brainstorms - Client Interface" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="0" holdTime="20" triggerDelayTime="20" player="0">
-        <EmoStateCondition>
-            <enabled value="1" />
-            <action value="18" />
-            <threshold type="double" value="0" />
-            <actionRule value="2" />
-        </EmoStateCondition>
+<EmoMappingModel mappingName="puzzlebox_brainstorms.ekm" >
+    <EmoMapping enabled="1" name="drive_forward" keys="w" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="20" triggerDelayTime="20" player="0">
         <EmoStateCondition>
             <enabled value="1" />
             <action value="20" />
-            <threshold type="double" value="0" />
+            <threshold type="double" value="0.6" />
             <actionRule value="2" />
         </EmoStateCondition>
     </EmoMapping>
-    <EmoMapping enabled="1" name="turn_left" keys="a" sendOnce="1" sendToFocus="0" targetApp="Puzzlebox Brainstorms - Client Interface" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="0" holdTime="20" triggerDelayTime="20" player="0">
+    <EmoMapping enabled="1" name="drive_left" keys="a" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="20" triggerDelayTime="20" player="0">
         <EmoStateCondition>
             <enabled value="1" />
             <action value="22" />
-            <threshold type="double" value="0" />
+            <threshold type="double" value="0.6" />
             <actionRule value="2" />
         </EmoStateCondition>
     </EmoMapping>
-    <EmoMapping enabled="1" name="turn_right" keys="d" sendOnce="1" sendToFocus="0" targetApp="Puzzlebox Brainstorms - Client Interface" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="0" holdTime="20" triggerDelayTime="20" player="0">
+    <EmoMapping enabled="1" name="drive_reverse" keys="s" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="20" triggerDelayTime="20" player="0">
+        <EmoStateCondition>
+            <enabled value="1" />
+            <action value="21" />
+            <threshold type="double" value="0.6" />
+            <actionRule value="2" />
+        </EmoStateCondition>
+    </EmoMapping>
+    <EmoMapping enabled="1" name="drive_right" keys="d" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="20" triggerDelayTime="20" player="0">
         <EmoStateCondition>
             <enabled value="1" />
             <action value="23" />
-            <threshold type="double" value="0" />
+            <threshold type="double" value="0.6" />
             <actionRule value="2" />
         </EmoStateCondition>
     </EmoMapping>
-    <EmoMapping enabled="1" name="drive_reverse" keys="s" sendOnce="1" sendToFocus="0" targetApp="Puzzlebox Brainstorms - Client Interface" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="0" holdTime="20" triggerDelayTime="20" player="0">
-        <EmoStateCondition>
-            <enabled value="1" />
-            <action value="21" />
-            <threshold type="double" value="0" />
-            <actionRule value="2" />
-        </EmoStateCondition>
-    </EmoMapping>
-    <EmoMapping enabled="1" name="turn_left_in_reverse" keys="z" sendOnce="1" sendToFocus="0" targetApp="Puzzlebox Brainstorms - Client Interface" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="0" holdTime="20" triggerDelayTime="20" player="0">
-    </EmoMapping>
-    <EmoMapping enabled="1" name="turn_right_in_reverse" keys="c" sendOnce="1" sendToFocus="0" targetApp="Puzzlebox Brainstorms - Client Interface" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="0" holdTime="20" triggerDelayTime="20" player="0">
+    <EmoMapping enabled="1" name="turn_in_reverse" keys="c" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="20" triggerDelayTime="20" player="0">
         <EmoStateCondition>
             <enabled value="1" />

rc/puzzlebox_brainstorms_rc.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.02.01
+# Last Update: 2010.02.05
 #
 #####################################################################
@@ -191 +191 @@
                 " certain speed for a certain duration"
                 
+                left_power = -(power/3)
+                right_power = -power
+                
+                self.drive(connection, left_power, right_power, duration)
+        
+        
+        ##################################################################
+        
+        def turn_right_in_reverse(self, connection, power=80, duration=3):
+                
+                "Turn the robot clockwise while backing up at a"
+                " certain speed for a certain duration"
+                
                 left_power = -power
                 right_power = -(power/3)
@@ -199 +212 @@
         ##################################################################
         
-        def turn_right_in_reverse(self, connection, power=80, duration=3):
-                
-                "Turn the robot clockwise while backing up at a"
-                " certain speed for a certain duration"
-                
-                left_power = -(power/3)
-                right_power = -power
-                
-                self.drive(connection, left_power, right_power, duration)
-        
-        
-        ##################################################################
-        
         def turn_left(self, connection, power=80, duration=2):
                 
@@ -298 +298 @@
 # Functions
 #####################################################################
-
 
 #####################################################################