diff --git a/solver/Solver2017.py b/solver/Solver2017.py index 52ca4f9c98f8774c806d69c7b9d601533195ede0..2e05f2f7c12b6cd964ea586b04fa7d202778f7ca 100644 --- a/solver/Solver2017.py +++ b/solver/Solver2017.py @@ -115,10 +115,17 @@ def solve(boardstr, seed=12345, zero_padding=False, option=dict()): print('Overlay loaded!') # MMIO 接続 (pynqrouter) - mmio = MMIO(int(PL.ip_dict[IP][0], 16), int(PL.ip_dict[IP][1], 16)) + if isinstance(PL.ip_dict[IP][0], int): + mmio = MMIO(PL.ip_dict[IP][0], PL.ip_dict[IP][1], 16) + else: + mmio = MMIO(int(PL.ip_dict[IP][0], 16), int(PL.ip_dict[IP][1], 16)) # MMIO 接続 & リセット (LED) - mmio_led = MMIO(int(PL.ip_dict[IP_LED][0], 16), int(PL.ip_dict[IP_LED][1], 16)) + if isinstance(PL.ip_dict[IP_LED][0], int): + mmio_led = MMIO(PL.ip_dict[IP_LED][0], PL.ip_dict[IP_LED][1]) + else: + mmio_led = MMIO(int(PL.ip_dict[IP_LED][0], 16), int(PL.ip_dict[IP_LED][1], 16)) + mmio_led.write(0, 0) # 入力データをセット diff --git a/solver/Solver2018.py b/solver/Solver2018.py index 8a07f62956b49c2d522702126d37bc18029fd750..3d7595bcabff36f2075e8c093e5abd4605c55d2e 100644 --- a/solver/Solver2018.py +++ b/solver/Solver2018.py @@ -114,10 +114,16 @@ def solve(boardstr, seed=12345, zero_padding=False, option=dict()): print('Overlay loaded!') # MMIO 接続 (pynqrouter) - mmio = MMIO(int(PL.ip_dict[IP][0], 16), int(PL.ip_dict[IP][1], 16)) + if isinstance(PL.ip_dict[IP][0], int): + mmio = MMIO(PL.ip_dict[IP][0], PL.ip_dict[IP][1]) + else: + mmio = MMIO(int(PL.ip_dict[IP][0], 16), int(PL.ip_dict[IP][1], 16)) # MMIO 接続 & リセット (LED) - mmio_led = MMIO(int(PL.ip_dict[IP_LED][0], 16), int(PL.ip_dict[IP_LED][1], 16)) + if isinstance(PL.ip_dict[IP_LED][0], int): + mmio_led = MMIO(PL.ip_dict[IP_LED][0], PL.ip_dict[IP_LED][1]) + else: + mmio_led = MMIO(int(PL.ip_dict[IP_LED][0], 16), int(PL.ip_dict[IP_LED][1], 16)) mmio_led.write(0, 0) # 入力データをセット