Skip to content

Commit 05f82bc

Browse files
changed daylight cam to take default defined cam default_camera_type
1 parent b417182 commit 05f82bc

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

camera/camera.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@ async def choose_cam(self, task: Camera_Task):
143143
"""
144144
Asynchronously chooses a camera based on various conditions such as
145145
daylight detection, night vision, and default camera type.
146+
Decision is:
147+
- daylight detection enabled:
148+
- daylight takes default_camera_type
149+
- night: takes night vision enabled cam, if two precedence is blink over picam
150+
- daylight detection disabled:
151+
- takes default_camera_type
146152
147153
Args:
148154
self: The Camera object.
@@ -160,19 +166,22 @@ async def choose_cam(self, task: Camera_Task):
160166
if self.detect_daylight():
161167
self.logger.info("daylight detected")
162168

163-
if not self.config.blink_night_vision:
169+
if self.config.default_camera_type == DefaultCam.BLINK:
164170
self.logger.debug("blink night_vision is disabled")
165171
result = await self._blink_foto_helper(task)
166172
return await self._check_blink_result(task, result)
167173

168-
if not self.config.picam_night_vision:
174+
if self.config.default_camera_type == DefaultCam.PICAM:
169175
self.logger.debug("picam night_vision is disabled")
170176
result = await self._picam_foto_helper(task)
171177
return await self._check_picam_result(task, result)
172178

173179
else:
174180
self.logger.info("night detected is enabled")
175181

182+
# ToDo: improve here if two are enabled for night vision
183+
# ToDo: further extended unit tests required here
184+
176185
if self.config.blink_night_vision:
177186
self.logger.debug("blink night_vision is enabled")
178187
result = await self._blink_foto_helper(task)
@@ -184,7 +193,6 @@ async def choose_cam(self, task: Camera_Task):
184193
return await self._check_picam_result(task, result)
185194

186195
else:
187-
# use default camera
188196
if self.config.default_camera_type == DefaultCam.BLINK:
189197
self.logger.debug("blink as default cam choosen")
190198
result = await self._blink_foto_helper(task)

0 commit comments

Comments
 (0)