Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace hardcoded hci0 reference, fix check for valid device. #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace hardcoded hci0 reference, fix check for valid device. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ibeacon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def check_for_sudo():
# kind of a cheaty way of doing this, we just grep the output of
# `hcitool list' to make sure the passed-in device string is present
def is_valid_device(device):
return not os.system("hciconfig list 2>/dev/null | grep -q ^%s:" % device)
return not os.system("hciconfig %s 2>/dev/null | grep -q ^%s:" % (device, device))

###############################################################################

Expand Down Expand Up @@ -158,7 +158,7 @@ def main(argv=None):
process_command("hciconfig %s down" % device)
return 0
else:
print "Error: no such device: %s (try `hciconfig list')" % device
print "Error: no such device: %s (try `hciconfig -a')" % device
return 1
else:
return 1
Expand Down Expand Up @@ -200,7 +200,7 @@ def main(argv=None):

# make sure we are using a valid hci device
if not simulate and not is_valid_device(device):
print "Error: no such device: %s (try `hciconfig list')" % device
print "Error: no such device: %s (try `hciconfig -a')" % device
return 1

# print status info
Expand All @@ -218,7 +218,7 @@ def main(argv=None):
# set up the beacon
# pipe stdout to /dev/null to get rid of the ugly "here's what I did"
# message from hcitool
process_command("hcitool -i hci0 cmd 0x08 0x0008 1E 02 01 1A 1A FF 4C 00 02 15 %s %s %s %s 00 >/dev/null" % (split_uuid, split_major_hex, split_minor_hex, power_hex))
process_command("hcitool -i %s cmd 0x08 0x0008 1E 02 01 1A 1A FF 4C 00 02 15 %s %s %s %s 00 >/dev/null" % (device, split_uuid, split_major_hex, split_minor_hex, power_hex))

except Usage, err:
print >>sys.stderr, err.msg
Expand Down