plat_db now provides jlink_device_name

Author: bridadan

mbed_lstools/lstools_base.py

@@ -167,7 +167,9 @@ def _fs_never(self, device, filter_function, read_details_txt):
         """Filter device without touching the file system of the device"""
         device['target_id'] = device['target_id_usb_id']
         device['target_id_mbed_htm'] = None
-        device['platform_name'] = self.plat_db.get(device['target_id'][0:4])
+        platform_data = self.plat_db.get(device['target_id'][0:4],
+                                         verbose_data=True)
+        device.update(platform_data or {'platform_name': None})
         if not filter_function or filter_function(device):
             return device
         else:
@@ -192,7 +194,8 @@ def _fs_after_id_check(self, device, filter_function, read_details_txt):
         """
         device['target_id'] = device['target_id_usb_id']
         device['target_id_mbed_htm'] = None
-        device['platform_name'] = self.plat_db.get(device['target_id'][0:4])
+        platform_data = self.plat_db.get(device['target_id'][0:4], verbose_data=True)
+        device.update(platform_data or {'platform_name': None})
         if not filter_function or filter_function(device):
             self._update_device_from_fs(device, read_details_txt)
             return device
@@ -239,8 +242,10 @@ def _update_device_details_daplink(self, device, read_details_txt):
                            for f, v in details_txt.items()})
 
         if device['target_id']:
-            device['platform_name'] = self.plat_db.get(device['target_id'][0:4],
-                                                       device_type='daplink')
+            platform_data = self.plat_db.get(device['target_id'][0:4],
+                                             device_type='daplink',
+                                             verbose_data=True)
+            device.update(platform_data or {'platform_name': None})
         else:
             device['platform_name'] = None
 
@@ -270,7 +275,10 @@ def _update_device_details_jlink(self, device, read_details_txt):
             if m:
                 device['url'] = m.group(1).strip()
                 identifier = device['url'].split('/')[-1]
-                device['platform_name'] = self.plat_db.get(identifier, device_type='jlink')
+                platform_data = self.plat_db.get(identifier,
+                                                 device_type='jlink',
+                                                 verbose_data=True)
+                device.update(platform_data or {'platform_name': None})
                 break
 
 

mbed_lstools/platform_database.py

@@ -263,11 +263,23 @@
         u'FFFF': u'K20 BOOTLOADER',
         u'RIOT': u'RIOT',
     },
-    'jlink': {
-        u'X349858SLYN': u'NRF52_DK',
-        u'FRDM-KL25Z': u'KL25Z',
-        u'FRDM-KL27Z': u'KL27Z',
-        u'FRDM-KL43Z': u'KL43Z'
+    u'jlink': {
+        u'X349858SLYN': {
+            u'platform_name': u'NRF52_DK',
+            u'jlink_device_name': u'nRF52832_xxaa'
+        },
+        u'FRDM-KL25Z': {
+            u'platform_name': u'KL25Z',
+            u'jlink_device_name': u'MKL25Z128xxx4'
+        },
+        u'FRDM-KL27Z': {
+            u'platform_name': u'KL27Z',
+            u'jlink_device_name': u'MKL27Z64xxx4'
+        },
+        u'FRDM-KL43Z': {
+            u'platform_name': u'KL43Z',
+            u'jlink_device_name': u'MKL43Z256xxx4'
+        }
     }
 }
 
@@ -284,6 +296,21 @@ def _older_than_me(path):
     return _get_modified_time(path) < _get_modified_time(__file__)
 
 
+def _modify_data_format(data, verbose_data, simple_data_key='platform_name'):
+    if isinstance(data, dict):
+        if verbose_data:
+            return data
+
+        return data[simple_data_key]
+    else:
+        if verbose_data:
+            return {
+                simple_data_key: data
+            }
+
+        return data
+
+
 def _overwrite_or_open(db):
     try:
         if db is LOCAL_PLATFORM_DATABASE and _older_than_me(db):
@@ -355,13 +382,14 @@ def items(self, device_type='daplink'):
     def all_ids(self, device_type='daplink'):
         return iter(self._keys[device_type])
 
-    def get(self, index, default=None, device_type='daplink'):
-        """Standard lookup function. Works exactly like a dict"""
+    def get(self, index, default=None, device_type='daplink', verbose_data=False):
+        """Standard lookup function. Works exactly like a dict. If 'verbose_data'
+        is True, all data for the platform is returned as a dict."""
         for db in self._dbs.values():
             if device_type in db:
                 maybe_answer = db[device_type].get(index, None)
                 if maybe_answer:
-                    return maybe_answer
+                    return _modify_data_format(maybe_answer, verbose_data)
 
         return default
 
@@ -409,9 +437,10 @@ def add(self, id, platform_name, permanent=False, device_type='daplink'):
         else:
             raise ValueError("Invald target id: %s" % id)
 
-    def remove(self, id, permanent=False, device_type='daplink'):
+    def remove(self, id, permanent=False, device_type='daplink', verbose_data=False):
         """Remove a platform from this database, optionally updating an origin
-        database
+        database. If 'verbose_data' is True, all data for the platform is returned
+        as a dict.
         """
         logger.debug("Trying remove of %s", id)
         if id is '*' and device_type in self._dbs[self._prim_db]:
@@ -424,4 +453,5 @@ def remove(self, id, permanent=False, device_type='daplink'):
                 self._keys[device_type].remove(id)
                 if permanent:
                     self._update_db()
-                return removed
+
+                return _modify_data_format(removed, verbose_data)