Skip to content

Commit 3a3a2cc

Browse files
committed
Add setup for Mac with new build instructions
1 parent 84fc0c1 commit 3a3a2cc

File tree

15 files changed

+107
-25
lines changed

15 files changed

+107
-25
lines changed

AirLib/include/vehicles/multirotor/api/MultirotorApiBase.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ namespace airlib
8181
virtual void resetImplementation() override;
8282

8383
public: //these APIs uses above low level APIs
84-
virtual ~MultirotorApiBase() = default;
84+
virtual ~MultirotorApiBase();
8585

8686
/************************* high level move APIs *********************************/
8787
//return value of these function is true if command was completed without interruption or timeouts

AirLib/include/vehicles/multirotor/firmwares/arducopter/ArduCopterApi.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ namespace airlib
4242
connect(); // Should we try catching exceptions here?
4343
}
4444

45-
~ArduCopterApi()
46-
{
47-
closeConnections();
48-
}
45+
virtual ~ArduCopterApi();
46+
4947

5048
public:
5149
virtual void resetImplementation() override

AirLib/include/vehicles/multirotor/firmwares/mavlink/ArduCopterSoloApi.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ namespace airlib
1313
class ArduCopterSoloApi : public MavLinkMultirotorApi
1414
{
1515
public:
16-
virtual ~ArduCopterSoloApi()
17-
{
18-
closeAllConnection();
19-
}
16+
virtual ~ArduCopterSoloApi();
2017

2118
virtual void update()
2219
{

AirLib/include/vehicles/multirotor/firmwares/mavlink/MavLinkMultirotorApi.hpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,7 @@ namespace airlib
4646
class MavLinkMultirotorApi : public MultirotorApiBase
4747
{
4848
public: //methods
49-
virtual ~MavLinkMultirotorApi()
50-
{
51-
closeAllConnection();
52-
if (this->connect_thread_.joinable()) {
53-
this->connect_thread_.join();
54-
}
55-
if (this->telemetry_thread_.joinable()) {
56-
this->telemetry_thread_.join();
57-
}
58-
}
49+
virtual ~MavLinkMultirotorApi();
5950

6051
//non-base interface specific to MavLinKDroneController
6152
void initialize(const AirSimSettings::MavLinkConnectionInfo& connection_info, const SensorCollection* sensors, bool is_simulation)

AirLib/include/vehicles/multirotor/firmwares/simple_flight/SimpleFlightApi.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ namespace airlib
4646
firmware_.reset(new simple_flight::Firmware(&params_, board_.get(), comm_link_.get(), estimator_.get()));
4747
}
4848

49+
virtual ~SimpleFlightApi();
50+
4951
public: //VehicleApiBase implementation
5052
virtual void resetImplementation() override
5153
{

AirLib/src/vehicles/multirotor/api/MultirotorApiBase.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ namespace msr
1515
{
1616
namespace airlib
1717
{
18+
MultirotorApiBase::~MultirotorApiBase()
19+
{
20+
//no default action
21+
//derived classes should override this method to do cleanup
22+
}
1823

1924
void MultirotorApiBase::resetImplementation()
2025
{
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#include "vehicles/multirotor/firmwares/arducopter/ArduCopterApi.hpp"
2+
3+
namespace msr
4+
{
5+
namespace airlib
6+
{
7+
ArduCopterApi::~ArduCopterApi()
8+
{
9+
closeConnections();
10+
}
11+
} // namespace airlib
12+
} // namespace msr
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#include "vehicles/multirotor/firmwares/mavlink/ArduCopterSoloApi.hpp"
2+
3+
namespace msr
4+
{
5+
namespace airlib
6+
{
7+
ArduCopterSoloApi::~ArduCopterSoloApi()
8+
{
9+
closeAllConnection();
10+
}
11+
} // namespace airlib
12+
} // namespace msr
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#include "vehicles/multirotor/firmwares/mavlink/MavLinkMultirotorApi.hpp"
2+
3+
namespace msr
4+
{
5+
namespace airlib
6+
{
7+
MavLinkMultirotorApi::~MavLinkMultirotorApi()
8+
{
9+
closeAllConnection();
10+
if (this->connect_thread_.joinable()) {
11+
this->connect_thread_.join();
12+
}
13+
if (this->telemetry_thread_.joinable()) {
14+
this->telemetry_thread_.join();
15+
}
16+
}
17+
} // namespace airlib
18+
} // namespace msr
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#include "vehicles/multirotor/firmwares/simple_flight/SimpleFlightApi.hpp"
2+
3+
namespace msr
4+
{
5+
namespace airlib
6+
{
7+
SimpleFlightApi::~SimpleFlightApi()
8+
{
9+
10+
}
11+
} // namespace airlib
12+
} // namespace msr

0 commit comments

Comments
 (0)