Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ardupilot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SASC
ardupilot
Commits
4ebde25a
Commit
4ebde25a
authored
11 years ago
by
Randy Mackay
Browse files
Options
Downloads
Patches
Plain Diff
AP_Relay: add -1:Disabled to list of param values
parent
f7a9ee24
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
.pydevproject
+5
-0
5 additions, 0 deletions
.pydevproject
libraries/AP_Relay/AP_Relay.cpp
+4
-4
4 additions, 4 deletions
libraries/AP_Relay/AP_Relay.cpp
with
9 additions
and
4 deletions
.pydevproject
0 → 100644
+
5
−
0
View file @
4ebde25a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?>
<pydev_project>
<pydev_property
name=
"org.python.pydev.PYTHON_PROJECT_INTERPRETER"
>
Default
</pydev_property>
<pydev_property
name=
"org.python.pydev.PYTHON_PROJECT_VERSION"
>
python 2.7
</pydev_property>
</pydev_project>
This diff is collapsed.
Click to expand it.
libraries/AP_Relay/AP_Relay.cpp
+
4
−
4
View file @
4ebde25a
...
@@ -32,28 +32,28 @@ const AP_Param::GroupInfo AP_Relay::var_info[] PROGMEM = {
...
@@ -32,28 +32,28 @@ const AP_Param::GroupInfo AP_Relay::var_info[] PROGMEM = {
// @DisplayName: First Relay Pin
// @DisplayName: First Relay Pin
// @Description: Digital pin number for first relay control. This is the pin used for camera control.
// @Description: Digital pin number for first relay control. This is the pin used for camera control.
// @User: Standard
// @User: Standard
// @Values: 13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
// @Values:
-1:Disabled,
13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
AP_GROUPINFO
(
"PIN"
,
0
,
AP_Relay
,
_pin
[
0
],
RELAY_PIN
),
AP_GROUPINFO
(
"PIN"
,
0
,
AP_Relay
,
_pin
[
0
],
RELAY_PIN
),
// @Param: PIN2
// @Param: PIN2
// @DisplayName: Second Relay Pin
// @DisplayName: Second Relay Pin
// @Description: Digital pin number for 2nd relay control.
// @Description: Digital pin number for 2nd relay control.
// @User: Standard
// @User: Standard
// @Values: 13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
// @Values:
-1:Disabled,
13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
AP_GROUPINFO
(
"PIN2"
,
1
,
AP_Relay
,
_pin
[
1
],
-
1
),
AP_GROUPINFO
(
"PIN2"
,
1
,
AP_Relay
,
_pin
[
1
],
-
1
),
// @Param: PIN3
// @Param: PIN3
// @DisplayName: Third Relay Pin
// @DisplayName: Third Relay Pin
// @Description: Digital pin number for 3rd relay control.
// @Description: Digital pin number for 3rd relay control.
// @User: Standard
// @User: Standard
// @Values: 13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
// @Values:
-1:Disabled,
13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
AP_GROUPINFO
(
"PIN3"
,
2
,
AP_Relay
,
_pin
[
2
],
-
1
),
AP_GROUPINFO
(
"PIN3"
,
2
,
AP_Relay
,
_pin
[
2
],
-
1
),
// @Param: PIN4
// @Param: PIN4
// @DisplayName: Fourth Relay Pin
// @DisplayName: Fourth Relay Pin
// @Description: Digital pin number for 4th relay control.
// @Description: Digital pin number for 4th relay control.
// @User: Standard
// @User: Standard
// @Values: 13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
// @Values:
-1:Disabled,
13:APM2 A9 pin,47:APM1 relay,50:Pixhawk FMU AUX1,51:Pixhawk FMU AUX2,52:Pixhawk FMU AUX3,53:Pixhawk FMU AUX4,54:Pixhawk FMU AUX5,55:Pixhawk FMU AUX6,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2
AP_GROUPINFO
(
"PIN4"
,
3
,
AP_Relay
,
_pin
[
3
],
-
1
),
AP_GROUPINFO
(
"PIN4"
,
3
,
AP_Relay
,
_pin
[
3
],
-
1
),
AP_GROUPEND
AP_GROUPEND
...
...
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