From a2d0d622e693629fbe984e7427746ccafc805079 Mon Sep 17 00:00:00 2001
From: Markus Birth <mbirth@gmail.com>
Date: Mon, 10 Dec 2018 16:57:55 +0100
Subject: [PATCH] Detect device for component firmwares.

---
 grmn/devices.py | 4 ++++
 grmn/tlv.py     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/grmn/devices.py b/grmn/devices.py
index 5038f38..c103190 100644
--- a/grmn/devices.py
+++ b/grmn/devices.py
@@ -646,6 +646,7 @@ DEVICES = {
     2927: "vivosmart 4",
     2945: "vivomove HR, APAC",
     2956: "Alpha 50 CHN",
+    2957: "Firmware for MT3333 GPS",
     2962: "Approach X10",
     2976: "vivoactive 3, APAC",
     2977: "Forerunner 30 APAC",
@@ -655,6 +656,7 @@ DEVICES = {
     2997: "eTrex 302 CHN",
     3003: "Forerunner 645 APAC",
     3004: "Forerunner 645M APAC",
+    3014: "Fenix 5 Plus Sensor Hub",
     3028: "GPSMAP 66",
     3049: "Approach S10",
     3089: "Fenix 5 Plus APAC",
@@ -669,9 +671,11 @@ DEVICES = {
     3139: "zumo 396, APAC",
     3142: "Edge 520 Plus, APAC",
     3144: "Forerunner 235 Lite APAC",
+    3153: "Fenix 5 Plus ANT_BT_BLE Firmware",
     3163: "vivoactive 3M, WiFi, APAC",
     3196: "D2 Delta",
     3197: "D2 Delta S",
     3198: "D2 Delta PX",
     3218: "Vivosmart 4, APAC",
+    3260: "D2 Delta ANT_BT_BLE Firmware",
 }
diff --git a/grmn/tlv.py b/grmn/tlv.py
index 03cc450..1241edb 100644
--- a/grmn/tlv.py
+++ b/grmn/tlv.py
@@ -343,8 +343,10 @@ class TLVbinary0401(TLVbinary):
         if hdr == 0xffff:
             version = unpack("<H", self.value[4:6])[0]
             sku = self.value[10:20].decode("utf-8")
-            txt += "\n  - SKU: {}-{}-{}".format(sku[0:3], sku[3:8], sku[8:10])
-            txt += "\n  - Version: {}".format(version)
+            hwid = int(sku[4:8])
+            txt += "\n  -     SKU: {}-{}-{}".format(sku[0:3], sku[3:8], sku[8:10])
+            txt += "\n  -   hw_id: 0x{:04x} / {:d} ({})".format(hwid, hwid, devices.DEVICES.get(hwid, "Unknown device"))
+            txt += "\n  - Version: 0x{:04x} / {:d}".format(version, version)
         #if not self.is_parsed:
         #    self.parse()
         return txt