Merging camera changes into develop branch #2676
Merged
Conversation
This file contains hidden or 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
|
Looks like it has conflicts that can't get fixed in the browser UI? |
Move the camera software documentation into a new section under Computers. Keep the camera hardware documentation in the existing Accessories space. Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Update the maximum exposure time numbers, and while at it, fold the table into the hardware comparison table above. Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
- Remove Linux integration and C programming API rows - Update resolution list for imx219 and imx477 - Add imx477 sensor size Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
This does not belong in any camera documentation section. It ought to be re-instated in a future product sheet or product brief section. Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
- s/Raspberry Pi is transitioning/Raspberry Pi has transitioned/ - Add audio-samplerate commandline option for libcamera-vid - Add dependencies for libav integration - Add more obvious links between the camera software and modules documents Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Remove the section from the camera hardware document, and include the existing filter removal adoc file to avoid duplicating the contents. Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Add a large warning box at the start of the Raspicam section noting that it is now deprecated. Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
- s/accessories/camera hardware/ - s/Github/GitHub/ - Remove the sentence about Python bindings missing in libcamera Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
lurch
force-pushed
the
camera_branch_v2
branch
from
baddd31 to
e0ea289
Compare
|
Conflict was because of #2674 |
|
Claims to be! YOLO! |
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.
No description provided.