Skip to content
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

Fix And Update Photogrammetry Calculator #250

Closed
wants to merge 3 commits into from

Conversation

dewagter
Copy link
Member

@dewagter dewagter commented Aug 3, 2012

todo: needs more testing ...

@@ -4,20 +4,20 @@
<dl_settings name="control">
<dl_settings name="photocalc">

<dl_setting max="90" min="-90" step="1" module="cartography/photogrammetry_calculator" var="photogrammetry_sweep_angle" shortname="Angle" param="PHOTOGRAMMETRY_SWEEP_ANGLE" unit="rad" alt_unit="deg"/>
<dl_setting max="RadOfDeg(90)" min="RadOfDeg(-90)" step="RadOfDeg(1)" module="cartography/photogrammetry_calculator" var="photogrammetry_sweep_angle" shortname="Angle" param="PHOTOGRAMMETRY_SWEEP_ANGLE" unit="rad" alt_unit="deg"/>
Copy link
Member

Choose a reason for hiding this comment

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

RadOfDeg definitely won't work here...
Also since alt_unit is deg, it was correct before anyway...

Copy link
Member Author

Choose a reason for hiding this comment

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

oops sorry... this was not the latest. Now it should be fine.

On Fri, Aug 3, 2012 at 1:28 PM, Felix Ruess <
reply@reply.github.com

wrote:

@@ -4,20 +4,20 @@
<dl_settings name="control">
<dl_settings name="photocalc">

  •  <dl_setting max="90" min="-90" step="1"
    
    module="cartography/photogrammetry_calculator"
    var="photogrammetry_sweep_angle" shortname="Angle"
    param="PHOTOGRAMMETRY_SWEEP_ANGLE" unit="rad" alt_unit="deg"/>
  •  <dl_setting max="RadOfDeg(90)" min="RadOfDeg(-90)"
    
    step="RadOfDeg(1)" module="cartography/photogrammetry_calculator"
    var="photogrammetry_sweep_angle" shortname="Angle"
    param="PHOTOGRAMMETRY_SWEEP_ANGLE" unit="rad" alt_unit="deg"/>

RadOfDeg definitely won't work here...
Also since alt_unit is deg, it was correct before anyway...


Reply to this email directly or view it on GitHub:
https://github.com/paparazzi/paparazzi/pull/250/files#r1300936

@gautierhattenberger
Copy link
Member

This update and the other one (#248), are they features or bug fixes ?
It should not break anything so it can go to 4.0 as a bug fix, but maybe the correct place for this is master. What do you think ?

@dewagter
Copy link
Member Author

dewagter commented Aug 4, 2012

combined bugfix + feature:

digital_cam: bug: does not compile on stm32 + feature: trigger on rising edge
photogrammetry: bug: sweepangle was not radians like mentioned in the code + feature: flightplan2camera inverse

@flixr
Copy link
Member

flixr commented Aug 4, 2012

merged into master with 9893a2a
fix for sweep angle in rad merged into v4.0 with eb72592

@flixr flixr closed this Aug 4, 2012
@OpenUAS
Copy link
Contributor

OpenUAS commented Aug 24, 2012

The correct should be v4.0, since one is a bug, the other a feature, to make it work in other camera trigger scenarios that otherwise did not work wel, so also afix. Just IMHO.

@flixr
Copy link
Member

flixr commented Oct 5, 2012

New features merged into v4.1 as well...

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

Successfully merging this pull request may close these issues.

None yet

4 participants