Commit591fc5b

authored

Merge pull request#60 from systemetric/json-reader-start-info

Json reader start info

2 parents9ff95bf +d71834b commit591fc5bCopy full SHA for 591fc5b

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ def __repr__(self) -> str:`
`55`	`55`	`defbounding_box_color(self)->tuple:`
`56`	`56`	`ifself.type==MARKER_TYPE.ARENA:# If it is a wall`
`57`	`57`	`returntuple(reversed((225,249,125)))# Turquoise`
`58`		`-elifself.type==MARKER_TYPE.ARENA_OBJECT:# Other arena object (e.g. pillar)`
	`58`	`+elifself.type==MARKER_TYPE.TREE:# Other arena object (e.g. pillar)`
`59`	`59`	`returntuple(reversed((255,131,125)))# Purple`
`60`	`60`	`elifself.owning_team==TEAM.ARENA:# If it is a supply`
`61`	`61`	`m=selfifisinstance(self,TARGET_MARKER)elseNone`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ def __init__(self,`
`83`	`83`	`self._hopper_client.open_pipe(self._start_pipe,delete=True,create=True,blocking=True)# Make sure to use blocking mode, otherwise start button code fails`
`84`	`84`
`85`	`85`	`self._log_pipe=PipeName((PipeType.INPUT,"log","robot"),"/home/pi/pipes")`
	`86`	`+self._json_reader=JsonReader(self._hopper_client,self._start_pipe)`
`86`	`87`
`87`	`88`	`# Close stdout and stderr`
`88`	`89`	`os.close(1)`
`@@ -283,9 +284,7 @@ def _get_start_info(self):`
`283`	`284`	`"""Get the start infomation from the named pipe"""`
`284`	`285`
`285`	`286`	`# This call blocks until the start info is read`
`286`		`-d=self._hopper_client.read(self._start_pipe).decode("utf-8")`
`287`		`-`
`288`		`-settings=json.loads(d)`
	`287`	`+settings=self._json_reader.read()`
`289`	`288`
`290`	`289`	`assert"zone"insettings,"zone must be in startup info"`
`291`	`290`	`ifsettings["zone"]notinrange(4):`

Comments

(0)