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

AP_BoardConfig: more changes for 32 bit servo mask

This commit is contained in:
Andrew Tridgell 2022-05-16 07:30:16 +10:00
parent f3ce44ef2c
commit 7ed8e8d3b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_BoardConfig/AP_BoardConfig.cpp
View File

@ -373,7 +373,7 @@ void AP_BoardConfig::init()
} }
// set default value for BRD_SAFETY_MASK // set default value for BRD_SAFETY_MASK
void AP_BoardConfig::set_default_safety_ignore_mask(uint16_t mask) void AP_BoardConfig::set_default_safety_ignore_mask(uint32_t mask)
{ {
#if HAL_HAVE_SAFETY_SWITCH #if HAL_HAVE_SAFETY_SWITCH
state.ignore_safety_channels.set_default(mask); state.ignore_safety_channels.set_default(mask);

4
libraries/AP_BoardConfig/AP_BoardConfig.h
View File

@ -100,7 +100,7 @@ public:
}; };
// set default value for BRD_SAFETY_MASK // set default value for BRD_SAFETY_MASK
void set_default_safety_ignore_mask(uint16_t mask); void set_default_safety_ignore_mask(uint32_t mask);
static enum px4_board_type get_board_type(void) { static enum px4_board_type get_board_type(void) {
#if AP_FEATURE_BOARD_DETECT #if AP_FEATURE_BOARD_DETECT
@ -141,7 +141,7 @@ public:
// return the value of BRD_SAFETY_MASK // return the value of BRD_SAFETY_MASK
uint16_t get_safety_mask(void) const { uint16_t get_safety_mask(void) const {
#if AP_FEATURE_BOARD_DETECT || defined(AP_FEATURE_BRD_PWM_COUNT_PARAM) #if AP_FEATURE_BOARD_DETECT || defined(AP_FEATURE_BRD_PWM_COUNT_PARAM)
return uint16_t(state.ignore_safety_channels.get()); return uint32_t(state.ignore_safety_channels.get());
#else #else
return 0; return 0;
#endif #endif