From 583b3b48cf7b61334694bd7dcf9752c09d8e910c Mon Sep 17 00:00:00 2001
From: Markus Birth <mbirth@gmail.com>
Date: Wed, 21 Oct 2015 00:33:50 +0200
Subject: [PATCH] Added Init_Event_Request to init.

---
 ptpip.py | 17 +++++++++++++++--
 theta.py | 14 +++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ptpip.py b/ptpip.py
index 9f7a6a2..e81dfc7 100644
--- a/ptpip.py
+++ b/ptpip.py
@@ -2,6 +2,7 @@
 PTP/IP class for MicroPython
 @author Markus Birth <markus@birth-online.de>
 
+PTP/IP abstract: http://www.cipa.jp/ptp-ip/index_e.html
 PTP packet structure: http://www.gphoto.org/doc/ptpip.php
                   and https://github.com/gphoto/libgphoto2/blob/master/camlibs/ptp2/PTPIP.TXT
 PTP example implementation in JavaScript: https://github.com/feklee/ptp.js
@@ -74,11 +75,23 @@ class PTPIP:
         elif result[0] != 2:
             print("Unknown package type: %i" % result[0])
             return False
-        session_id  = struct.unpack('<I', result[1][0:4])[0]
+        self.session_id  = struct.unpack('<I', result[1][0:4])[0]
         remote_guid = binascii.hexlify(result[1][4:20])
         remote_name = self.utf16to8(result[1][20:])
         self.trans_id = 0
-        return (session_id, remote_guid, remote_name)
+        return (self.session_id, remote_guid, remote_name)
+
+    def initEvent(self, session_id):
+        pkg = self.createPkg(3, struct.pack('<I', session_id))
+        self.socket.send(pkg)
+        result = self.recvPkg()
+        if result[0] == 5:
+            print("INIT EVENT FAILED!")
+            return False
+        elif result[0] != 4:
+            print("Unknown package type: %i" % result[0])
+            return False
+        return True
 
     def createCommand(self, cmd_code, cmd_args):
         if type(cmd_args) is not list:
diff --git a/theta.py b/theta.py
index 9b9a0a9..d04912e 100644
--- a/theta.py
+++ b/theta.py
@@ -18,9 +18,13 @@ class Theta:
 
     def findWifi(self):
         wlans = self.wlan.scan()
+        # TODO: Return all visible Thetas
         for w in wlans:
             if w.ssid.startswith('THETA'):
                 self.log('Found Theta WiFi: %s' % w.ssid)
+                # THETAXL12345678     = Theta (original model) - PTP/IP
+                # THETAXN12345678     = Theta m15 - PTP/IP
+                # THETAXS12345678.OSC = Theta S   - OSC
                 return w.ssid
         return False
 
@@ -39,7 +43,15 @@ class Theta:
 
     def initPTP(self):
         answer = self.ptpip.initCommand('1234567812345678', 'WiPy')
-        return answer
+        if not answer:
+            print("Init failed!")
+            return False
+        (session_id, guid, name) = answer
+        pass2 = self.ptpip.initEvent(session_id)
+        if not pass2:
+            print("Init stage 2 failed!")
+            return False
+        return (session_id, guid, name)
 
     def openSession(self):
         answer = self.ptpip.createCommand(0x1002, [])