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

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

This commit is contained in:
Andrew Tridgell 2024-05-27 11:24:13 +10:00
parent 4d5aa1b8e3
commit 530cbf1eca
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
libraries/AP_Notify/AP_Notify.cpp
View File

@ -289,126 +289,126 @@ void AP_Notify::add_backends(void)
// select the most appropriate built in LED driver type // select the most appropriate built in LED driver type
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO2 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO2
ADD_BACKEND(new Led_Sysfs("rgb_led0", "rgb_led2", "rgb_led1")); ADD_BACKEND(NEW_NOTHROW Led_Sysfs("rgb_led0", "rgb_led2", "rgb_led1"));
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_EDGE #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_EDGE
ADD_BACKEND(new RCOutputRGBLedInverted(12, 13, 14)); ADD_BACKEND(NEW_NOTHROW RCOutputRGBLedInverted(12, 13, 14));
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BH #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BH
ADD_BACKEND(new RCOutputRGBLed(HAL_RCOUT_RGBLED_RED, HAL_RCOUT_RGBLED_GREEN, HAL_RCOUT_RGBLED_BLUE)); ADD_BACKEND(NEW_NOTHROW RCOutputRGBLed(HAL_RCOUT_RGBLED_RED, HAL_RCOUT_RGBLED_GREEN, HAL_RCOUT_RGBLED_BLUE));
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO
ADD_BACKEND(new DiscoLED()); ADD_BACKEND(NEW_NOTHROW DiscoLED());
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIGATOR #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIGATOR
ADD_BACKEND(new NavigatorLED()); ADD_BACKEND(NEW_NOTHROW NavigatorLED());
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1
ADD_BACKEND(new AP_BoardLED2()); ADD_BACKEND(NEW_NOTHROW AP_BoardLED2());
#endif #endif
#endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX #endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#if AP_NOTIFY_EXTERNALLED_ENABLED #if AP_NOTIFY_EXTERNALLED_ENABLED
ADD_BACKEND(new ExternalLED()); // despite the name this is a built in set of onboard LED's ADD_BACKEND(NEW_NOTHROW ExternalLED()); // despite the name this is a built in set of onboard LED's
#endif #endif
#if defined(HAL_HAVE_PIXRACER_LED) #if defined(HAL_HAVE_PIXRACER_LED)
ADD_BACKEND(new PixRacerLED()); ADD_BACKEND(NEW_NOTHROW PixRacerLED());
#elif (defined(HAL_GPIO_A_LED_PIN) && defined(HAL_GPIO_B_LED_PIN) && defined(HAL_GPIO_C_LED_PIN)) #elif (defined(HAL_GPIO_A_LED_PIN) && defined(HAL_GPIO_B_LED_PIN) && defined(HAL_GPIO_C_LED_PIN))
#if AP_NOTIFY_VRBOARD_LED_ENABLED #if AP_NOTIFY_VRBOARD_LED_ENABLED
ADD_BACKEND(new VRBoard_LED()); ADD_BACKEND(NEW_NOTHROW VRBoard_LED());
#else #else
ADD_BACKEND(new AP_BoardLED()); ADD_BACKEND(NEW_NOTHROW AP_BoardLED());
#endif #endif
#elif (defined(HAL_GPIO_A_LED_PIN) && defined(HAL_GPIO_B_LED_PIN)) #elif (defined(HAL_GPIO_A_LED_PIN) && defined(HAL_GPIO_B_LED_PIN))
ADD_BACKEND(new AP_BoardLED2()); ADD_BACKEND(NEW_NOTHROW AP_BoardLED2());
#endif #endif
break; break;
#if AP_NOTIFY_TOSHIBALED_ENABLED #if AP_NOTIFY_TOSHIBALED_ENABLED
case Notify_LED_ToshibaLED_I2C_Internal: case Notify_LED_ToshibaLED_I2C_Internal:
ADD_BACKEND(new ToshibaLED_I2C(TOSHIBA_LED_I2C_BUS_INTERNAL)); ADD_BACKEND(NEW_NOTHROW ToshibaLED_I2C(TOSHIBA_LED_I2C_BUS_INTERNAL));
break; break;
case Notify_LED_ToshibaLED_I2C_External: case Notify_LED_ToshibaLED_I2C_External:
ADD_BACKEND(new ToshibaLED_I2C(TOSHIBA_LED_I2C_BUS_EXTERNAL)); ADD_BACKEND(NEW_NOTHROW ToshibaLED_I2C(TOSHIBA_LED_I2C_BUS_EXTERNAL));
break; break;
#endif #endif
#if AP_NOTIFY_NCP5623_ENABLED #if AP_NOTIFY_NCP5623_ENABLED
case Notify_LED_NCP5623_I2C_External: case Notify_LED_NCP5623_I2C_External:
FOREACH_I2C_EXTERNAL(b) { FOREACH_I2C_EXTERNAL(b) {
ADD_BACKEND(new NCP5623(b)); ADD_BACKEND(NEW_NOTHROW NCP5623(b));
} }
break; break;
case Notify_LED_NCP5623_I2C_Internal: case Notify_LED_NCP5623_I2C_Internal:
FOREACH_I2C_INTERNAL(b) { FOREACH_I2C_INTERNAL(b) {
ADD_BACKEND(new NCP5623(b)); ADD_BACKEND(NEW_NOTHROW NCP5623(b));
} }
break; break;
#endif #endif
#if AP_NOTIFY_PCA9685_ENABLED #if AP_NOTIFY_PCA9685_ENABLED
case Notify_LED_PCA9685LED_I2C_External: case Notify_LED_PCA9685LED_I2C_External:
ADD_BACKEND(new PCA9685LED_I2C()); ADD_BACKEND(NEW_NOTHROW PCA9685LED_I2C());
break; break;
#endif #endif
#if AP_NOTIFY_NEOPIXEL_ENABLED #if AP_NOTIFY_NEOPIXEL_ENABLED
case Notify_LED_NeoPixel: case Notify_LED_NeoPixel:
case Notify_LED_NeoPixelRGB: case Notify_LED_NeoPixelRGB:
ADD_BACKEND(new NeoPixel()); ADD_BACKEND(NEW_NOTHROW NeoPixel());
break; break;
#endif #endif
#if AP_NOTIFY_PROFILED_ENABLED #if AP_NOTIFY_PROFILED_ENABLED
case Notify_LED_ProfiLED: case Notify_LED_ProfiLED:
ADD_BACKEND(new ProfiLED()); ADD_BACKEND(NEW_NOTHROW ProfiLED());
break; break;
#endif #endif
#if AP_NOTIFY_PROFILED_SPI_ENABLED #if AP_NOTIFY_PROFILED_SPI_ENABLED
case Notify_LED_ProfiLED_SPI: case Notify_LED_ProfiLED_SPI:
ADD_BACKEND(new ProfiLED_SPI()); ADD_BACKEND(NEW_NOTHROW ProfiLED_SPI());
break; break;
#endif #endif
#if AP_NOTIFY_OREOLED_ENABLED #if AP_NOTIFY_OREOLED_ENABLED
case Notify_LED_OreoLED: case Notify_LED_OreoLED:
if (_oreo_theme) { if (_oreo_theme) {
ADD_BACKEND(new OreoLED_I2C(0, _oreo_theme)); ADD_BACKEND(NEW_NOTHROW OreoLED_I2C(0, _oreo_theme));
} }
break; break;
#endif #endif
#if AP_NOTIFY_DRONECAN_LED_ENABLED #if AP_NOTIFY_DRONECAN_LED_ENABLED
case Notify_LED_DroneCAN: case Notify_LED_DroneCAN:
ADD_BACKEND(new DroneCAN_RGB_LED()); ADD_BACKEND(NEW_NOTHROW DroneCAN_RGB_LED());
break; break;
#endif // AP_NOTIFY_DRONECAN_LED_ENABLED #endif // AP_NOTIFY_DRONECAN_LED_ENABLED
#if AP_NOTIFY_SCRIPTING_LED_ENABLED #if AP_NOTIFY_SCRIPTING_LED_ENABLED
case Notify_LED_Scripting: case Notify_LED_Scripting:
ADD_BACKEND(new ScriptingLED()); ADD_BACKEND(NEW_NOTHROW ScriptingLED());
break; break;
#endif #endif
#if AP_NOTIFY_DSHOT_LED_ENABLED #if AP_NOTIFY_DSHOT_LED_ENABLED
case Notify_LED_DShot: case Notify_LED_DShot:
ADD_BACKEND(new DShotLED()); ADD_BACKEND(NEW_NOTHROW DShotLED());
break; break;
#endif #endif
#if AP_NOTIFY_LP5562_ENABLED #if AP_NOTIFY_LP5562_ENABLED
case Notify_LED_LP5562_I2C_External: case Notify_LED_LP5562_I2C_External:
FOREACH_I2C_EXTERNAL(b) { FOREACH_I2C_EXTERNAL(b) {
ADD_BACKEND(new LP5562(b, 0x30)); ADD_BACKEND(NEW_NOTHROW LP5562(b, 0x30));
} }
break; break;
case Notify_LED_LP5562_I2C_Internal: case Notify_LED_LP5562_I2C_Internal:
FOREACH_I2C_INTERNAL(b) { FOREACH_I2C_INTERNAL(b) {
ADD_BACKEND(new LP5562(b, 0x30)); ADD_BACKEND(NEW_NOTHROW LP5562(b, 0x30));
} }
break; break;
#endif #endif
#if AP_NOTIFY_IS31FL3195_ENABLED #if AP_NOTIFY_IS31FL3195_ENABLED
case Notify_LED_IS31FL3195_I2C_External: case Notify_LED_IS31FL3195_I2C_External:
FOREACH_I2C_EXTERNAL(b) { FOREACH_I2C_EXTERNAL(b) {
ADD_BACKEND(new IS31FL3195(b, 0x54)); ADD_BACKEND(NEW_NOTHROW IS31FL3195(b, 0x54));
} }
break; break;
case Notify_LED_IS31FL3195_I2C_Internal: case Notify_LED_IS31FL3195_I2C_Internal:
FOREACH_I2C_INTERNAL(b) { FOREACH_I2C_INTERNAL(b) {
ADD_BACKEND(new IS31FL3195(b, 0x54)); ADD_BACKEND(NEW_NOTHROW IS31FL3195(b, 0x54));
} }
break; break;
#endif #endif
#if AP_NOTIFY_DISCRETE_RGB_ENABLED #if AP_NOTIFY_DISCRETE_RGB_ENABLED
case Notify_LED_DiscreteRGB: case Notify_LED_DiscreteRGB:
ADD_BACKEND(new DiscreteRGBLed(DISCRETE_RGB_RED_PIN, ADD_BACKEND(NEW_NOTHROW DiscreteRGBLed(DISCRETE_RGB_RED_PIN,
DISCRETE_RGB_GREEN_PIN, DISCRETE_RGB_GREEN_PIN,
DISCRETE_RGB_BLUE_PIN, DISCRETE_RGB_BLUE_PIN,
DISCRETE_RGB_POLARITY)); DISCRETE_RGB_POLARITY));
@ -419,14 +419,14 @@ void AP_Notify::add_backends(void)
#if HAL_DISPLAY_ENABLED #if HAL_DISPLAY_ENABLED
// Always try and add a display backend // Always try and add a display backend
ADD_BACKEND(new Display()); ADD_BACKEND(NEW_NOTHROW Display());
#endif #endif
// ChibiOS noise makers // ChibiOS noise makers
#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
ADD_BACKEND(new Buzzer()); ADD_BACKEND(NEW_NOTHROW Buzzer());
#if AP_NOTIFY_TONEALARM_ENABLED #if AP_NOTIFY_TONEALARM_ENABLED
ADD_BACKEND(new AP_ToneAlarm()); ADD_BACKEND(NEW_NOTHROW AP_ToneAlarm());
#endif #endif
// Linux noise makers // Linux noise makers
@ -444,17 +444,17 @@ void AP_Notify::add_backends(void)
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI || \ #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI || \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_POCKET || \ CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_POCKET || \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1 CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1
ADD_BACKEND(new Buzzer()); ADD_BACKEND(NEW_NOTHROW Buzzer());
#else // other linux #else // other linux
ADD_BACKEND(new AP_ToneAlarm()); ADD_BACKEND(NEW_NOTHROW AP_ToneAlarm());
#endif #endif
#elif CONFIG_HAL_BOARD == HAL_BOARD_SITL #elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
ADD_BACKEND(new AP_ToneAlarm()); ADD_BACKEND(NEW_NOTHROW AP_ToneAlarm());
ADD_BACKEND(new Buzzer()); ADD_BACKEND(NEW_NOTHROW Buzzer());
#ifdef WITH_SITL_RGBLED #ifdef WITH_SITL_RGBLED
ADD_BACKEND(new SITL_SFML_LED()); ADD_BACKEND(NEW_NOTHROW SITL_SFML_LED());
#endif #endif
#endif // Noise makers #endif // Noise makers

