Camera cleanups #8685
Merged
Camera cleanups #8685
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
libraries/AP_Camera/AP_Camera.cpp
Outdated
| // install a 1kHz timer to check feedback pin | ||
| hal.scheduler->register_timer_process(FUNCTOR_BIND_MEMBER(&AP_Camera::feedback_pin_timer, void)); | ||
| int8_t dpin = hal.gpio->analogPinToDigitalPin(_feedback_pin); | ||
| if (dpin == -1) { |
There was a problem hiding this comment.
A bit too much whitespaces
There was a problem hiding this comment.
Ha! Not really sure how I did that, will fix.
WickedShell
force-pushed
the
wickedshell/cam-feedback-tidy
branch
from
2d22d72
to
c0dc4c7
Compare
|
Works correctly, does not fix the double CAM message on first trigger. |
WickedShell
force-pushed
the
wickedshell/cam-feedback-tidy
branch
from
c0dc4c7
to
d6e08e0
Compare
|
Passed dev call review, was waiting on CI to pass so merging. |
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.
This is a set of random collection stuff I stumbled across while chasing something completely unrelated. Taken in no particular order:
CAM_FEEDBACK_PIN, (reboots are always required to detect shifts if it involved the edge feedback pin).feedback_pin_timerand does it before the timer is installed. This is run at 1 kHz, so it's worth keeping this reasonably short, and with the reboot required if you shift pins under some circumstances I didn't feel that this was a large behavior shift._camera_triggeredto false on boot.I believe this fixes the double feedback event when taking the first photo.AP_Camera::check_trigger_pin(void)toAP_Camera::check_feedback_pin(void)to better reflect what it's trying to do. (This is still a very confusing section of code, this is just where I drew the line for limiting refactoring).I need to test this (probably tomorrow) before we look at merging, but I'm most hopeful about 3, as the double feedback event is really frustrating.