Changeset 40 for remote_control


Ignore:
Timestamp:
02/09/10 03:51:24 (12 years ago)
Author:
sc
Message:

puzzlebox.ico:

  • layering issue fixed

remote_control/emoscript/puzzlebox_brainstorms-test_drive-push_pull.emo:

  • header cleanup

remote_control/puzzlebox_brainstorms_remote_control.py

  • default duration for drive_forward now 3 seconds

remote_control/emokey/puzzlebox_brainstorms.ekm:

  • trigger thresholds set to 0.8
Location:
remote_control
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • remote_control/emokey/puzzlebox_brainstorms.ekm

    r33 r40  
    44            <enabled value="1" /> 
    55            <action value="20" /> 
    6             <threshold type="double" value="0.6" /> 
     6            <threshold type="double" value="0.8" /> 
    77            <actionRule value="2" /> 
    88        </EmoStateCondition> 
    … …  
    1212            <enabled value="1" /> 
    1313            <action value="22" /> 
    14             <threshold type="double" value="0.6" /> 
     14            <threshold type="double" value="0.8" /> 
    1515            <actionRule value="2" /> 
    1616        </EmoStateCondition> 
    … …  
    2020            <enabled value="1" /> 
    2121            <action value="21" /> 
    22             <threshold type="double" value="0.6" /> 
     22            <threshold type="double" value="0.8" /> 
    2323            <actionRule value="2" /> 
    2424        </EmoStateCondition> 
    … …  
    2828            <enabled value="1" /> 
    2929            <action value="23" /> 
    30             <threshold type="double" value="0.6" /> 
     30            <threshold type="double" value="0.8" /> 
     31            <actionRule value="2" /> 
     32        </EmoStateCondition> 
     33    </EmoMapping> 
     34    <EmoMapping enabled="1" name="push_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"> 
     35        <EmoStateCondition> 
     36            <enabled value="1" /> 
     37            <action value="18" /> 
     38            <threshold type="double" value="0.8" /> 
    3139            <actionRule value="2" /> 
    3240        </EmoStateCondition> 
    … …  
    3644            <enabled value="1" /> 
    3745            <action value="19" /> 
    38             <threshold type="double" value="0" /> 
     46            <threshold type="double" value="0.8" /> 
    3947            <actionRule value="2" /> 
    4048        </EmoStateCondition> 

  • remote_control/emoscript/puzzlebox_brainstorms-test_drive-push_pull.emo

    r39 r40  
    33<EML version="1.0" language="en_US"> 
    44<!-- 
    5         Puzzlebox Brainstorms - Test Drive - Push / Pull 
    6         ################################################ 
     5        Puzzlebox Brainstorms - Test Drive - Push / Pull / Push 
     6        ####################################################### 
    77        This test EmoScript performs the following functions: 
    88                - Push (6 seconds) 
    … …  
    1212                - Push (6 seconds) 
    1313                - <pause> (4 seconds) 
     14        ####################################################### 
    1415--> 
    1516<sequence> 

  • remote_control/puzzlebox_brainstorms_remote_control.py

    r36 r40  
    270270                 
    271271                elif (command == 'drive_forward'): 
    272                         self.drive_forward(self.connection) 
     272                        self.drive_forward(self.connection, duration=3) 
    273273                 
    274274                elif (command == 'drive_reverse'): 
Note: See TracChangeset for help on using the changeset viewer.