Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
Baitboat
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
Baitboat
Commits
3600bed4
Commit
3600bed4
authored
11 years ago
by
Randy Mackay
Browse files
Options
Downloads
Patches
Plain Diff
Parachute: relay parameter description update
parent
01e5ae6e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libraries/AP_Parachute/AP_Parachute.cpp
+1
-1
1 addition, 1 deletion
libraries/AP_Parachute/AP_Parachute.cpp
libraries/AP_Parachute/AP_Parachute.h
+1
-1
1 addition, 1 deletion
libraries/AP_Parachute/AP_Parachute.h
with
2 additions
and
2 deletions
libraries/AP_Parachute/AP_Parachute.cpp
+
1
−
1
View file @
3600bed4
...
@@ -21,7 +21,7 @@ const AP_Param::GroupInfo AP_Parachute::var_info[] PROGMEM = {
...
@@ -21,7 +21,7 @@ const AP_Param::GroupInfo AP_Parachute::var_info[] PROGMEM = {
// @Param: TYPE
// @Param: TYPE
// @DisplayName: Parachute release mechanism type (relay or servo)
// @DisplayName: Parachute release mechanism type (relay or servo)
// @Description: Parachute release mechanism type (relay or servo)
// @Description: Parachute release mechanism type (relay or servo)
// @Values: 0:Relay
0
,1:Relay
1
,2:Relay
2
,3:Relay
3
,10:Servo
// @Values: 0:
First
Relay,1:
Second
Relay,2:
Third
Relay,3:
Fourth
Relay,10:Servo
// @User: Standard
// @User: Standard
AP_GROUPINFO
(
"TYPE"
,
1
,
AP_Parachute
,
_release_type
,
AP_PARACHUTE_TRIGGER_TYPE_RELAY_0
),
AP_GROUPINFO
(
"TYPE"
,
1
,
AP_Parachute
,
_release_type
,
AP_PARACHUTE_TRIGGER_TYPE_RELAY_0
),
...
...
This diff is collapsed.
Click to expand it.
libraries/AP_Parachute/AP_Parachute.h
+
1
−
1
View file @
3600bed4
...
@@ -67,7 +67,7 @@ private:
...
@@ -67,7 +67,7 @@ private:
AP_Int16
_alt_min
;
// min altitude the vehicle should have before parachute is released
AP_Int16
_alt_min
;
// min altitude the vehicle should have before parachute is released
// internal variables
// internal variables
AP_Relay
&
_relay
;
// pointer to relay object from the base class Relay. The subclasses could be AP_Relay_APM1 or AP_Relay_APM2
AP_Relay
&
_relay
;
// pointer to relay object from the base class Relay. The subclasses could be AP_Relay_APM1 or AP_Relay_APM2
uint32_t
_release_time
;
// system time that parachute is ordered to be released (actual release will happen 0.5 seconds later)
uint32_t
_release_time
;
// system time that parachute is ordered to be released (actual release will happen 0.5 seconds later)
bool
_released
;
// true if the parachute has been released
bool
_released
;
// true if the parachute has been released
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment