| 
12 | 12 | # See the License for the specific language governing permissions and  | 
13 | 13 | # limitations under the License.  | 
14 | 14 | 
 
  | 
15 |  | -import copy  | 
16 | 15 | import json  | 
17 | 16 | import os  | 
18 | 17 | import sys  | 
 | 
21 | 20 | 
 
  | 
22 | 21 | IS_WINDOWS = sys.platform.startswith("win")  | 
23 | 22 | 
 
  | 
 | 23 | + | 
24 | 24 | class NxplpcPlatform(PlatformBase):  | 
25 | 25 | 
 
  | 
26 | 26 |     def is_embedded(self):  | 
@@ -155,26 +155,18 @@ def _add_default_debug_tools(self, board):  | 
155 | 155 |         board.manifest["debug"] = debug  | 
156 | 156 |         return board  | 
157 | 157 | 
 
  | 
158 |  | -    def configure_debug_options(self, initial_debug_options, ide_data):  | 
159 |  | -        debug_options = copy.deepcopy(initial_debug_options)  | 
160 |  | -        adapter_speed = initial_debug_options.get("speed")  | 
161 |  | -        if adapter_speed:  | 
162 |  | -            server_options = debug_options.get("server") or {}  | 
163 |  | -            server_executable = server_options.get("executable", "").lower()  | 
 | 158 | +    def configure_debug_session(self, debug_config):  | 
 | 159 | +        if debug_config.speed:  | 
 | 160 | +            server_executable = (debug_config.server or {}).get("executable", "").lower()  | 
164 | 161 |             if "openocd" in server_executable:  | 
165 |  | -                debug_options["server"]["arguments"].extend(  | 
166 |  | -                    ["-c", "adapter speed %s" % adapter_speed]  | 
 | 162 | +                debug_config.server["arguments"].extend(  | 
 | 163 | +                    ["-c", "adapter speed %s" % debug_config.speed]  | 
167 | 164 |                 )  | 
168 | 165 |             elif "jlink" in server_executable:  | 
169 |  | -                debug_options["server"]["arguments"].extend(  | 
170 |  | -                    ["-speed", adapter_speed]  | 
 | 166 | +                debug_config.server["arguments"].extend(  | 
 | 167 | +                    ["-speed", debug_config.speed]  | 
171 | 168 |                 )  | 
172 |  | -            elif "pyocd" in debug_options["server"]["package"]:  | 
173 |  | -                assert (  | 
174 |  | -                    adapter_speed.isdigit()  | 
175 |  | -                ), "pyOCD requires the debug frequency value in Hz, e.g. 4000"  | 
176 |  | -                debug_options["server"]["arguments"].extend(  | 
177 |  | -                    ["--frequency", "%d" % int(adapter_speed)]  | 
 | 169 | +            elif "pyocd" in debug_config.server["package"]:  | 
 | 170 | +                debug_config.server["arguments"].extend(  | 
 | 171 | +                    ["--frequency", debug_config.speed]  | 
178 | 172 |                 )  | 
179 |  | - | 
180 |  | -        return debug_options  | 
0 commit comments