Changeset 359


Ignore:
Timestamp:
08/21/12 09:34:53 (8 years ago)
Author:
sc
Message:

configuration:

  • WHEELCHAIR_CONTROL_EEG added to continue driving in a direction until stopped
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Puzzlebox/Brainstorms/Configuration.py

    r343 r359  
    1010 
    1111__changelog__ = """\ 
    12 Last Update: 2012.06.14 
     12Last Update: 2012.08.20 
    1313 
    1414""" 
     
    169169# COMMAND_ACTIVATE = 'minimum_thrust' 
    170170# COMMAND_ACTIVATE = 'fly_forward' 
     171 
     172 
     173##################################################################### 
     174# Wheelchair configuration 
     175##################################################################### 
     176 
     177WHEELCHAIR_CONTROL_EEG = True 
    171178 
    172179 
  • trunk/Puzzlebox/Brainstorms/Interface.py

    r356 r359  
    1010 
    1111__changelog__ = """\ 
    12 Last Update: 2012.08.19 
     12Last Update: 2012.08.20 
    1313 
    1414""" 
     
    9393 
    9494DEFAULT_NXT_POWER_LEVEL = configuration.DEFAULT_NXT_POWER_LEVEL 
     95 
     96WHEELCHAIR_CONTROL_EEG = configuration.WHEELCHAIR_CONTROL_EEG 
    9597 
    9698THINKGEAR_SERVER_HOST = configuration.THINKGEAR_SERVER_HOST 
     
    989991                                  QtCore.SIGNAL("pressed()"), \ 
    990992                                  self.driveWheelchairForward) 
    991                 self.connect(self.pushButtonWheelchairForward, \ 
    992                              QtCore.SIGNAL("released()"), \ 
    993                              self.stopWheelchair) 
    994                  
    995993                self.connect(self.pushButtonWheelchairReverse, \ 
    996994                                  QtCore.SIGNAL("pressed()"), \ 
    997995                                  self.driveWheelchairReverse) 
    998                 self.connect(self.pushButtonWheelchairReverse, \ 
    999                              QtCore.SIGNAL("released()"), \ 
    1000                              self.stopWheelchair) 
    1001                  
    1002996                self.connect(self.pushButtonWheelchairLeft, \ 
    1003997                                  QtCore.SIGNAL("pressed()"), \ 
    1004998                                  self.driveWheelchairLeft) 
    1005                 self.connect(self.pushButtonWheelchairLeft, \ 
    1006                              QtCore.SIGNAL("released()"), \ 
    1007                              self.stopWheelchair) 
    1008                  
    1009999                self.connect(self.pushButtonWheelchairRight, \ 
    10101000                                  QtCore.SIGNAL("pressed()"), \ 
    10111001                                  self.driveWheelchairRight) 
    1012                 self.connect(self.pushButtonWheelchairRight, \ 
    1013                              QtCore.SIGNAL("released()"), \ 
    1014                              self.stopWheelchair) 
     1002 
     1003                if not WHEELCHAIR_CONTROL_EEG: 
     1004                        # Manual control for Wheelchair 
     1005                        # Allow drive instructions to be sent once (or repeatedly) 
     1006                        self.connect(self.pushButtonWheelchairForward, \ 
     1007                                     QtCore.SIGNAL("released()"), \ 
     1008                                     self.stopWheelchair)                
     1009                        self.connect(self.pushButtonWheelchairReverse, \ 
     1010                                     QtCore.SIGNAL("released()"), \ 
     1011                                     self.stopWheelchair) 
     1012                        self.connect(self.pushButtonWheelchairLeft, \ 
     1013                                     QtCore.SIGNAL("released()"), \ 
     1014                                     self.stopWheelchair) 
     1015                        self.connect(self.pushButtonWheelchairRight, \ 
     1016                                     QtCore.SIGNAL("released()"), \ 
     1017                                     self.stopWheelchair) 
    10151018                 
    10161019                self.connect(self.pushButtonWheelchairStop, \ 
  • trunk/Puzzlebox/Brainstorms/Wheelchair_Control.py

    r358 r359  
    1010 
    1111__changelog__ = """ 
    12 Last Update: 2012.08.19 
     12Last Update: 2012.08.20 
    1313""" 
    1414 
     
    1717import signal 
    1818import serial 
    19 import tty, termios # console() 
    20 import select # console() 
     19if (sys.platform != 'win32'): 
     20        import tty, termios # console() 
     21        import select # console() 
    2122 
    2223import Configuration as configuration 
  • trunk/emokey/puzzlebox_brainstorms-wheelchair.ekm

    r249 r359  
    11<EmoMappingModel mappingName="puzzlebox_brainstorms-wheelchair.ekm" > 
    2     <EmoMapping enabled="1" name="Forward" keys="i" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="1000" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
     2    <EmoMapping enabled="1" name="Forward" keys="i" sendOnce="0" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" enterKey="0" hotKey="0" holdKey="1" holdTime="1000" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
    33        <EmoStateCondition> 
    44            <enabled value="1" /> 
     
    88        </EmoStateCondition> 
    99    </EmoMapping> 
    10     <EmoMapping enabled="1" name="Left" keys="j" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="100" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
     10    <EmoMapping enabled="1" name="Left" keys="j" sendOnce="0" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" enterKey="0" hotKey="0" holdKey="1" holdTime="100" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
    1111        <EmoStateCondition> 
    1212            <enabled value="1" /> 
     
    1616        </EmoStateCondition> 
    1717    </EmoMapping> 
    18     <EmoMapping enabled="1" name="Right" keys="l" sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="1" holdTime="100" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
     18    <EmoMapping enabled="1" name="Right" keys="l" sendOnce="0" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" enterKey="0" hotKey="0" holdKey="1" holdTime="100" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
    1919        <EmoStateCondition> 
    2020            <enabled value="1" /> 
     
    2424        </EmoStateCondition> 
    2525    </EmoMapping> 
    26     <EmoMapping enabled="1" name="Stop" keys=" " sendOnce="1" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" hotKey="0" holdKey="0" holdTime="20" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
     26    <EmoMapping enabled="1" name="Stop" keys=" " sendOnce="0" sendToFocus="1" targetApp="" sendHotKeys="0" ctrlKey="0" altKey="0" shiftKey="0" winKey="0" enterKey="0" hotKey="0" holdKey="1" holdTime="20" triggerDelayTime="20" player="0" mouseclickset="0" mousebutnum="-1"> 
    2727        <EmoStateCondition> 
    2828            <enabled value="1" /> 
  • trunk/puzzlebox_brainstorms_configuration.ini

    r343 r359  
    9292 
    9393##################################################################### 
     94# Wheelchair configuration 
     95##################################################################### 
     96 
     97WHEELCHAIR_CONTROL_EEG = True 
     98 
     99 
     100##################################################################### 
    94101# ThinkGear Connect configuration 
    95102##################################################################### 
Note: See TracChangeset for help on using the changeset viewer.