Changeset 324
- Timestamp:
- 12/05/11 22:17:00 (6 months ago)
- Files:
-
- 10 edited
- 1 copied
-
tags/release-0.7.1 (copied) (copied from trunk)
-
tags/release-0.7.1/Puzzlebox/Brainstorms/Client.py (modified) (1 diff)
-
tags/release-0.7.1/Puzzlebox/Brainstorms/Interface.py (modified) (1 diff)
-
tags/release-0.7.1/Puzzlebox/Brainstorms/Server.py (modified) (1 diff)
-
tags/release-0.7.1/setup.cfg (modified) (1 diff)
-
tags/release-0.7.1/setup.py (modified) (2 diffs)
-
trunk/Puzzlebox/Brainstorms/Client.py (modified) (1 diff)
-
trunk/Puzzlebox/Brainstorms/Interface.py (modified) (1 diff)
-
trunk/Puzzlebox/Brainstorms/Server.py (modified) (1 diff)
-
trunk/setup.cfg (modified) (1 diff)
-
trunk/setup.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
tags/release-0.7.1/Puzzlebox/Brainstorms/Client.py
r322 r324 4 4 # Puzzlebox - Brainstorms - Network - Client 5 5 # 6 # Copyright Puzzlebox Productions, LLC (2010 )6 # Copyright Puzzlebox Productions, LLC (2010-2011) 7 7 # 8 8 # This code is released under the GNU Pulic License (GPL) version 2 -
tags/release-0.7.1/Puzzlebox/Brainstorms/Interface.py
r322 r324 36 36 import serial 37 37 else: 38 DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images'39 38 import bluetooth 40 os.chdir('/usr/share/puzzlebox_brainstorms') 39 if os.path.exists('/usr/share/puzzlebox_brainstorms'): 40 os.chdir('/usr/share/puzzlebox_brainstorms') 41 if os.path.exists('/usr/share/puzzlebox_brainstorms'): 42 DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images' 43 else: 44 DEFAULT_IMAGE_PATH = os.path.join( os.getcwd(), 'images') 41 45 42 46 ##try: -
tags/release-0.7.1/Puzzlebox/Brainstorms/Server.py
r322 r324 47 47 #from PyQt4 import QtCore, QtNetwork 48 48 49 import NXT_Control as nxt_control 50 import iRobot_Control as irobot_control 51 import RC_Car_Control as rc_car_control 49 50 try: 51 import NXT_Control as nxt_control 52 except: 53 pass 54 55 try: 56 import iRobot_Control as irobot_control 57 except: 58 pass 59 60 try: 61 import RC_Car_Control as rc_car_control 62 except: 63 pass 64 52 65 #import puzzlebox_logger 53 66 -
tags/release-0.7.1/setup.cfg
r276 r324 5 5 use_bzip2 = 1 6 6 # icon = puzzlebox.ico 7 # PyQt4 7 8 requires = python 8 PyQt49 python-pyside 9 10 python-simplejson 10 11 pybluez -
tags/release-0.7.1/setup.py
r309 r324 3 3 # Puzzlebox - Brainstorms - Distutils 4 4 # 5 # Copyright Puzzlebox Productions, LLC (2010 )5 # Copyright Puzzlebox Productions, LLC (2010-2011) 6 6 # 7 7 # This code is released under the GNU Pulic License (GPL) version 2 8 8 # For more information please refer to http://www.gnu.org/copyleft/gpl.html 9 9 # 10 # Last Update: 2011. 06.2010 # Last Update: 2011.12.05 11 11 # 12 12 ##################################################################### … … 175 175 setup( 176 176 name='puzzlebox_brainstorms', 177 version='0.7. 0',177 version='0.7.1', 178 178 description='Puzzlebox Brainstorms provides Brain-Computer Interface (BCI) controls for robots and devices', 179 179 author='Steve Castellotti', -
trunk/Puzzlebox/Brainstorms/Client.py
r322 r324 4 4 # Puzzlebox - Brainstorms - Network - Client 5 5 # 6 # Copyright Puzzlebox Productions, LLC (2010 )6 # Copyright Puzzlebox Productions, LLC (2010-2011) 7 7 # 8 8 # This code is released under the GNU Pulic License (GPL) version 2 -
trunk/Puzzlebox/Brainstorms/Interface.py
r322 r324 36 36 import serial 37 37 else: 38 DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images'39 38 import bluetooth 40 os.chdir('/usr/share/puzzlebox_brainstorms') 39 if os.path.exists('/usr/share/puzzlebox_brainstorms'): 40 os.chdir('/usr/share/puzzlebox_brainstorms') 41 if os.path.exists('/usr/share/puzzlebox_brainstorms'): 42 DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images' 43 else: 44 DEFAULT_IMAGE_PATH = os.path.join( os.getcwd(), 'images') 41 45 42 46 ##try: -
trunk/Puzzlebox/Brainstorms/Server.py
r322 r324 47 47 #from PyQt4 import QtCore, QtNetwork 48 48 49 import NXT_Control as nxt_control 50 import iRobot_Control as irobot_control 51 import RC_Car_Control as rc_car_control 49 50 try: 51 import NXT_Control as nxt_control 52 except: 53 pass 54 55 try: 56 import iRobot_Control as irobot_control 57 except: 58 pass 59 60 try: 61 import RC_Car_Control as rc_car_control 62 except: 63 pass 64 52 65 #import puzzlebox_logger 53 66 -
trunk/setup.cfg
r276 r324 5 5 use_bzip2 = 1 6 6 # icon = puzzlebox.ico 7 # PyQt4 7 8 requires = python 8 PyQt49 python-pyside 9 10 python-simplejson 10 11 pybluez -
trunk/setup.py
r309 r324 3 3 # Puzzlebox - Brainstorms - Distutils 4 4 # 5 # Copyright Puzzlebox Productions, LLC (2010 )5 # Copyright Puzzlebox Productions, LLC (2010-2011) 6 6 # 7 7 # This code is released under the GNU Pulic License (GPL) version 2 8 8 # For more information please refer to http://www.gnu.org/copyleft/gpl.html 9 9 # 10 # Last Update: 2011. 06.2010 # Last Update: 2011.12.05 11 11 # 12 12 ##################################################################### … … 175 175 setup( 176 176 name='puzzlebox_brainstorms', 177 version='0.7. 0',177 version='0.7.1', 178 178 description='Puzzlebox Brainstorms provides Brain-Computer Interface (BCI) controls for robots and devices', 179 179 author='Steve Castellotti',
Note: See TracChangeset
for help on using the changeset viewer.
