From 8491a3393de06e30c954f4d8dcc46484afcb8890 Mon Sep 17 00:00:00 2001 From: Kento HASEGAWA Date: Mon, 27 Aug 2018 17:59:52 +0900 Subject: [PATCH] Fix a bug --- solver/Solver2017.py | 11 +++++++++-- solver/Solver2018.py | 10 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/solver/Solver2017.py b/solver/Solver2017.py index 52ca4f9..2e05f2f 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 8a07f62..3d7595b 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) # 入力データをセット -- 2.22.0