Skip to content

Commit

Permalink
Merge pull request #438 from dronecore/rename
Browse files Browse the repository at this point in the history
Renamed DroneCore to DronecodeSDK
  • Loading branch information
julianoes committed Jul 6, 2018
2 parents baa7da7 + 6acf385 commit 27027d4
Show file tree
Hide file tree
Showing 215 changed files with 1,098 additions and 1,090 deletions.
24 changes: 12 additions & 12 deletions .travis.yml
Expand Up @@ -79,16 +79,16 @@ before_install:
install:
- set -e
- if [[ "${BUILD_TARGET}" = "docker_build_ubuntu_16.04" ]]; then
docker pull dronecore/dronecore-ubuntu-16.04;
docker pull dronecode/dronecode-sdk-ubuntu-16.04;
fi
- if [[ "${BUILD_TARGET}" = "docker_build_ubuntu_18.04" ]]; then
docker pull dronecore/dronecore-ubuntu-18.04;
docker pull dronecode/dronecode-sdk-ubuntu-18.04;
fi
- if [[ "${BUILD_TARGET}" = "docker_build_fedora_27" ]]; then
docker pull dronecore/dronecore-fedora-27;
docker pull dronecode/dronecode-sdk-fedora-27;
fi
- if [[ "${BUILD_TARGET}" = "docker_build_fedora_28" ]]; then
docker pull dronecore/dronecore-fedora-28;
docker pull dronecode/dronecode-sdk-fedora-28;
fi
- if [[ "${BUILD_TARGET}" = "coverage_build" ]]; then
pip install --user cpp-coveralls;
Expand All @@ -105,20 +105,20 @@ script:
make BUILD_TYPE=Coverage run_unit_tests -j4;
fi
- if [[ "${BUILD_TARGET}" = "docker_build_ubuntu_16.04" ]]; then
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-ubuntu-16.04 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-ubuntu-16.04 ./create_packages.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-ubuntu-16.04 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-ubuntu-16.04 ./create_packages.sh;
fi
- if [[ "${BUILD_TARGET}" = "docker_build_ubuntu_18.04" ]]; then
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-ubuntu-18.04 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-ubuntu-18.04 ./create_packages.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-ubuntu-18.04 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-ubuntu-18.04 ./create_packages.sh;
fi
- if [[ "${BUILD_TARGET}" = "docker_build_fedora_27" ]]; then
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-fedora-27 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-fedora-27 ./create_packages.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-fedora-27 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-fedora-27 ./create_packages.sh;
fi
- if [[ "${BUILD_TARGET}" = "docker_build_fedora_28" ]]; then
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-fedora-28 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecore/dronecore-fedora-28 ./create_packages.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-fedora-28 ./travis-docker-build.sh;
docker run -it --rm -v $TRAVIS_BUILD_DIR:/root/DroneCore:rw dronecode/dronecode-sdk-fedora-28 ./create_packages.sh;
fi
- if [[ "${BUILD_TARGET}" = "osx_build" ]]; then
make;
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Expand Up @@ -7,7 +7,7 @@ list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_BINARY_DIR}/third_party)

cmake_policy(SET CMP0025 NEW)

project(dronecore)
project(dronecode_sdk)

option(BUILD_TESTS "Build tests" ON)

Expand All @@ -29,8 +29,8 @@ else()
set(lib_path "lib")
endif()

set(dronecore_install_include_dir "include/dronecore")
set(dronecore_install_lib_dir ${lib_path})
set(dronecode_sdk_install_include_dir "include/dronecode_sdk")
set(dronecode_sdk_install_lib_dir ${lib_path})

add_subdirectory(core)
add_subdirectory(plugins)
Expand All @@ -56,7 +56,7 @@ if(BUILD_TESTS)
endif()

if (CMAKE_BUILD_BACKEND)
message(STATUS "Building dronecore server")
message(STATUS "Building dronecode_sdk server")
add_subdirectory(backend)
else()
message(STATUS "BUILD_BACKEND not set: not building grpc backend")
Expand All @@ -70,6 +70,6 @@ if (DROP_DEBUG EQUAL 1)
)

