From 0a0aa7491dc24b7d984c4d391b9647e270af7c53 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Mon, 8 Feb 2021 12:45:02 +0100 Subject: [PATCH] mx2board: cleanup pin data --- tools/mx2board.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/mx2board.py b/tools/mx2board.py index b50c1e16..56639e84 100755 --- a/tools/mx2board.py +++ b/tools/mx2board.py @@ -229,14 +229,12 @@ def read_project(gpio, filename): pads[p][i]['OSPEEDR'] = PIN_OSPEED_TRANSLATE[gpio['defaults']['GPIO_Speed']] for t in tmp: - if re.search(r"^P[A-Z]\d{1,2}(_C|-OSC.+|\\.*SW.*)?\.", t, re.M): - split = t.split('=') - pad_name = split[0].split(".")[0].replace('\\', '').replace('_C', '') - pad_port = pad_name[1:2] - pad_num = int(pad_name[2:4].replace('.', '').replace('-', '')) - pad_prop = split[0].split(".")[-1].replace(" ", "") - prop_value = split[-1].rstrip('\r\n') - + _pad_search = re.match(r"^P([A-Z])(\d{1,2}).*\.([A-Za-z_]+)=(.+)", t, re.M) + if _pad_search: + pad_port = _pad_search.group(1) + pad_num = int(_pad_search.group(2)) + pad_prop = _pad_search.group(3) + prop_value = _pad_search.group(4) if pad_prop == "Signal": if 'S_TIM' in prop_value: