aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-05-03 14:47:38 +0800
committerTat-Chee Wan (USM)2011-05-03 14:47:38 +0800
commit166fe4fbb3de88850d327e829b1a768d99ab26cc (patch)
tree34bf5df14a26746224c5cc045d1944709666e9bb /AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py
parentefa35bbf85ba1bfa37b34bc35d4fa5e8cf3208f6 (diff)
parent1e3b294f345511538c64cce8f9f3e0ba3c82d1e3 (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py')
-rw-r--r--AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py b/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py
index b4a2739..99917f2 100644
--- a/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py
+++ b/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/bluesock.py
@@ -13,12 +13,12 @@
# GNU General Public License for more details.
try:
- import bluetooth
+ import fantomglue as bluetooth
except ImportError:
try:
- import lightblueglue as bluetooth
+ import bluetooth
except ImportError:
- import pyfantom as bluetooth
+ import lightblueglue as bluetooth
import os
from .brick import Brick