aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Moiseev <m0sia@m0sia.ru>2013-11-08 21:41:10 +0600
committerDmitry Moiseev <m0sia@m0sia.ru>2013-11-08 21:41:10 +0600
commitc06e99e21b436dab67a33915cfd91ee5b901dd7d (patch)
tree0c1cfa0fa3c055dd180bbc42735a3e441fd3d76f
parentbdc53d8151dff4bf1d27df9cf21e78acdcc0b651 (diff)
parente56dacc4d3e15b4d82ea1553bd73af6221dfcc6c (diff)
downloadpyParrotZikTCP-c06e99e21b436dab67a33915cfd91ee5b901dd7d.tar.xz
pyParrotZikTCP-c06e99e21b436dab67a33915cfd91ee5b901dd7d.zip
Merge branch 'master' of https://github.com/m0sia/pyParrotZik
-rw-r--r--ParrotZik.py9
-rw-r--r--icons/Headphone.icobin0 -> 112262 bytes
-rw-r--r--icons/audio-headset.pngbin0 -> 2885 bytes
-rw-r--r--icons/battery-040.pngbin0 -> 2424 bytes
-rw-r--r--icons/battery-060.pngbin0 -> 2537 bytes
-rw-r--r--icons/battery-080.pngbin0 -> 2617 bytes
-rw-r--r--icons/battery-100.pngbin0 -> 2603 bytes
-rw-r--r--icons/battery-caution-3.pngbin0 -> 1587 bytes
-rw-r--r--icons/battery-low.pngbin0 -> 2334 bytes
9 files changed, 7 insertions, 2 deletions
diff --git a/ParrotZik.py b/ParrotZik.py
index b7f5dd7..08b7f30 100644
--- a/ParrotZik.py
+++ b/ParrotZik.py
@@ -13,7 +13,8 @@ class ParrotZik(object):
if len(service_matches) == 0:
print "Couldn't find Parrot Zik"
- return False
+ self.sock = ''
+ return
first_match = service_matches[0]
port = first_match["port"]
@@ -87,7 +88,11 @@ class ParrotZik(object):
return self.sendMessage(message)
def sendMessage(self,message):
- self.sock.send(str(message))
+ try:
+ self.sock.send(str(message))
+ except:
+ self.sock = ''
+ return
data = self.sock.recv(7)
len = struct.unpack('B', data[1])[0]
data = self.sock.recv(1024)
diff --git a/icons/Headphone.ico b/icons/Headphone.ico
new file mode 100644
index 0000000..0bddf34
--- /dev/null
+++ b/icons/Headphone.ico
Binary files differ
diff --git a/icons/audio-headset.png b/icons/audio-headset.png
new file mode 100644
index 0000000..42164bb
--- /dev/null
+++ b/icons/audio-headset.png
Binary files differ
diff --git a/icons/battery-040.png b/icons/battery-040.png
new file mode 100644
index 0000000..333e699
--- /dev/null
+++ b/icons/battery-040.png
Binary files differ
diff --git a/icons/battery-060.png b/icons/battery-060.png
new file mode 100644
index 0000000..5d21461
--- /dev/null
+++ b/icons/battery-060.png
Binary files differ
diff --git a/icons/battery-080.png b/icons/battery-080.png
new file mode 100644
index 0000000..83fa2fa
--- /dev/null
+++ b/icons/battery-080.png
Binary files differ
diff --git a/icons/battery-100.png b/icons/battery-100.png
new file mode 100644
index 0000000..0e818c3
--- /dev/null
+++ b/icons/battery-100.png
Binary files differ
diff --git a/icons/battery-caution-3.png b/icons/battery-caution-3.png
new file mode 100644
index 0000000..f97b54c
--- /dev/null
+++ b/icons/battery-caution-3.png
Binary files differ
diff --git a/icons/battery-low.png b/icons/battery-low.png
new file mode 100644
index 0000000..86546be
--- /dev/null
+++ b/icons/battery-low.png
Binary files differ