Use string length info for information packtet (fixes #14).

Tigge · May 14, 2012 · 7374eec · 7374eec
1 parent f7dfe71
commit 7374eec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/garmin.py b/garmin.py
@@ -180,7 +180,8 @@ def on_burst_data(self, data):
 
         if self.state == Garmin.State.REQUESTID:
             _logger.debug("%d, %d, %s", len(data), len(data[11:]), data[11:])
-            (strlen, unitid, name) = struct.unpack("<BI14s", data[11:-2])
+            (strlen, unitid) = struct.unpack("<11xBI", data[:16])
+            name             = data[16:16 + strlen].tostring()
             print "String length: ", strlen
             print "Unit ID:       ", unitid
             print "Product name:  ", name

diff --git a/resources/protocol doc.txt b/resources/protocol doc.txt
@@ -144,11 +144,12 @@ Watch -> Host burst: The clock answers with a burst message:
 
     Row 1:   Same as last/current broadcast
 
-    Row 2:   Byte 0-2: Unknown, Byte 3: Probably name string length
+    Row 2:   Byte 0-2: Unknown, Byte 3: Name string length (includes one null
+                                        char at the end of the string)
              Byte 4-7: Garmin Unit ID - uint32, little-endian
 
     Row 3-4: Name string: "Garmin Forerunner 610", remaining space is
-             zero padded.
+             zero padded to next even octet. Unknown character encoding.
 
 
 Here we can either pair with device or send old pair info - can only pair if