Skip to content

Commit

Permalink
example: DronecodeSDK -> MAVSDK
Browse files Browse the repository at this point in the history
  • Loading branch information
julianoes committed Jun 18, 2019
1 parent eb698d9 commit 4acbe29
Show file tree
Hide file tree
Showing 22 changed files with 63 additions and 63 deletions.
8 changes: 4 additions & 4 deletions example/battery/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(battery
battery.cpp
)

target_link_libraries(battery
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk_mavlink_passthrough
DronecodeSDK::mavsdk
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk_mavlink_passthrough
MAVSDK::mavsdk
)
2 changes: 1 addition & 1 deletion example/battery/battery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static void usage(const std::string &bin_name);

int main(int argc, char **argv)
{
DronecodeSDK dc;
Mavsdk dc;
std::string connection_url;
ConnectionResult connection_result;

Expand Down
6 changes: 3 additions & 3 deletions example/calibrate/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(calibrate
calibrate.cpp
)

target_link_libraries(calibrate
DronecodeSDK::mavsdk_calibration
DronecodeSDK::mavsdk
MAVSDK::mavsdk_calibration
MAVSDK::mavsdk
${CMAKE_THREAD_LIBS_INIT}
)

6 changes: 3 additions & 3 deletions example/calibrate/calibrate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using namespace mavsdk;

bool are_arguments_valid(int argc, char **argv);
void print_usage(const std::string &);
void wait_until_discover(DronecodeSDK &);
void wait_until_discover(Mavsdk &);
void calibrate_accelerometer(Calibration &);
Calibration::calibration_callback_t create_calibration_callback(std::promise<void> &);
void calibrate_gyro(Calibration &);
Expand All @@ -22,7 +22,7 @@ int main(int argc, char **argv)
return 1;
}

DronecodeSDK dc;
Mavsdk dc;

const auto connection_url = argv[1];
const auto connection_result = dc.add_any_connection(connection_url);
Expand Down Expand Up @@ -58,7 +58,7 @@ void print_usage(const std::string &bin_name)
<< "For example, to connect to the simulator use URL: udp://:14540" << std::endl;
}

