Skip to content

Split out camera documentation v2 #2673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 28, 2022

Conversation

naushir
Copy link
Contributor

@naushir naushir commented Oct 27, 2022

Redo of #2667

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>
@naushir naushir changed the title Camera branch v2 Split out camera documentation v2 Oct 27, 2022
@aallan
Copy link
Contributor

aallan commented Oct 27, 2022

Okay, so the plan is to merge this branch to develop, and the older camera_branch is now deletable? Do I have that correct?

@naushir
Copy link
Contributor Author

naushir commented Oct 27, 2022

Okay, so the plan is to merge this branch to develop, and the older camera_branch is now deletable? Do I have that correct?

Correct. I'll fix up the above and push and update shortly.

@aallan
Copy link
Contributor

aallan commented Oct 27, 2022

Right. Let's keep the original branch around until this closes, but when this merges we need to remember close both branches!

@lurch
Copy link
Contributor

lurch commented Oct 27, 2022

Few little comments, but mostly LGTM. I assume this all builds cleanly on your local machine @naushir ?

@naushir
Copy link
Contributor Author

naushir commented Oct 28, 2022

Few little comments, but mostly LGTM. I assume this all builds cleanly on your local machine @naushir ?

Yup, all building fine for me locally. New changes have been pushed!

- 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
Copy link
Contributor

lurch commented Oct 28, 2022

@aallan I've only looked at the changes visible on the "Files changed" tab, and haven't read through the whole camera documentation to see if the structure / ordering still makes sense, but from what I've seen this LGTM.

@@ -1 +1,3 @@
include::camera/camera_hardware.adoc[]

include::camera/hqcam_filter_removal.adoc[]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, looking at the git history of that file, it looks like @aallan moved the original content out into the separate include-file (back in August 2021), but then forgot to edit the main body-text to use that include. 🤷

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did wonder why it was duplicated.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh!

@aallan
Copy link
Contributor

aallan commented Oct 28, 2022

Okay, ready to merge folks?

@naushir
Copy link
Contributor Author

naushir commented Oct 28, 2022

Go for it!!

@aallan aallan merged commit baddd31 into raspberrypi:camera_branch_v2 Oct 28, 2022
@aallan
Copy link
Contributor

aallan commented Oct 28, 2022

Okay, got to run across town now. When I get to a place where I've got a flat surface I'll merge camera_branch_v2 into develop and delete both the two camera branches.

Huh, we have merge conflicts. That's odd.

@aallan
Copy link
Contributor

aallan commented Oct 28, 2022

@lurch Can you take a look at #2676 and see what's up?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants