aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Periph: use CopyFieldsFrom in CAN parameters

Browse Source
This commit is contained in:
Peter Barker 2023-04-14 10:19:01 +10:00 committed by Andrew Tridgell
parent 73011c81fd
commit eb2a4a68c5
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Tools/AP_Periph/Parameters.cpp
View File

@ -105,37 +105,23 @@ const AP_Param::Info AP_Periph_FW::var_info[] = {
GARRAY(can_protocol, 0, "CAN_PROTOCOL", AP_CANManager::Driver_Type_DroneCAN), GARRAY(can_protocol, 0, "CAN_PROTOCOL", AP_CANManager::Driver_Type_DroneCAN),
// @Param: CAN2_BAUDRATE // @Param: CAN2_BAUDRATE
// @CopyFieldsFrom: CAN_BAUDRATE
// @DisplayName: Bitrate of CAN2 interface // @DisplayName: Bitrate of CAN2 interface
// @Description: Bit rate can be set up to from 10000 to 1000000
// @Range: 10000 1000000
// @User: Advanced
// @RebootRequired: True
GARRAY(can_baudrate, 1, "CAN2_BAUDRATE", 1000000), GARRAY(can_baudrate, 1, "CAN2_BAUDRATE", 1000000),
// @Param: CAN2_PROTOCOL // @Param: CAN2_PROTOCOL
// @DisplayName: Enable use of specific protocol to be used on this port // @CopyFieldsFrom: CAN_PROTOCOL
// @Description: Enabling this option starts selected protocol that will use this virtual driver. At least one CAN port must be UAVCAN or else CAN1 gets set to UAVCAN
// @Values: 0:Disabled,1:UAVCAN,4:PiccoloCAN,5:CANTester,6:EFI_NWPMU,7:USD1,8:KDECAN
// @User: Advanced
// @RebootRequired: True
GARRAY(can_protocol, 1, "CAN2_PROTOCOL", AP_CANManager::Driver_Type_DroneCAN), GARRAY(can_protocol, 1, "CAN2_PROTOCOL", AP_CANManager::Driver_Type_DroneCAN),
#endif #endif
#if HAL_NUM_CAN_IFACES >= 3 #if HAL_NUM_CAN_IFACES >= 3
// @Param: CAN3_BAUDRATE // @Param: CAN3_BAUDRATE
// @DisplayName: Bitrate of CAN3 interface // @DisplayName: Bitrate of CAN3 interface
// @Description: Bit rate can be set up to from 10000 to 1000000 // @CopyFieldsFrom: CAN_BAUDRATE
// @Range: 10000 1000000
// @User: Advanced
// @RebootRequired: True
GARRAY(can_baudrate, 2, "CAN3_BAUDRATE", 1000000), GARRAY(can_baudrate, 2, "CAN3_BAUDRATE", 1000000),
// @Param: CAN3_PROTOCOL // @Param: CAN3_PROTOCOL
// @DisplayName: Enable use of specific protocol to be used on this port // @CopyFieldsFrom: CAN_PROTOCOL
// @Description: Enabling this option starts selected protocol that will use this virtual driver. At least one CAN port must be UAVCAN or else CAN1 gets set to UAVCAN
// @Values: 0:Disabled,1:UAVCAN,4:PiccoloCAN,5:CANTester,6:EFI_NWPMU,7:USD1,8:KDECAN
// @User: Advanced
// @RebootRequired: True
GARRAY(can_protocol, 2, "CAN3_PROTOCOL", AP_CANManager::Driver_Type_DroneCAN), GARRAY(can_protocol, 2, "CAN3_PROTOCOL", AP_CANManager::Driver_Type_DroneCAN),
#endif #endif
@ -158,11 +144,9 @@ const AP_Param::Info AP_Periph_FW::var_info[] = {
#if HAL_NUM_CAN_IFACES >= 2 #if HAL_NUM_CAN_IFACES >= 2
// @Param: CAN2_FDBAUDRATE // @Param: CAN2_FDBAUDRATE
// @CopyFieldsFrom: CAN_FDBAUDRATE
// @DisplayName: Set up bitrate for data section on CAN2 // @DisplayName: Set up bitrate for data section on CAN2
// @Description: This sets the bitrate for the data section of CAN2. // @Description: This sets the bitrate for the data section of CAN2.
// @Values: 1:1M, 2:2M, 4:4M, 5:5M, 8:8M
// @User: Advanced
// @RebootRequired: True
GARRAY(can_fdbaudrate, 1, "CAN2_FDBAUDRATE", HAL_CANFD_SUPPORTED), GARRAY(can_fdbaudrate, 1, "CAN2_FDBAUDRATE", HAL_CANFD_SUPPORTED),
#endif #endif
#endif #endif