diff --git a/script/camtool.py b/script/camtool.py index 55dc516..c4857a3 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -1,5 +1,6 @@ -class CamTool: - def __init__(self, prefix = "cam:", latch = False): +class CamTool(DeviceBase): + def __init__(self, name, prefix = "cam:", latch = False): + DeviceBase.__init__(self, name) self.prefix = prefix self.latch = latch self.mode = "latch" if latch else "pipeline" @@ -19,10 +20,9 @@ class CamTool: self.cam_bg_en = Channel(self.prefix + "bg.enabled", type = 'l', alias = "cam_bg_en") self.cam_bg_capture = Channel(self.prefix + "bg.capture", type = 'l', alias = "cam_bg_capture") self.cam_bg_capture_remain = Channel(self.prefix + "bg.capture_remain", alias = "cam_bg_capture_remain") + - self.init() - - def init(self): + def doInitialize(self): if self.latch: self.start() else: @@ -34,7 +34,6 @@ class CamTool: def stop(self): self.cam_run.write(0) - def capture(self): timestamp = self.timestamp.read() if self.latch: @@ -57,14 +56,17 @@ class CamTool: #self.cam_bg_capture.write(images) #while( self.cam_bg_capture_remain.read() > 0): # self.capture() - #self.init() + self.doInitialize() #if __name__ == "__builtin__": -camera_tool = CamTool() +camera_tool = CamTool("camtool") camera_tool.capture() print camera_tool.cam_x.read(), camera_tool.cam_y.read() camera_tool.enable_bg(True) camera_tool.enable_bg(False) -camera_tool.capture_bg(5) \ No newline at end of file +camera_tool.capture_bg(5) + + +add_device(camera_tool, True) \ No newline at end of file