target_link_libraries(drop_debug
dronecore
dronecode_sdk
)
endif()
26 changes: 13 additions & 13 deletions Jenkinsfile
Expand Up @@ -6,7 +6,7 @@ pipeline {
stage('Ubuntu 16.04 Debug') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-16.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-16.04:2018-06-06'
}
}
steps {
Expand All @@ -19,7 +19,7 @@ pipeline {
stage('Ubuntu 16.04 Release') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-16.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-16.04:2018-06-06'
}
}
steps {
Expand All @@ -32,7 +32,7 @@ pipeline {
stage('Ubuntu 18.04 Debug') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-18.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-18.04:2018-06-06'
}
}
steps {
Expand All @@ -45,7 +45,7 @@ pipeline {
stage('Ubuntu 18.04 Release') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-18.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-18.04:2018-06-06'
}
}
steps {
Expand All @@ -58,7 +58,7 @@ pipeline {
stage('Fedora 27 Debug') {
agent {
docker {
image 'dronecore/dronecore-fedora-27:2018-06-06'
image 'dronecode/dronecode-sdk-fedora-27:2018-06-06'
}
}
steps {
Expand All @@ -71,7 +71,7 @@ pipeline {
stage('Fedora 27 Release') {
agent {
docker {
image 'dronecore/dronecore-fedora-27:2018-06-06'
image 'dronecode/dronecode-sdk-fedora-27:2018-06-06'
}
}
steps {
Expand All @@ -84,7 +84,7 @@ pipeline {
stage('Fedora 28 Debug') {
agent {
docker {
image 'dronecore/dronecore-fedora-28:2018-06-06'
image 'dronecode/dronecode-sdk-fedora-28:2018-06-06'
}
}
steps {
Expand All @@ -97,7 +97,7 @@ pipeline {
stage('Fedora 28 Release') {
agent {
docker {
image 'dronecore/dronecore-fedora-28:2018-06-06'
image 'dronecode/dronecode-sdk-fedora-28:2018-06-06'
}
}
steps {
Expand All @@ -114,7 +114,7 @@ pipeline {
stage('check style') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-16.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-16.04:2018-06-06'
}
}
steps {
Expand All @@ -124,7 +124,7 @@ pipeline {
stage('example/takeoff_land') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-16.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-16.04:2018-06-06'
}
}
steps {
Expand All @@ -139,7 +139,7 @@ pipeline {
stage('example/fly_mission') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-16.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-16.04:2018-06-06'
}
}
steps {
Expand All @@ -154,7 +154,7 @@ pipeline {
stage('example/offboard_velocity') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-16.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-16.04:2018-06-06'
}
}
steps {
Expand All @@ -171,7 +171,7 @@ pipeline {
stage('Generate Docs') {
agent {
docker {
image 'dronecore/dronecore-ubuntu-16.04:2018-06-06'
image 'dronecode/dronecode-sdk-ubuntu-16.04:2018-06-06'
}
}
steps {
Expand Down
2 changes: 1 addition & 1 deletion Makefile
@@ -1,4 +1,4 @@
# Makefile to build DroneCore
# Makefile to build the Dronecode SDK library
#
# The targets are mostly for convenience around cmake.
#
Expand Down
6 changes: 3 additions & 3 deletions README.md
@@ -1,4 +1,4 @@
![DroneCore](https://github.com/dronecore/sdk_docs/raw/develop/assets/site/sdk_logo_full.jpg)
![Dronecode SDK](https://github.com/dronecore/sdk_docs/raw/develop/assets/site/sdk_logo_full.jpg)

[![jenkins build status](http://ci.px4.io:8080/buildStatus/icon?job=DroneCore/develop)](http://ci.px4.io:8080/blue/organizations/jenkins/DroneCore/activity)
[![travis-ci build status](https://travis-ci.org/dronecore/DroneCore.svg?branch=develop)](https://travis-ci.org/dronecore/DroneCore)
Expand Down Expand Up @@ -30,7 +30,7 @@ The library provides both synchronous (blocking) API calls, as well as asynchron

## API Overview

API consumers use the `DroneCore` class to discover and manage vehicles (`System` objects). Using the `System` object plugins such as e.g. `Action`, `Telemetry`, or `Mission` can be instantiated which provide information about the state of the drone and allow to interact with it.
API consumers use the `DronecodeSDK` class to discover and manage vehicles (`System` objects). Using the `System` object plugins such as e.g. `Action`, `Telemetry`, or `Mission` can be instantiated which provide information about the state of the drone and allow to interact with it.

The links below take you to the respective header files:

Expand All @@ -43,7 +43,7 @@ The links below take you to the respective header files:
- [offboard](plugins/offboard/offboard.h): for velocity control
- [gimbal](plugins/gimbal/gimbal.h): control a gimbal
- [camera](plugins/camera/camera.h): capture images, videos, and set camera settings
- [follow_me](plugins/follow_me/follow_me.h): drone tracks a position supplied by DroneCore.
- [follow_me](plugins/follow_me/follow_me.h): drone tracks a position supplied by the Dronecode SDK.
- [logging](plugins/logging/logging.h): (not implemented) data logging and streaming from the vehicle.

For more information see the [API Overview](https://sdk.dronecode.org/en/#api-overview) in the Dronecode SDK Guide.
Expand Down
36 changes: 18 additions & 18 deletions appveyor.yml
Expand Up @@ -26,13 +26,13 @@ init:
- msbuild /version

# clone directory
clone_folder: C:\dronecore
clone_folder: C:\dronecode_sdk


# scripts to run before build
before_build:

- cd C:\dronecore
- cd C:\dronecode_sdk
- git submodule update --init --recursive --depth 100
- cd C:\
- appveyor DownloadFile https://curl.haxx.se/download/curl-7.56.1.zip
Expand All @@ -51,8 +51,8 @@ build_script:
) else (
nmake /f Makefile.vc mode=static VC=15 MACHINE=x64 DEBUG=no
)
- set dronecore_dir=C:\dronecore
- cd %dronecore_dir%
- set dronecode_sdk_dir=C:\dronecode_sdk
- cd %dronecode_sdk_dir%
- md build
- cd build
- if "%configuration%"=="Debug" (
Expand All @@ -74,7 +74,7 @@ build_script:
- b2 --with-system --with-date_time --j%cores% toolset=%msvcver% address-model=64 architecture=x86 link=static threading=multi runtime-link=shared --build-type=minimal stage --stagedir=stage/x64
- set BOOST_ROOT=%boost_dir%
- set BOOST_LIBRARYDIR=%boost_dir%\stage\x64\lib
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%
- cd example\takeoff_land
- md build
- cd build
Expand All @@ -84,7 +84,7 @@ build_script:
) else (
cmake --build . --config Release
)
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%
- cd example\fly_mission
- md build
- cd build
Expand All @@ -94,7 +94,7 @@ build_script:
) else (
cmake --build . --config Release
)
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%
- cd example\offboard_velocity
- md build
- cd build
Expand All @@ -104,7 +104,7 @@ build_script:
) else (
cmake --build . --config Release
)
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%
- cd example\transition_vtol_fixed_wing
- md build
- cd build
Expand All @@ -114,7 +114,7 @@ build_script:
) else (
cmake --build . --config Release
)
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%
- cd example\follow_me
- md build
- cd build
Expand All @@ -124,7 +124,7 @@ build_script:
) else (
cmake --build . --config Release
)
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%
- cd example\fly_qgc_mission
- md build
- cd build
Expand All @@ -134,28 +134,28 @@ build_script:
) else (
cmake --build . --config Release
)
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%


test: on

# We need to manually copy the dlls for now, otherwise they are not found.
test_script:
- cd %dronecore_dir%
- cd %dronecode_sdk_dir%
- if "%configuration%"=="Debug" (
copy build\third_party\gtest\googlemock\gtest\Debug\gtestd.lib build\Debug\ &&
copy build\third_party\gtest\googlemock\gtest\Debug\gtest_maind.lib build\Debug\ &&
copy build\third_party\gtest\googlemock\Debug\gmockd.lib build\Debug\ &&
copy build\plugins\mission\Debug\dronecore_mission.dll build\Debug\ &&
copy build\plugins\camera\Debug\dronecore_camera.dll build\Debug\ &&
copy build\plugins\calibration\Debug\dronecore_calibration.dll build\Debug\ &&
copy build\plugins\mission\Debug\dronecode_sdk_mission.dll build\Debug\ &&
copy build\plugins\camera\Debug\dronecode_sdk_camera.dll build\Debug\ &&
copy build\plugins\calibration\Debug\dronecode_sdk_calibration.dll build\Debug\ &&
build\Debug\unit_tests_runner.exe
) else (
copy build\third_party\gtest\googlemock\gtest\Release\gtest.lib build\Release\ &&
copy build\third_party\gtest\googlemock\gtest\Release\gtest_main.lib build\Release\ &&
copy build\third_party\gtest\googlemock\Release\gmock.lib build\Release\ &&
copy build\plugins\mission\Release\dronecore_mission.dll build\Release\ &&
copy build\plugins\camera\Release\dronecore_camera.dll build\Release\ &&
copy build\plugins\calibration\Release\dronecore_calibration.dll build\Release\ &&
copy build\plugins\mission\Release\dronecode_sdk_mission.dll build\Release\ &&
copy build\plugins\camera\Release\dronecode_sdk_camera.dll build\Release\ &&
copy build\plugins\calibration\Release\dronecode_sdk_calibration.dll build\Release\ &&
build\Release\unit_tests_runner.exe
)
2 changes: 1 addition & 1 deletion backend/README.md
@@ -1,4 +1,4 @@
# DroneCore with GRPC
# Dronecode SDK with GRPC

### Build with backend

Expand Down
2 changes: 1 addition & 1 deletion backend/cmake/MacOSXFrameworkInfo.plist.in
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${MACOSX_FRAMEWORK_NAME}</string>
<key>CFBundleIdentifier</key>
<string>io.dronecore.backend</string>
<string>io.dronecode_sdk.backend</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down
2 changes: 1 addition & 1 deletion backend/proto
Submodule proto updated from f2e8b2 to 7c7017

0 comments on commit 27027d4

Please sign in to comment.