2
libraries/AP_Notify/Display_SH1106_I2C.cpp
View File

@ -31,7 +31,7 @@ Display_SH1106_I2C::~Display_SH1106_I2C()
Display_SH1106_I2C *Display_SH1106_I2C::probe(AP_HAL::OwnPtr<AP_HAL::Device> dev) Display_SH1106_I2C *Display_SH1106_I2C::probe(AP_HAL::OwnPtr<AP_HAL::Device> dev)
{ {
Display_SH1106_I2C *driver = new Display_SH1106_I2C(std::move(dev)); Display_SH1106_I2C *driver = NEW_NOTHROW Display_SH1106_I2C(std::move(dev));
if (!driver || !driver->hw_init()) { if (!driver || !driver->hw_init()) {
delete driver; delete driver;
return nullptr; return nullptr;

4
libraries/AP_Notify/Display_SITL.cpp
View File

@ -33,7 +33,7 @@ Display_SITL::~Display_SITL()
Display_SITL *Display_SITL::probe() Display_SITL *Display_SITL::probe()
{ {
Display_SITL *driver = new Display_SITL(); Display_SITL *driver = NEW_NOTHROW Display_SITL();
if (!driver || !driver->hw_init()) { if (!driver || !driver->hw_init()) {
delete driver; delete driver;
return nullptr; return nullptr;
@ -46,7 +46,7 @@ void Display_SITL::update_thread(void)
{ {
{ {
WITH_SEMAPHORE(AP::notify().sf_window_mutex); WITH_SEMAPHORE(AP::notify().sf_window_mutex);
w = new sf::RenderWindow(sf::VideoMode(COLUMNS*SCALE, ROWS*SCALE), "Display"); w = NEW_NOTHROW sf::RenderWindow(sf::VideoMode(COLUMNS*SCALE, ROWS*SCALE), "Display");
} }
if (!w) { if (!w) {
AP_HAL::panic("Unable to create Display_SITL window"); AP_HAL::panic("Unable to create Display_SITL window");

2
libraries/AP_Notify/Display_SSD1306_I2C.cpp
View File

@ -32,7 +32,7 @@ Display_SSD1306_I2C::~Display_SSD1306_I2C()
Display_SSD1306_I2C *Display_SSD1306_I2C::probe(AP_HAL::OwnPtr<AP_HAL::Device> dev) Display_SSD1306_I2C *Display_SSD1306_I2C::probe(AP_HAL::OwnPtr<AP_HAL::Device> dev)
{ {
Display_SSD1306_I2C *driver = new Display_SSD1306_I2C(std::move(dev)); Display_SSD1306_I2C *driver = NEW_NOTHROW Display_SSD1306_I2C(std::move(dev));
if (!driver || !driver->hw_init()) { if (!driver || !driver->hw_init()) {
delete driver; delete driver;
return nullptr; return nullptr;

2
libraries/AP_Notify/ProfiLED.cpp
View File

@ -75,7 +75,7 @@ ProfiLED_SPI::ProfiLED_SPI() :
bool ProfiLED_SPI::init() bool ProfiLED_SPI::init()
{ {
num_leds = pNotify->get_led_len() + 1; // for some reason we have to send an additional LED data num_leds = pNotify->get_led_len() + 1; // for some reason we have to send an additional LED data
rgb = new ProfiLED_SPI::RGB[num_leds]; rgb = NEW_NOTHROW ProfiLED_SPI::RGB[num_leds];
if (!rgb) { if (!rgb) {
return false; return false;
} }

4
libraries/AP_Notify/SITL_SFML_LED.cpp
View File

@ -126,7 +126,7 @@ void SITL_SFML_LED::update_serial_LEDs()
if (!layout_size(layout, xsize, ysize)) { if (!layout_size(layout, xsize, ysize)) {
return; return;
} }
w = new sf::RenderWindow(sf::VideoMode(xsize*(serialLED_size+1), ysize*(serialLED_size+1)), "SerialLED"); w = NEW_NOTHROW sf::RenderWindow(sf::VideoMode(xsize*(serialLED_size+1), ysize*(serialLED_size+1)), "SerialLED");
if (!w) { if (!w) {
return; return;
} }
@ -150,7 +150,7 @@ void SITL_SFML_LED::update_serial_LEDs()
uint8_t *rgb = &sitl->led.rgb[chan][led].rgb[0]; uint8_t *rgb = &sitl->led.rgb[chan][led].rgb[0];
if (leds[chan][led] == nullptr) { if (leds[chan][led] == nullptr) {
leds[chan][led] = new sf::RectangleShape(sf::Vector2f(serialLED_size, serialLED_size)); leds[chan][led] = NEW_NOTHROW sf::RectangleShape(sf::Vector2f(serialLED_size, serialLED_size));
if (!leds[chan][led]) { if (!leds[chan][led]) {
return; return;
} }