Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Mount: use NEW_NOTHROW for new(std::nothrow)

Browse Source
This commit is contained in:
Andrew Tridgell 2024-05-27 11:24:13 +10:00
parent e5a63eaad0
commit 28da263e16
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/AP_Mount/AP_Mount.cpp
View File

@ -72,20 +72,20 @@ void AP_Mount::init()
break; break;
#if HAL_MOUNT_SERVO_ENABLED #if HAL_MOUNT_SERVO_ENABLED
case Type::Servo: case Type::Servo:
_backends[instance] = new AP_Mount_Servo(*this, _params[instance], true, instance); _backends[instance] = NEW_NOTHROW AP_Mount_Servo(*this, _params[instance], true, instance);
_num_instances++; _num_instances++;
break; break;
#endif #endif
#if HAL_SOLO_GIMBAL_ENABLED #if HAL_SOLO_GIMBAL_ENABLED
case Type::SoloGimbal: case Type::SoloGimbal:
_backends[instance] = new AP_Mount_SoloGimbal(*this, _params[instance], instance); _backends[instance] = NEW_NOTHROW AP_Mount_SoloGimbal(*this, _params[instance], instance);
_num_instances++; _num_instances++;
break; break;
#endif // HAL_SOLO_GIMBAL_ENABLED #endif // HAL_SOLO_GIMBAL_ENABLED
#if HAL_MOUNT_ALEXMOS_ENABLED #if HAL_MOUNT_ALEXMOS_ENABLED
case Type::Alexmos: case Type::Alexmos:
_backends[instance] = new AP_Mount_Alexmos(*this, _params[instance], instance); _backends[instance] = NEW_NOTHROW AP_Mount_Alexmos(*this, _params[instance], instance);
_num_instances++; _num_instances++;
break; break;
#endif #endif
@ -93,7 +93,7 @@ void AP_Mount::init()
#if HAL_MOUNT_STORM32MAVLINK_ENABLED #if HAL_MOUNT_STORM32MAVLINK_ENABLED
// check for SToRM32 mounts using MAVLink protocol // check for SToRM32 mounts using MAVLink protocol
case Type::SToRM32: case Type::SToRM32:
_backends[instance] = new AP_Mount_SToRM32(*this, _params[instance], instance); _backends[instance] = NEW_NOTHROW AP_Mount_SToRM32(*this, _params[instance], instance);
_num_instances++; _num_instances++;
break; break;
#endif #endif
@ -101,7 +101,7 @@ void AP_Mount::init()
#if HAL_MOUNT_STORM32SERIAL_ENABLED #if HAL_MOUNT_STORM32SERIAL_ENABLED
// check for SToRM32 mounts using serial protocol // check for SToRM32 mounts using serial protocol
case Type::SToRM32_serial: case Type::SToRM32_serial:
_backends[instance] = new AP_Mount_SToRM32_serial(*this, _params[instance], instance, serial_instance); _backends[instance] = NEW_NOTHROW AP_Mount_SToRM32_serial(*this, _params[instance], instance, serial_instance);
_num_instances++; _num_instances++;
serial_instance++; serial_instance++;
break; break;
@ -110,7 +110,7 @@ void AP_Mount::init()
#if HAL_MOUNT_GREMSY_ENABLED #if HAL_MOUNT_GREMSY_ENABLED
// check for Gremsy mounts // check for Gremsy mounts
case Type::Gremsy: case Type::Gremsy:
_backends[instance] = new AP_Mount_Gremsy(*this, _params[instance], instance); _backends[instance] = NEW_NOTHROW AP_Mount_Gremsy(*this, _params[instance], instance);
_num_instances++; _num_instances++;
break; break;
#endif // HAL_MOUNT_GREMSY_ENABLED #endif // HAL_MOUNT_GREMSY_ENABLED
@ -118,7 +118,7 @@ void AP_Mount::init()
#if HAL_MOUNT_SERVO_ENABLED #if HAL_MOUNT_SERVO_ENABLED
// check for BrushlessPWM mounts (uses Servo backend) // check for BrushlessPWM mounts (uses Servo backend)
case Type::BrushlessPWM: case Type::BrushlessPWM:
_backends[instance] = new AP_Mount_Servo(*this, _params[instance], false, instance); _backends[instance] = NEW_NOTHROW AP_Mount_Servo(*this, _params[instance], false, instance);
_num_instances++; _num_instances++;
break; break;
#endif #endif
@ -126,7 +126,7 @@ void AP_Mount::init()
#if HAL_MOUNT_SIYI_ENABLED #if HAL_MOUNT_SIYI_ENABLED
// check for Siyi gimbal // check for Siyi gimbal
case Type::Siyi: case Type::Siyi:
_backends[instance] = new AP_Mount_Siyi(*this, _params[instance], instance, serial_instance); _backends[instance] = NEW_NOTHROW AP_Mount_Siyi(*this, _params[instance], instance, serial_instance);
_num_instances++; _num_instances++;
serial_instance++; serial_instance++;
break; break;
@ -135,7 +135,7 @@ void AP_Mount::init()
#if HAL_MOUNT_SCRIPTING_ENABLED #if HAL_MOUNT_SCRIPTING_ENABLED
// check for Scripting gimbal // check for Scripting gimbal
case Type::Scripting: case Type::Scripting:
_backends[instance] = new AP_Mount_Scripting(*this, _params[instance], instance); _backends[instance] = NEW_NOTHROW AP_Mount_Scripting(*this, _params[instance], instance);
_num_instances++; _num_instances++;
break; break;
#endif // HAL_MOUNT_SCRIPTING_ENABLED #endif // HAL_MOUNT_SCRIPTING_ENABLED
@ -143,7 +143,7 @@ void AP_Mount::init()
#if HAL_MOUNT_XACTI_ENABLED #if HAL_MOUNT_XACTI_ENABLED
// check for Xacti gimbal // check for Xacti gimbal
case Type::Xacti: case Type::Xacti:
_backends[instance] = new AP_Mount_Xacti(*this, _params[instance], instance); _backends[instance] = NEW_NOTHROW AP_Mount_Xacti(*this, _params[instance], instance);
_num_instances++; _num_instances++;
break; break;
#endif // HAL_MOUNT_XACTI_ENABLED #endif // HAL_MOUNT_XACTI_ENABLED
@ -151,7 +151,7 @@ void AP_Mount::init()
#if HAL_MOUNT_VIEWPRO_ENABLED #if HAL_MOUNT_VIEWPRO_ENABLED
// check for Xacti gimbal // check for Xacti gimbal
case Type::Viewpro: case Type::Viewpro:
_backends[instance] = new AP_Mount_Viewpro(*this, _params[instance], instance, serial_instance); _backends[instance] = NEW_NOTHROW AP_Mount_Viewpro(*this, _params[instance], instance, serial_instance);
_num_instances++; _num_instances++;
serial_instance++; serial_instance++;
break; break;

2
libraries/AP_Mount/AP_Mount_Xacti.cpp
View File

@ -49,7 +49,7 @@ AP_Mount_Xacti::AP_Mount_Xacti(class AP_Mount &frontend, class AP_Mount_Params &
void AP_Mount_Xacti::init() void AP_Mount_Xacti::init()
{ {
// instantiate parameter queue, return on failure so init fails // instantiate parameter queue, return on failure so init fails
_set_param_int32_queue = new ObjectArray<SetParamQueueItem>(XACTI_SET_PARAM_QUEUE_SIZE); _set_param_int32_queue = NEW_NOTHROW ObjectArray<SetParamQueueItem>(XACTI_SET_PARAM_QUEUE_SIZE);
if (_set_param_int32_queue == nullptr) { if (_set_param_int32_queue == nullptr) {
GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "%s init failed", send_text_prefix); GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "%s init failed", send_text_prefix);
return; return;