Fixed utf-16/utf-8 conversion and return parsed values from init.

main.py

@@ -29,5 +29,5 @@ def tc():
     if not p:
         print("Connect failed!")
     else:
-        answer = p.initCommand(b'1234567812345678', b'W\x00i\x00P\x00y\x00')
+        answer = p.initCommand('1234567812345678', 'WiPy')
         print(answer)

ptpip.py

@@ -2,6 +2,7 @@
 PTP/IP class for MicroPython
 @author Markus Birth <markus@birth-online.de>
 """
+import binascii
 import socket
 import struct
 
@@ -28,25 +29,38 @@ class PTPIP:
 
     # see http://www.ietf.org/rfc/rfc2781.txt
     def utf16to8(self, u16text):
-        u8text = ""
+        print("UTF-16: %s" % u16text)
+        u8text = u''
         for i in range(0, len(u16text), 2):
             char16 = u16text[i:i+2]
             char16 = struct.unpack('<H', char16)[0]
-            if char16 < 0xd800 or char16 > 0xdfff:
+            if char16 == 0:
+                continue
+            elif char16 < 0xd800 or char16 > 0xdfff:
                 u8text += chr(char16)
             else:
+                # 2-word-char
                 print("Encoded UTF-16. Please improve this method.")
+        print("UTF- 8: %s" % u8text)
         return u8text
 
     # see http://www.ietf.org/rfc/rfc2781.txt
     def utf8to16(self, u8text):
-        pass
+        u16text = b''
+        for i in range(0, len(u8text)):
+            char8 = u8text[i]
+            if ord(char8)<0x10000:
+                u16text += struct.pack('<H', ord(char8))
+            else:
+                # 2-word-char
+                print("Need wide UTF-16. Please improve this method.")
+        return u16text
 
     def getSocket(self):
         return self.socket
 
     def initCommand(self, guid, identifier):
-        pkg = self.createPkg(1, str.encode(guid[:16]) + str.encode(identifier))
+        pkg = self.createPkg(1, str.encode(guid[:16]) + self.utf8to16(identifier))
         self.socket.send(pkg)
         result = self.recvPkg()
         if result[0] == 5:
@@ -55,6 +69,7 @@ class PTPIP:
         elif result[0] != 2:
             print("Unknown package type: %i" % result[0])
             return False
-        remote_guid = result[1][0:16]
-        remote_name = self.utf16to8(result[1][16:])
-        return (remote_guid, remote_name)
+        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:])
+        return (session_id, remote_guid, remote_name)