Move camera configurations close to camera classes #74
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Before: import camera_configurations
import camera_factory
...
if camera_selection == 0:
config = camera_configurations.ConfigCamera0()
elif camera_selection == 1:
config = camera_configurations.ConfigCamera1()
elif ...
...
camera_device = camera_factory(..., config)After: import camera0
import camera1
...
import camera_factory
...
if camera_selection == 0:
config = camera0.ConfigCamera0()
elif camera_selection == 1:
config = camera1.ConfigCamera1()
elif ...
...
camera_device = camera_factory(..., config) |
Xierumeng
force-pushed
the
camera-configuration-refactor
branch
from
9f88f1a to
43542cb
Compare
Xierumeng
changed the title
maxlou05
reviewed
Dec 9, 2024
modules/camera/camera_picamera2.py
Outdated
| timeout: Getting image timeout in seconds. | ||
|
|
||
| exposure_time: Microseconds. | ||
| analogue_gain: |
There was a problem hiding this comment.
A part of ISO, analogueGain * DigitialGain * 100 = ISO. From 0 to suggested max is 16, but can go up to 64.
There was a problem hiding this comment.
I'm not sure I understand the 2nd part. The acceptable range of values is 0 to 64, but the suggested range to use is 0 to 16 ? Why is the default argument 64 then?
modules/camera/camera_picamera2.py
Outdated
|
|
||
| if self.maybe_lens_position is not None: | ||
| camera_controls["LensPosition"] = self.maybe_lens_position | ||
| camera_controls["AfMode"] = picamera2.controls.AfModeEnum.Manual |
There was a problem hiding this comment.
I think this needs an import: from libcamera import controls, then it's just controls.AfModeEnum...
modules/camera/camera_picamera2.py
Outdated
| camera_controls["AfMode"] = picamera2.controls.AfModeEnum.Manual | ||
| else: | ||
| camera_controls["LensPosition"] = 0.0 | ||
| camera_controls["AfMode"] = picamera2.controls.AfModeEnum.Auto |
modules/camera/camera_picamera2.py
Outdated
| exposure_time: Microseconds. | ||
| analogue_gain: | ||
| contrast: 0.0 to 32.0 . 0.0 is no contrast, 1.0 is normal contrast, higher is more contrast. | ||
| lens_position: Position of the lens is dioptres (reciprocal of metres: 1/m ). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve locality of code (LOC) by moving the configuration classes close to the camera classes. The tradeoff is that users are required to import all camera classes for configurations. A possible mitigation is to generate the configuration from a common data structure (e.g. dictionary from YAML).