Skip to content

Commit

Permalink
fixed: HLS read
Browse files Browse the repository at this point in the history
  • Loading branch information
nyacom committed Sep 11, 2019
1 parent fd0157e commit e1ae81a
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions ficmgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ def cmd_fic_prog(self):
targets = self.get_target()

pr_mode = 'sm16'
memo = 'Configure via ficdeploy by {0:s}@{1:s}'.format(os.getlogin(), os.uname()[1])
memo = 'Configure via ficmanager by {0:s}@{1:s}'.format(os.getlogin(), os.uname()[1])

if self.args.progmode != None:
pr_mode = self.args.progmode[0]
Expand Down Expand Up @@ -522,7 +522,7 @@ def cmd_hls_recv(self):
print("ERROR: You must specify target.", file=sys.stderr)
return -1

target = self.get_target()
targets = self.get_target()
arg1 = self.args.hlsrecv[0]

count = 0
Expand All @@ -539,12 +539,12 @@ def cmd_hls_recv(self):

procs = []
q = Queue()
def proc(q, cmd):
ret = self.fic_hls_recv(count)
def proc(q, target, count):
ret = self.fic_hls_recv(target, count)
q.put((target, ret))

for t in targets:
p = Process(target=proc, args=(q, count))
p = Process(target=proc, args=(q, t, count))
procs.append(p)
p.start()

Expand Down Expand Up @@ -789,7 +789,7 @@ def fic_hls_send(self, target, data):
url = BOARDS[target]['url'] + '/hls'
print("INFO: Send HLS command to {0:s}".format(target))

j = json.dump({
j = json.dumps({
'command': 'send',
'data': data,
})
Expand Down Expand Up @@ -817,7 +817,7 @@ def fic_hls_recv(self, target, count):
url = BOARDS[target]['url'] + '/hls'
print("INFO: Send HLS command to {0:s}".format(target))

j = json.dump({
j = json.dumps({
'command': 'receive',
'count': count,
})
Expand Down Expand Up @@ -1114,9 +1114,3 @@ def sub_proc(q, target, cmd, tout):
if __name__ == '__main__':
obj = ficmanage()
obj.main()

# test_fpga()
# test_status()

# test_switch()
# test_hls()

0 comments on commit e1ae81a

Please sign in to comment.