Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Relay: fixed Pixhawk relay pin numbers 

thanks to Craig for spotting this!
This commit is contained in:
Andrew Tridgell 2014-03-20 09:40:08 +11:00
parent 4257d8365c
commit 8202cf437b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Relay/AP_Relay.cpp
View File

@ -30,28 +30,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,54:Pixhawk FMU AUX1,55:Pixhawk FMU AUX2,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2 // @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
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,54:Pixhawk FMU AUX1,55:Pixhawk FMU AUX2,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2 // @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
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,54:Pixhawk FMU AUX1,55:Pixhawk FMU AUX2,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2 // @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
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,54:Pixhawk FMU AUX1,55:Pixhawk FMU AUX2,111:PX4 FMU Relay1,112:PX4 FMU Relay2,113:PX4IO Relay1,114:PX4IO Relay2,115:PX4IO ACC1,116:PX4IO ACC2 // @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
AP_GROUPINFO("PIN4", 3, AP_Relay, _pin[3], -1), AP_GROUPINFO("PIN4", 3, AP_Relay, _pin[3], -1),
AP_GROUPEND AP_GROUPEND