Merge pull request #2032 from theotherjimmy/fix-program-cycle-s

[Tools] Force program_cycle_s to be used as an attribue everywhere

Author: 0xc0170

tools/make.py

@@ -283,7 +283,7 @@
                 # Import pyserial: https://pypi.python.org/pypi/pyserial
                 from serial import Serial
 
-                sleep(TARGET_MAP[mcu].program_cycle_s())
+                sleep(TARGET_MAP[mcu].program_cycle_s)
 
                 serial = Serial(options.serial, timeout = 1)
                 if options.baud:

tools/targets.py

@@ -215,6 +215,7 @@ def __init__(self, name):
         # Create also a list with only the names of the targets in the resolution order
         self.resolution_order_names = [t[0] for t in self.resolution_order]
 
+    @property
     def program_cycle_s(self):
         try:
             return self.__getattr__("program_cycle_s")

tools/test_api.py

@@ -898,7 +898,7 @@ def handle_mut(self, mut, data, target_name, toolchain_name, test_loops=1):
                                                       reset=host_test_reset,
                                                       reset_tout=reset_tout,
                                                       copy_method=selected_copy_method,
-                                                      program_cycle_s=target_by_mcu.program_cycle_s())
+                                                      program_cycle_s=target_by_mcu.program_cycle_s)
                 single_test_result, single_test_output, single_testduration, single_timeout = host_test_result
 
             # Store test result
@@ -2083,4 +2083,3 @@ def test_spec_from_test_builds(test_builds):
     return {
         "builds": test_builds
     }
-