Make GCS radio link indicator configurable #2131
Merged
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
rijesha
commented
Oct 20, 2017
conf/airframes/examples/microjet.xml
Outdated
| @@ -94,6 +94,7 @@ | |||
| <!-- <define name="NO_XBEE_API_INIT" value="TRUE"/> --> | |||
|
|
|||
| <define name="DEFAULT_CIRCLE_RADIUS" value="80."/> | |||
| <define name="RC_MAX_RATE" value="70" /> <!-- pass rate in Hz, --> | |||
There was a problem hiding this comment.
final pull request probably should not include this line, or default it to the normal 50.
gautierhattenberger
requested changes
Nov 13, 2017
sw/ground_segment/cockpit/live.ml
Outdated
| @@ -99,6 +99,7 @@ type aircraft = { | |||
| pages : GObj.widget; | |||
| notebook_label : GMisc.label; | |||
| strip : Strip.t; | |||
| rc_max_rate: int; | |||
There was a problem hiding this comment.
since you do everything in float later, change this to float as well
sw/ground_segment/cockpit/live.ml
Outdated
| try | ||
| let gcs_section = ExtXml.child af_xml ~select:(fun x -> Xml.attrib x "name" = "MISC") "section" in | ||
| let fvalue = fun name default-> | ||
| try ExtXml.int_attrib (ExtXml.child gcs_section ~select:(fun x -> ExtXml.attrib x "name" = name) "define") "value" with _ -> default in |
There was a problem hiding this comment.
use ExtXml.float_attrib and change the 50 for 50.
sw/ground_segment/cockpit/live.ml
Outdated
| @@ -882,7 +896,7 @@ let get_wind_msg = fun (geomap:G.widget) _sender vs -> | |||
| let get_fbw_msg = fun alarm _sender vs -> | |||
| let ac = get_ac vs in | |||
| let status = PprzLink.string_assoc "rc_status" vs | |||
| and rate = (PprzLink.int_assoc "rc_rate" vs) / 5 in | |||
| and rate = (float_of_int ((PprzLink.int_assoc "rc_rate" vs) * 10) ) /. (float_of_int ac.rc_max_rate) in | |||
There was a problem hiding this comment.
you can then remove the float_of_int to get rate in float directly
sw/ground_segment/cockpit/live.mli
Outdated
| @@ -49,6 +49,7 @@ type aircraft = private { | |||
| pages : GObj.widget; | |||
| notebook_label : GMisc.label; | |||
| strip : Strip.t; | |||
| rc_max_rate : int; | |||
gautierhattenberger
approved these changes
Nov 24, 2017
podhrmic
pushed a commit
that referenced
this pull request
Nov 27, 2017
biancabndris
pushed a commit
to biancabndris/paparazzi
that referenced
this pull request
Aug 29, 2018
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.
See issue #1555 .
Waiting for @OpenUAS to test.