From 3600bed47a35c526d8f67fe1bda07218d81b7b84 Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Mon, 7 Apr 2014 11:22:48 +0900
Subject: [PATCH] Parachute: relay parameter description update
---
libraries/AP_Parachute/AP_Parachute.cpp | 2 +-
libraries/AP_Parachute/AP_Parachute.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libraries/AP_Parachute/AP_Parachute.cpp b/libraries/AP_Parachute/AP_Parachute.cpp
index 9b6c691d1..93168c14b 100644
--- a/libraries/AP_Parachute/AP_Parachute.cpp
+++ b/libraries/AP_Parachute/AP_Parachute.cpp
@@ -21,7 +21,7 @@ const AP_Param::GroupInfo AP_Parachute::var_info[] PROGMEM = {
// @Param: TYPE
// @DisplayName: 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
AP_GROUPINFO("TYPE", 1, AP_Parachute, _release_type, AP_PARACHUTE_TRIGGER_TYPE_RELAY_0),
diff --git a/libraries/AP_Parachute/AP_Parachute.h b/libraries/AP_Parachute/AP_Parachute.h
index dbc50f247..ddf1a4f3e 100644
--- a/libraries/AP_Parachute/AP_Parachute.h
+++ b/libraries/AP_Parachute/AP_Parachute.h
@@ -67,7 +67,7 @@ private:
AP_Int16 _alt_min; // min altitude the vehicle should have before parachute is released
// 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)
bool _released; // true if the parachute has been released
};
--
GitLab