Changeset 33


Ignore:
Timestamp:
02/06/10 05:32:01 (11 years ago)
Author:
sc
Message:

rc:

  • turn_left_in_reverse and turn_right_in_reverse driving swapped

emokey:

  • updated bindings
Location:
rc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • rc/emokey/puzzlebox_brainstorms.ekm

    r32 r33  
    1 <EmoMappingModel mappingName="puzzlebox_brainstorms2.ekm" > 
    2     <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"> 
    3         <EmoStateCondition> 
    4             <enabled value="1" /> 
    5             <action value="18" /> 
    6             <threshold type="double" value="0" /> 
    7             <actionRule value="2" /> 
    8         </EmoStateCondition> 
     1<EmoMappingModel mappingName="puzzlebox_brainstorms.ekm" > 
     2    <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"> 
    93        <EmoStateCondition> 
    104            <enabled value="1" /> 
    115            <action value="20" /> 
    12             <threshold type="double" value="0" /> 
     6            <threshold type="double" value="0.6" /> 
    137            <actionRule value="2" /> 
    148        </EmoStateCondition> 
    159    </EmoMapping> 
    16     <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"> 
     10    <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"> 
    1711        <EmoStateCondition> 
    1812            <enabled value="1" /> 
    1913            <action value="22" /> 
    20             <threshold type="double" value="0" /> 
     14            <threshold type="double" value="0.6" /> 
    2115            <actionRule value="2" /> 
    2216        </EmoStateCondition> 
    2317    </EmoMapping> 
    24     <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"> 
     18    <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"> 
     19        <EmoStateCondition> 
     20            <enabled value="1" /> 
     21            <action value="21" /> 
     22            <threshold type="double" value="0.6" /> 
     23            <actionRule value="2" /> 
     24        </EmoStateCondition> 
     25    </EmoMapping> 
     26    <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"> 
    2527        <EmoStateCondition> 
    2628            <enabled value="1" /> 
    2729            <action value="23" /> 
    28             <threshold type="double" value="0" /> 
     30            <threshold type="double" value="0.6" /> 
    2931            <actionRule value="2" /> 
    3032        </EmoStateCondition> 
    3133    </EmoMapping> 
    32     <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"> 
    33         <EmoStateCondition> 
    34             <enabled value="1" /> 
    35             <action value="21" /> 
    36             <threshold type="double" value="0" /> 
    37             <actionRule value="2" /> 
    38         </EmoStateCondition> 
    39     </EmoMapping> 
    40     <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"> 
    41     </EmoMapping> 
    42     <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"> 
     34    <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"> 
    4335        <EmoStateCondition> 
    4436            <enabled value="1" /> 
  • rc/puzzlebox_brainstorms_rc.py

    r31 r33  
    99# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    1010# 
    11 # Last Update: 2010.02.01 
     11# Last Update: 2010.02.05 
    1212# 
    1313##################################################################### 
     
    191191                " certain speed for a certain duration" 
    192192                 
     193                left_power = -(power/3) 
     194                right_power = -power 
     195                 
     196                self.drive(connection, left_power, right_power, duration) 
     197         
     198         
     199        ################################################################## 
     200         
     201        def turn_right_in_reverse(self, connection, power=80, duration=3): 
     202                 
     203                "Turn the robot clockwise while backing up at a" 
     204                " certain speed for a certain duration" 
     205                 
    193206                left_power = -power 
    194207                right_power = -(power/3) 
     
    199212        ################################################################## 
    200213         
    201         def turn_right_in_reverse(self, connection, power=80, duration=3): 
    202                  
    203                 "Turn the robot clockwise while backing up at a" 
    204                 " certain speed for a certain duration" 
    205                  
    206                 left_power = -(power/3) 
    207                 right_power = -power 
    208                  
    209                 self.drive(connection, left_power, right_power, duration) 
    210          
    211          
    212         ################################################################## 
    213          
    214214        def turn_left(self, connection, power=80, duration=2): 
    215215                 
     
    298298# Functions 
    299299##################################################################### 
    300  
    301300 
    302301##################################################################### 
Note: See TracChangeset for help on using the changeset viewer.