Changeset 101


Ignore:
Timestamp:
07/10/10 04:24:13 (11 years ago)
Author:
sc
Message:
  • DISCRETE_CONTROL_COMMANDS renamed VARIABLE_CONTROL_DURATION
Location:
remote_control
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • remote_control/puzzlebox_brainstorms_client_interface_local.py

    r100 r101  
    5050BLUETOOTH_DEVICE = configuration.NXT_BLUETOOTH_DEVICE 
    5151 
    52 DISCRETE_CONTROL_COMMANDS = configuration.BRAINSTORMS_DISCRETE_CONTROL_COMMANDS 
     52VARIABLE_CONTROL_DURATION = configuration.BRAINSTORMS_VARIABLE_CONTROL_DURATION 
    5353 
    5454##################################################################### 
  • remote_control/puzzlebox_brainstorms_client_interface_pygame.py

    r74 r101  
    99# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    1010# 
    11 # Last Update: 2010.06.28 
     11# Last Update: 2010.07.09 
    1212# 
    1313##################################################################### 
     
    3636FLIP = 1 
    3737 
    38 DISCRETE_CONTROL_COMMANDS = configuration.BRAINSTORMS_DISCRETE_CONTROL_COMMANDS 
     38VARIABLE_CONTROL_DURATION = configuration.BRAINSTORMS_VARIABLE_CONTROL_DURATION 
    3939 
    4040SERVER_HOST = configuration.BRAINSTORMS_SERVER_HOST 
     
    9191                self.screen = None 
    9292                self.FLIP = FLIP 
    93                 self.DISCRETE_CONTROL_COMMANDS = DISCRETE_CONTROL_COMMANDS 
     93                self.VARIABLE_CONTROL_DURATION = VARIABLE_CONTROL_DURATION 
    9494                self.image_directory = IMAGE_DIRECTORY 
    9595                 
  • remote_control/puzzlebox_brainstorms_configuration.ini

    r95 r101  
    66#NXT_BLUETOOTH_DEVICE = '/dev/rfcomm0' # Linux example setting 
    77 
    8 # Discrete control drives the robot for a set time period per detection 
    9 # Setting this to "False" will drive the robot in a particular 
    10 # direction for as long as the detection occurs 
    11 BRAINSTORMS_DISCRETE_CONTROL_COMMANDS = False 
     8# Discrete control drives the robot for a set time period per detection. 
     9# Setting Variable control to "True" will drive the robot in a 
     10# particular direction for as long as the detection occurs 
     11BRAINSTORMS_VARIABLE_CONTROL_DURATION = True 
    1212 
    1313##################################################################### 
  • remote_control/puzzlebox_brainstorms_configuration.py

    r95 r101  
    99# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    1010# 
    11 # Last Update: 2010.07.06 
     11# Last Update: 2010.07.09 
    1212# 
    1313##################################################################### 
     
    6262##################################################################### 
    6363 
    64 BRAINSTORMS_DISCRETE_CONTROL_COMMANDS = False 
     64# Discrete control drives the robot for a set time period per detection. 
     65# Setting Variable control to "True" will drive the robot in a 
     66# particular direction for as long as the detection occurs 
     67VARIABLE_CONTROL_DURATION = True 
     68 
    6569DEFAULT_NXT_POWER_LEVEL = 80 
    6670 
  • remote_control/puzzlebox_brainstorms_network_server.py

    r99 r101  
    3939BLUETOOTH_DEVICE = configuration.NXT_BLUETOOTH_DEVICE 
    4040 
    41 DISCRETE_CONTROL_COMMANDS = configuration.BRAINSTORMS_DISCRETE_CONTROL_COMMANDS 
     41VARIABLE_CONTROL_DURATION = configuration.BRAINSTORMS_VARIABLE_CONTROL_DURATION 
    4242 
    4343##################################################################### 
     
    172172                response = {} 
    173173                 
    174                 if DISCRETE_CONTROL_COMMANDS: 
     174                if not VARIABLE_CONTROL_DURATION: 
    175175                         
    176176                        response['status'] = self.executeCommand(data['command'], data['power']) 
  • remote_control/puzzlebox_brainstorms_network_server_twisted.py

    r74 r101  
    99# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    1010# 
    11 # Last Update: 2010.06.28 
     11# Last Update: 2010.07.09 
    1212# 
    1313##################################################################### 
     
    2929DEBUG = 1 
    3030 
    31 DISCRETE_CONTROL_COMMANDS = configuration.BRAINSTORMS_DISCRETE_CONTROL_COMMANDS 
     31VARIABLE_CONTROL_DURATION = configuration.BRAINSTORMS_VARIABLE_CONTROL_DURATION 
    3232 
    3333SERVER_INTERFACE = configuration.BRAINSTORMS_SERVER_INTERFACE 
     
    6262                 
    6363                 
    64                 if DISCRETE_CONTROL_COMMANDS: 
     64                if not VARIABLE_CONTROL_DURATION: 
    6565                         
    6666                        self.execute_command(command) 
  • remote_control/puzzlebox_brainstorms_remote_control.py

    r98 r101  
    2727DEBUG = 2 
    2828 
    29 DISCRETE_CONTROL_COMMANDS = configuration.BRAINSTORMS_DISCRETE_CONTROL_COMMANDS 
     29VARIABLE_CONTROL_DURATION = configuration.BRAINSTORMS_VARIABLE_CONTROL_DURATION 
    3030 
    3131DEFAULT_NXT_POWER_LEVEL = configuration.DEFAULT_NXT_POWER_LEVEL 
     
    167167                 
    168168                # Continue operating motors while control program pauses 
    169                 if DISCRETE_CONTROL_COMMANDS: 
     169                if not VARIABLE_CONTROL_DURATION: 
    170170                        time.sleep(duration) 
    171171                         
Note: See TracChangeset for help on using the changeset viewer.