Skip to content

Add extended support for DAPlink / mbed.htm file parsing #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 22, 2016
Merged

Add extended support for DAPlink / mbed.htm file parsing #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d67a32e
Add support for custom DAPlink version when reading mbed.htm
PrzemekWirkus Jun 22, 2016
8e630f4
Add SiliconLabs specific mbed.htm parsing
PrzemekWirkus Jun 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions mbed_lstools/lstools_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,22 +483,40 @@ def get_mbed_htm_target_id(self, mount_point):
return target_id
return result

def get_mbed_htm_comment_section_ver_build(self, line):
"""! Check for Version and Build date of interface chip firmware im mbed.htm file
@return (version, build) tuple if successful, None if no info found
"""
# <!-- Version: 0200 Build: Mar 26 2014 13:22:20 -->
m = re.search(r'^<!-- Version: (\d+) Build: ([\d\w: ]+) -->', line)
if m:
version_str, build_str = m.groups()
return (version_str.strip(), build_str.strip())

# <!-- Version: 0219 Build: Feb 2 2016 15:20:54 Git Commit SHA: 0853ba0cdeae2436c52efcba0ba76a6434c200ff Git local mods:No-->
m = re.search(r'^<!-- Version: (\d+) Build: ([\d\w: ]+) Git Commit SHA', line)
if m:
version_str, build_str = m.groups()
return (version_str.strip(), build_str.strip())

# <!-- Version: 0.14.3. build 471 -->
m = re.search(r'^<!-- Version: ([\d+\.]+)\. build (\d+) -->', line)
if m:
version_str, build_str = m.groups()
return (version_str.strip(), build_str.strip())
return None

def get_mbed_htm(self, mount_point):
"""!
<!-- mbed Microcontroller Website and Authentication Shortcut -->
<!-- Version: 0200 Build: Mar 26 2014 13:22:20 -->
<html>
...
</html>
"""! Check for version, build date/timestamp, URL in mbed.htm file
@param mount_point Where to look for mbed.htm file
@return Dictoionary with additional DAPlink names
"""
result = {}
for line in self.get_mbed_htm_lines(mount_point):
# Check for Version and Build date of interface chip firmware
m = re.search(r'^<!-- Version: (\d+) Build: ([\d\w: ]+) -->', line)
if m:
version_str, build_str = m.groups()
result['Version'] = version_str.strip()
result['Build'] = build_str.strip()
ver_bld = self.get_mbed_htm_comment_section_ver_build(line)
if ver_bld:
result['version'], result['build'] = ver_bld

# Check for mbed URL
m = re.search(r'url=([\w\d\:/\\\?\.=-_]+)', line)
Expand Down
33 changes: 33 additions & 0 deletions test/mbed_htm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class ParseMbedHTMTestCase(unittest.TestCase):
test_mbed_htm_l152re_url_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/device/?code=07100200656A9A955A0F0CB8"/>'
test_mbed_htm_lpc1768_url_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/start?auth=101000000000000000000002F7F1869557200730298d254d3ff3509e3fe4722d&loader=11972&firmware=16457&configuration=4" />'
test_mbed_htm_nucleo_l031k6_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/device/?code=07900221461663077952F5AA"/>'
test_mbed_htm_nrf51_url_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/device/?code=1100021952333120353935373130313232323032AFD5DFD8"/>'

# DAPLink 0240
test_daplink_240_mbed_html_str = 'window.location.replace("https://mbed.org/device/?code=0240000029164e45002f0012706e0006f301000097969900?version=0240?target_id=0007ffffffffffff4e45315450090023");'
Expand Down Expand Up @@ -65,6 +66,38 @@ def test_daplink_240_mbed_html(self):
target_id = self.mbeds.scan_html_line_for_target_id(self.test_daplink_240_mbed_html_str)
self.assertEqual('0240000029164e45002f0012706e0006f301000097969900', target_id)

def test_mbed_htm_nrf51_url(self):
target_id = self.mbeds.scan_html_line_for_target_id(self.test_mbed_htm_nrf51_url_str)
self.assertEqual('1100021952333120353935373130313232323032AFD5DFD8', target_id)

def get_mbed_htm_comment_section_ver_build(self):
# Incorrect data
ver_bld = self.mbeds.get_mbed_htm_comment_section_ver_build('<!-- Version: XXXX Build: Mar 26 2014 13:22:20 -->')
self.assertIsNone(ver_bld)

ver_bld = self.mbeds.get_mbed_htm_comment_section_ver_build('<!-- mbed Platform Website and Authentication Shortcut -->')
self.assertIsNone(ver_bld)

ver_bld = self.mbeds.get_mbed_htm_comment_section_ver_build('')
self.assertIsNone(ver_bld)

# Correct data
ver_bld = self.mbeds.get_mbed_htm_comment_section_ver_build('<!-- Version: 0200 Build: Mar 26 2014 13:22:20 -->')
self.assertIsNotNone(ver_bld)
self.assertEqual(('0200', 'Mar 26 2014 13:22:20'), ver_bld)

ver_bld = self.mbeds.get_mbed_htm_comment_section_ver_build('<!-- Version: 0200 Build: Aug 27 2014 13:29:28 -->')
self.assertIsNotNone(ver_bld)
self.assertEqual(('0200', 'Aug 27 2014 13:29:28'), ver_bld)

ver_bld = self.mbeds.get_mbed_htm_comment_section_ver_build('<!-- Version: 0219 Build: Feb 2 2016 15:20:54 Git Commit SHA: 0853ba0cdeae2436c52efcba0ba76a6434c200ff Git local mods:No-->')
self.assertIsNotNone(ver_bld)
self.assertEqual(('0219', 'Feb 2 2016 15:20:54'), ver_bld)

ver_bld = self.mbeds.get_mbed_htm_comment_section_ver_build('<!-- Version: 0.14.3. build 471 -->')
self.assertIsNotNone(ver_bld)
self.assertEqual(('0.14.3', '471'), ver_bld)

def test_(self):
pass

Expand Down