Ignore:
Timestamp:
12/06/10 01:51:07 (12 years ago)
Author:
sc
Message:

Interface.py:

  • Fixed bugs with device port connections

Wheelchair_Control.py:

  • Turning speeds reduced

setup.py:

  • whitespace cleanup
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/brainstorms/Puzzlebox/Brainstorms/Interface.py

    r246 r247  
    436436 
    437437                # Prevent attempting to connect to a device which does not exist 
    438                 device = str(self.comboBoxNXTPortSelect.currentText()) 
     438                device = str(self.comboBoxHelicopterPortSelect.currentText()) 
    439439                if device == 'N/A': 
    440440                        self.pushButtonHelicopterConnect.setChecked(False) 
     
    543543                 
    544544                # Prevent attempting to connect to a device which does not exist 
    545                 device = str(self.comboBoxNXTPortSelect.currentText()) 
     545                device = str(self.comboBoxWheelchairPortSelect.currentText()) 
    546546                if device == 'N/A': 
    547547                        self.pushButtonWheelchairConnect.setChecked(False)       
     
    932932                                  QtCore.SIGNAL("pressed()"), \ 
    933933                                  self.driveWheelchairReverse) 
    934                 self.connect(self.pushButtonWheelchairForward, \ 
     934                self.connect(self.pushButtonWheelchairReverse, \ 
    935935                             QtCore.SIGNAL("released()"), \ 
    936936                             self.stopWheelchair) 
     
    939939                                  QtCore.SIGNAL("pressed()"), \ 
    940940                                  self.driveWheelchairLeft) 
    941                 self.connect(self.pushButtonWheelchairForward, \ 
     941                self.connect(self.pushButtonWheelchairLeft, \ 
    942942                             QtCore.SIGNAL("released()"), \ 
    943943                             self.stopWheelchair) 
     
    946946                                  QtCore.SIGNAL("pressed()"), \ 
    947947                                  self.driveWheelchairRight) 
     948                self.connect(self.pushButtonWheelchairRight, \ 
     949                             QtCore.SIGNAL("released()"), \ 
     950                             self.stopWheelchair) 
    948951                 
    949952                self.connect(self.pushButtonWheelchairStop, \ 
Note: See TracChangeset for help on using the changeset viewer.