From ff9460d8352af55d5fed05d64330a2bb2adef613 Mon Sep 17 00:00:00 2001 From: Peter Barker <pbarker@barker.dropbear.id.au> Date: Wed, 20 Feb 2019 17:33:16 +1100 Subject: [PATCH] AP_Radio: correct singleton naming, and thus SkyViper build --- libraries/AP_Radio/AP_Radio.cpp | 2 +- libraries/AP_Radio/AP_Radio_cc2500.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Radio/AP_Radio.cpp b/libraries/AP_Radio/AP_Radio.cpp index 40b8e4bfd8..642e351092 100644 --- a/libraries/AP_Radio/AP_Radio.cpp +++ b/libraries/AP_Radio/AP_Radio.cpp @@ -134,7 +134,7 @@ const AP_Param::GroupInfo AP_Radio::var_info[] = { AP_GROUPEND }; -AP_Radio *AP_Radio::_instance; +AP_Radio *AP_Radio::_singleton; // constructor AP_Radio::AP_Radio(void) diff --git a/libraries/AP_Radio/AP_Radio_cc2500.h b/libraries/AP_Radio/AP_Radio_cc2500.h index f4d1cbb28d..2bf51d2097 100644 --- a/libraries/AP_Radio/AP_Radio_cc2500.h +++ b/libraries/AP_Radio/AP_Radio_cc2500.h @@ -76,7 +76,7 @@ public: private: AP_HAL::OwnPtr<AP_HAL::SPIDevice> dev; - static AP_Radio_cc2500 *radio_instance; + static AP_Radio_cc2500 *radio_singleton; static thread_t *_irq_handler_ctx; static virtual_timer_t timeout_vt;