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

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

Browse Source
This commit is contained in:
Andrew Tridgell 2024-05-27 11:24:11 +10:00
parent a241b13f45
commit ab408bf3af
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_Frsky_Telem/AP_Frsky_Telem.cpp
View File

@ -66,15 +66,15 @@ bool AP_Frsky_Telem::init(bool use_external_data)
AP_HAL::UARTDriver *port; AP_HAL::UARTDriver *port;
if ((port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FrSky_D, 0))) { if ((port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FrSky_D, 0))) {
#if AP_FRSKY_D_TELEM_ENABLED #if AP_FRSKY_D_TELEM_ENABLED
_backend = new AP_Frsky_D(port); _backend = NEW_NOTHROW AP_Frsky_D(port);
#endif #endif
} else if ((port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FrSky_SPort, 0))) { } else if ((port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FrSky_SPort, 0))) {
#if AP_FRSKY_SPORT_TELEM_ENABLED #if AP_FRSKY_SPORT_TELEM_ENABLED
_backend = new AP_Frsky_SPort(port); _backend = NEW_NOTHROW AP_Frsky_SPort(port);
#endif #endif
} else if (use_external_data || (port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FrSky_SPort_Passthrough, 0))) { } else if (use_external_data || (port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FrSky_SPort_Passthrough, 0))) {
#if AP_FRSKY_SPORT_PASSTHROUGH_ENABLED #if AP_FRSKY_SPORT_PASSTHROUGH_ENABLED
_backend = new AP_Frsky_SPort_Passthrough(port, use_external_data, _frsky_parameters); _backend = NEW_NOTHROW AP_Frsky_SPort_Passthrough(port, use_external_data, _frsky_parameters);
#endif #endif
} }
@ -116,7 +116,7 @@ void AP_Frsky_Telem::try_create_singleton_for_external_data()
{ {
// try to allocate an AP_Frsky_Telem object only if we are disarmed // try to allocate an AP_Frsky_Telem object only if we are disarmed
if (!singleton && !hal.util->get_soft_armed()) { if (!singleton && !hal.util->get_soft_armed()) {
new AP_Frsky_Telem(); NEW_NOTHROW AP_Frsky_Telem();
// initialize the passthrough scheduler // initialize the passthrough scheduler
if (singleton) { if (singleton) {
singleton->init(true); singleton->init(true);