void wait_until_discover(DronecodeSDK &dc)
void wait_until_discover(Mavsdk &dc)
{
std::cout << "Waiting to discover system..." << std::endl;
std::promise<void> discover_promise;
Expand Down
10 changes: 5 additions & 5 deletions example/fly_mission/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(fly_mission
fly_mission.cpp
)

target_link_libraries(fly_mission
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk_mission
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk
MAVSDK::mavsdk_action
MAVSDK::mavsdk_mission
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk
${CMAKE_THREAD_LIBS_INIT}
)
2 changes: 1 addition & 1 deletion example/fly_mission/fly_mission.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void usage(std::string bin_name)

int main(int argc, char **argv)
{
DronecodeSDK dc;
Mavsdk dc;

{
auto prom = std::make_shared<std::promise<void>>();
Expand Down
10 changes: 5 additions & 5 deletions example/fly_multiple_drones/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(fly_multiple_drones
fly_multiple_drones.cpp
)

target_link_libraries(fly_multiple_drones
DronecodeSDK::mavsdk
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk_mission
DronecodeSDK::mavsdk_action
MAVSDK::mavsdk
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk_mission
MAVSDK::mavsdk_action
${CMAKE_THREAD_LIBS_INIT}
)
2 changes: 1 addition & 1 deletion example/fly_multiple_drones/fly_multiple_drones.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ int main(int argc, char *argv[])
return 1;
}

DronecodeSDK dc;
Mavsdk dc;

// Half of argc is how many udp ports is being used
int total_ports_used = argc / 2;
Expand Down
10 changes: 5 additions & 5 deletions example/fly_qgc_mission/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(fly_qgc_mission
fly_qgc_mission.cpp
)

target_link_libraries(fly_qgc_mission
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk_mission
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk
MAVSDK::mavsdk_action
MAVSDK::mavsdk_mission
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk
)
2 changes: 1 addition & 1 deletion example/fly_qgc_mission/fly_qgc_mission.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void usage(std::string bin_name)

int main(int argc, char **argv)
{
DronecodeSDK dc;
Mavsdk dc;
std::string connection_url;
ConnectionResult connection_result;

Expand Down
10 changes: 5 additions & 5 deletions example/follow_me/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(follow_me
follow_me.cpp
fake_location_provider.cpp
)

target_link_libraries(follow_me
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk_follow_me
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk
MAVSDK::mavsdk_action
MAVSDK::mavsdk_follow_me
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk
${CMAKE_THREAD_LIBS_INIT}
)
2 changes: 1 addition & 1 deletion example/follow_me/follow_me.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void usage(std::string bin_name)

int main(int argc, char **argv)
{
DronecodeSDK dc;
Mavsdk dc;
std::string connection_url;
ConnectionResult connection_result;

Expand Down
12 changes: 6 additions & 6 deletions example/geofence_inclusion/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ else()
add_definitions("-std=c++11 -Wall -Wextra -Werror")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(geofence_inclusion
geofence_inclusion.cpp
)

target_link_libraries(geofence_inclusion
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk_mission
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk_geofence
DronecodeSDK::mavsdk
MAVSDK::mavsdk_action
MAVSDK::mavsdk_mission
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk_geofence
MAVSDK::mavsdk
)
2 changes: 1 addition & 1 deletion example/geofence_inclusion/geofence_inclusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void usage(std::string bin_name)

int main(int argc, char **argv)
{
DronecodeSDK dc;
Mavsdk dc;

{
auto prom = std::make_shared<std::promise<void>>();
Expand Down
8 changes: 4 additions & 4 deletions example/multiple_drones/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(multiple_drones
multiple_drones.cpp
)

target_link_libraries(multiple_drones
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk_action
MAVSDK::mavsdk
${CMAKE_THREAD_LIBS_INIT}
)
2 changes: 1 addition & 1 deletion example/multiple_drones/multiple_drones.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ int main(int argc, char *argv[])
return 1;
}

DronecodeSDK dc;
Mavsdk dc;

// the loop below adds the number of ports the sdk monitors.
for (int i = 1; i < argc; ++i) {
Expand Down
10 changes: 5 additions & 5 deletions example/offboard_velocity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ else()
add_definitions("-std=c++11 -Wall -Wextra -Werror")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(offboard
offboard_velocity.cpp
)

target_link_libraries(offboard
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk_offboard
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk
MAVSDK::mavsdk_action
MAVSDK::mavsdk_offboard
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk
)
2 changes: 1 addition & 1 deletion example/offboard_velocity/offboard_velocity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void usage(std::string bin_name)

int main(int argc, char **argv)
{
DronecodeSDK dc;
Mavsdk dc;
std::string connection_url;
ConnectionResult connection_result;

Expand Down
8 changes: 4 additions & 4 deletions example/takeoff_land/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(takeoff_and_land
takeoff_and_land.cpp
)

target_link_libraries(takeoff_and_land
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk_action
MAVSDK::mavsdk
)
2 changes: 1 addition & 1 deletion example/takeoff_land/takeoff_and_land.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void component_discovered(ComponentType component_type)

int main(int argc, char **argv)
{
DronecodeSDK dc;
Mavsdk dc;
std::string connection_url;
ConnectionResult connection_result;

Expand Down
8 changes: 4 additions & 4 deletions example/transition_vtol_fixed_wing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ else()
add_definitions("-std=c++11 -WX -W2")
endif()

find_package(DronecodeSDK REQUIRED)
find_package(MAVSDK REQUIRED)

add_executable(transition_vtol_fixed_wing
transition_vtol_fixed_wing.cpp
)

target_link_libraries(transition_vtol_fixed_wing
DronecodeSDK::mavsdk_action
DronecodeSDK::mavsdk_telemetry
DronecodeSDK::mavsdk
MAVSDK::mavsdk_action
MAVSDK::mavsdk_telemetry
MAVSDK::mavsdk
)
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int main(int argc, char **argv)

const std::string connection_url = argv[1];

DronecodeSDK dc;
Mavsdk dc;

// Add connection specified by CLI argument.
const ConnectionResult connection_result = dc.add_any_connection(connection_url);
Expand Down

0 comments on commit 4acbe29

Please sign in to comment.