Browse Source

AP_ADSB: added singleton interface

master
Andrew Tridgell 5 years ago
parent
commit
8650229ad4
  1. 18
      libraries/AP_ADSB/AP_ADSB.cpp
  2. 19
      libraries/AP_ADSB/AP_ADSB.h

18
libraries/AP_ADSB/AP_ADSB.cpp

@ -50,6 +50,8 @@
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
AP_ADSB *AP_ADSB::_singleton;
// table of user settable parameters // table of user settable parameters
const AP_Param::GroupInfo AP_ADSB::var_info[] = { const AP_Param::GroupInfo AP_ADSB::var_info[] = {
// @Param: ENABLE // @Param: ENABLE
@ -159,6 +161,16 @@ const AP_Param::GroupInfo AP_ADSB::var_info[] = {
AP_GROUPEND AP_GROUPEND
}; };
// constructor
AP_ADSB::AP_ADSB()
{
AP_Param::setup_object_defaults(this, var_info);
if (_singleton != nullptr) {
AP_HAL::panic("AP_ADSB must be singleton");
}
_singleton = this;
}
/* /*
* Initialize variables and allocate memory for array * Initialize variables and allocate memory for array
*/ */
@ -940,3 +952,9 @@ void AP_ADSB::write_log(const adsb_vehicle_t &vehicle)
}; };
AP::logger().WriteBlock(&pkt, sizeof(pkt)); AP::logger().WriteBlock(&pkt, sizeof(pkt));
} }
AP_ADSB *AP::ADSB()
{
return AP_ADSB::get_singleton();
}

19
libraries/AP_ADSB/AP_ADSB.h

@ -29,10 +29,8 @@
class AP_ADSB { class AP_ADSB {
public: public:
AP_ADSB() // constructor
{ AP_ADSB();
AP_Param::setup_object_defaults(this, var_info);
}
/* Do not allow copies */ /* Do not allow copies */
AP_ADSB(const AP_ADSB &other) = delete; AP_ADSB(const AP_ADSB &other) = delete;
@ -88,7 +86,14 @@ public:
// confirm a value is a valid callsign // confirm a value is a valid callsign
static bool is_valid_callsign(uint16_t octal) WARN_IF_UNUSED; static bool is_valid_callsign(uint16_t octal) WARN_IF_UNUSED;
// get singleton instance
static AP_ADSB *get_singleton(void) {
return _singleton;
}
private: private:
static AP_ADSB *_singleton;
// initialize _vehicle_list // initialize _vehicle_list
void init(); void init();
@ -202,4 +207,10 @@ private:
SPECIAL_ONLY = 1, SPECIAL_ONLY = 1,
ALL = 2 ALL = 2
}; };
};
namespace AP {
AP_ADSB *ADSB();
}; };

Loading…
Cancel
Save