Merge pull request #265 from Patater/update-pyocd-0.31.0

Update pyocd 0.31.0

Author: Patater

setup.py

@@ -84,6 +84,6 @@ def read(fname):
     install_requires=requirements,
     tests_require=test_requirements,
     extras_require={
-        "pyocd": ["pyocd==0.14.0"]
+        "pyocd": ["pyocd>=0.31.0"]
     },
 )

src/mbed_os_tools/test/host_tests_plugins/module_copy_pyocd.py

@@ -18,7 +18,7 @@
 
 try:
     from pyocd.core.helpers import ConnectHelper
-    from pyocd.flash.loader import FileProgrammer
+    from pyocd.flash.file_programmer import FileProgrammer
     PYOCD_PRESENT = True
 except ImportError:
     PYOCD_PRESENT = False

src/mbed_os_tools/test/host_tests_runner/mbed_base.py

@@ -221,7 +221,9 @@ def copy_image_raw(self, image_path=None, disk=None, copy_method=None, port=None
                                         serial=port,
                                         destination_disk=disk,
                                         target_id=self.target_id,
-                                        pooling_timeout=self.polling_timeout)
+                                        pooling_timeout=self.polling_timeout,
+                                        format=self.options.format
+                                        )
         return result
 
     def hw_reset(self):
@@ -234,7 +236,8 @@ def hw_reset(self):
         result = ht_plugins.call_plugin('ResetMethod',
                                         'power_cycle',
                                         target_id=self.target_id,
-                                        device_info=device_info)
+                                        device_info=device_info,
+                                        format=self.options.format)
         if result:
             self.port = device_info['serial_port']
             self.disk = device_info['mount_point']