Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: chenrc98/dasc-robot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: dasc-lab/robot-framework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 334,796 additions and 5,796 deletions.
  1. +66 −0 .github/workflows/pages-with-encryption.yml
  2. +3 −0 .gitignore
  3. +66 −6 CMakeLists.txt
  4. +12,770 −0 Vision Drone Design File/3D Print/Battery Stand.stl
  5. +38,586 −0 Vision Drone Design File/3D Print/Battery Top.stl
  6. BIN Vision Drone Design File/3D Print/Source Two arm v1.stl
  7. +42,464 −0 Vision Drone Design File/3D Print/Xavier Support.stl
  8. +16,466 −0 Vision Drone Design File/3D Print/arm_left.stl
  9. +16,466 −0 Vision Drone Design File/3D Print/arm_right.stl
  10. BIN Vision Drone Design File/3D Print/drone kit.cx3d
  11. +45,348 −0 Vision Drone Design File/3D Print/pix32 stand.stl
  12. +35,170 −0 Vision Drone Design File/3D Print/power module case 2.7.stl
  13. +34,918 −0 Vision Drone Design File/3D Print/power module case.stl
  14. +40,630 −0 Vision Drone Design File/3D Print/xavier realsense left.stl
  15. +40,602 −0 Vision Drone Design File/3D Print/xavier realsense right.stl
  16. BIN Vision Drone Design File/Fusion/DASC Vision Drone v1.stl
  17. BIN Vision Drone Design File/Fusion/DASC Vision Drone v12.f3z
  18. BIN Vision Drone Design File/Fusion/DASC Vision Drone v1_3dless_com_simplified.stl
  19. BIN Vision Drone Design File/Fusion/pix32 stands v4.f3d
  20. +9 −1 docs/.gitignore
  21. +0 −1 ...ache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910
  22. +0 −2 ...he/Jekyll--Converters--Markdown/e3/b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
  23. +16 −0 docs/Dockerfile
  24. +19 −3 docs/Gemfile
  25. +0 −90 docs/Gemfile.lock
  26. +6 −0 docs/_includes/head_custom.html
  27. +26 −0 docs/_includes/katex.html
  28. +12 −0 docs/_layouts/katex.html
  29. +4 −0 docs/_protected_pages.txt
  30. +0 −1 docs/_site/404.html
  31. +0 −1,541 docs/_site/assets/css/just-the-docs-dark.css
  32. +0 −74 docs/_site/assets/css/just-the-docs-dark.css.map
  33. +0 −1,541 docs/_site/assets/css/just-the-docs-default.css
  34. +0 −74 docs/_site/assets/css/just-the-docs-default.css.map
  35. +0 −1,541 docs/_site/assets/css/just-the-docs-light.css
  36. +0 −74 docs/_site/assets/css/just-the-docs-light.css.map
  37. BIN docs/_site/assets/images/just-the-docs.png
  38. BIN docs/_site/assets/images/large-image.jpg
  39. +0 −1 docs/_site/assets/images/search.svg
  40. BIN docs/_site/assets/images/small-image.jpg
  41. +0 −445 docs/_site/assets/js/just-the-docs.js
  42. +0 −32 docs/_site/assets/js/search-data.json
  43. +0 −6 docs/_site/assets/js/vendor/lunr.min.js
  44. BIN docs/_site/favicon.ico
  45. +0 −1 docs/_site/index.html
  46. +34 −0 docs/assets/js/mathtex-script-type.js
  47. +13 −0 docs/docker-compose.yaml
  48. +4 −5 docs/documentation_guide/documentation.md
  49. +186 −0 docs/extra_info/extra_info.md
  50. +24 −0 docs/extra_info/gps_firmware_update.md
  51. +116 −0 docs/extra_info/networking.md
  52. +160 −0 docs/extra_info/nvidia_xavier_nx_docker.md
  53. +97 −0 docs/extra_info/pi_setup_rc.md
  54. +93 −0 docs/extra_info/startup_script.md
  55. +132 −0 docs/flylab/calibration.md
  56. +27 −0 docs/flylab/faqs.md
  57. +11 −0 docs/flylab/flylab.md
  58. BIN docs/flylab/images/blinds_switch.png
  59. BIN docs/flylab/images/bumped.png
  60. BIN docs/flylab/images/charge_wand.png
  61. BIN docs/flylab/images/complete_camera.png
  62. BIN docs/flylab/images/control_room_door.png
  63. BIN docs/flylab/images/lower_camera_progress_bar.png
  64. BIN docs/flylab/images/lower_wand.gif
  65. BIN docs/flylab/images/masking_initial.png
  66. BIN docs/flylab/images/masking_markers_visible.png
  67. BIN docs/flylab/images/masking_mask_all.png
  68. BIN docs/flylab/images/masking_no_markers.png
  69. BIN docs/flylab/images/object_create.png
  70. BIN docs/flylab/images/object_initial.png
  71. BIN docs/flylab/images/object_select.png
  72. BIN docs/flylab/images/origin_final.png
  73. BIN docs/flylab/images/origin_initial.png
  74. BIN docs/flylab/images/origin_pan_zoom.png
  75. BIN docs/flylab/images/pull_rope.png
  76. BIN docs/flylab/images/returned_rope.png
  77. BIN docs/flylab/images/rope.png
  78. BIN docs/flylab/images/rope_lowered.png
  79. BIN docs/flylab/images/second_floor.png
  80. BIN docs/flylab/images/stairs.png
  81. BIN docs/flylab/images/stairs2.png
  82. BIN docs/flylab/images/stairs3.png
  83. BIN docs/flylab/images/upper_rope_green_camera.png
  84. BIN docs/flylab/images/upper_wand.gif
  85. BIN docs/flylab/images/vicon_computer.png
  86. BIN docs/flylab/images/wand_attachment.png
  87. BIN docs/flylab/images/wand_finished.png
  88. BIN docs/flylab/images/wand_in_progress.png
  89. BIN docs/flylab/images/wand_initial.png
  90. BIN docs/flylab/images/wand_origin.png
  91. BIN docs/flylab/images/wand_settings.png
  92. BIN docs/flylab/images/wand_storage.png
  93. BIN docs/flylab/images/wand_switch.png
  94. +35 −0 docs/flylab/object.md
  95. +26 −0 docs/just-the-docs.gemspec
  96. +1 −1 docs/px4_robots/aerial_preflight_checklist.md
  97. +53 −0 docs/px4_robots/crazyflie.md
  98. +0 −11 docs/px4_robots/first_experiment.md
  99. +38 −0 docs/px4_robots/laptop_setup.md
  100. +155 −8 docs/px4_robots/px4_rover_setup.md
  101. +0 −11 docs/px4_robots/px4_setup.md
  102. +15 −15 docs/px4_robots/px4_small_quad_setup.md
  103. +39 −9 docs/px4_robots/raspi_setup.md
  104. +517 −0 docs/px4_robots/robot_framework_guide.md
  105. +40 −0 docs/px4_robots/ros2_ros1_setup.md
  106. +11 −0 docs/readme.md
  107. BIN docs/vision_drone/imgs/VisionDrone0.png
  108. BIN docs/vision_drone/imgs/VisionDrone1.jpeg
  109. BIN docs/vision_drone/imgs/VisionDrone10.jpeg
  110. BIN docs/vision_drone/imgs/VisionDrone11.jpeg
  111. BIN docs/vision_drone/imgs/VisionDrone12.jpeg
  112. BIN docs/vision_drone/imgs/VisionDrone13.jpeg
  113. BIN docs/vision_drone/imgs/VisionDrone14.jpeg
  114. BIN docs/vision_drone/imgs/VisionDrone15.jpeg
  115. BIN docs/vision_drone/imgs/VisionDrone16.jpeg
  116. BIN docs/vision_drone/imgs/VisionDrone17.jpeg
  117. BIN docs/vision_drone/imgs/VisionDrone18.jpeg
  118. BIN docs/vision_drone/imgs/VisionDrone19.jpeg
  119. BIN docs/vision_drone/imgs/VisionDrone2.jpeg
  120. BIN docs/vision_drone/imgs/VisionDrone20.jpeg
  121. BIN docs/vision_drone/imgs/VisionDrone21.jpeg
  122. BIN docs/vision_drone/imgs/VisionDrone3.jpeg
  123. BIN docs/vision_drone/imgs/VisionDrone4.jpeg
  124. BIN docs/vision_drone/imgs/VisionDrone5.jpeg
  125. BIN docs/vision_drone/imgs/VisionDrone6.jpeg
  126. BIN docs/vision_drone/imgs/VisionDrone7.jpeg
  127. BIN docs/vision_drone/imgs/VisionDrone8.jpeg
  128. BIN docs/vision_drone/imgs/VisionDrone9.jpeg
  129. +410 −0 docs/vision_drone/imgs/efficiency_curve.svg
  130. BIN docs/vision_drone/imgs/esc_calibration.png
  131. +410 −0 docs/vision_drone/imgs/power_curve.svg
  132. +410 −0 docs/vision_drone/imgs/speed_curve.svg
  133. +403 −0 docs/vision_drone/imgs/thrust_curve.svg
  134. +418 −0 docs/vision_drone/motor_calibration_data/90PERCENT_2024-10-29_233351.csv
  135. +1,129 −0 docs/vision_drone/motor_calibration_data/90PERCENT_2024-10-29_233824.csv
  136. +1,168 −0 docs/vision_drone/motor_calibration_data/90PERCENT_2024-10-29_234227.csv
  137. +1,165 −0 docs/vision_drone/motor_calibration_data/90PERCENT_2024-10-29_234257.csv
  138. +1,071 −0 docs/vision_drone/motor_calibration_data/90PERCENT_2024-10-29_234328.csv
  139. +23 −0 docs/vision_drone/motor_calibration_data/StepsTest_2024-10-29_221801.csv
  140. +89 −0 docs/vision_drone/motor_calibration_data/StepsTest_2024-10-29_224128.csv
  141. +89 −0 docs/vision_drone/motor_calibration_data/StepsTest_2024-10-29_230003.csv
  142. +89 −0 docs/vision_drone/motor_calibration_data/StepsTest_2024-10-29_231514.csv
  143. +13 −0 docs/vision_drone/vision_drone.md
  144. +116 −0 docs/vision_drone/vision_drone_calibration.md
  145. +391 −0 docs/vision_drone/vision_drone_guide.md
  146. +0 −38 include/dasc_robot/DASCRobot.hpp
  147. +60 −8 include/dasc_robot/{DASCAerialRobot.hpp → DASCRobots.hpp}
  148. +68 −0 include/dasc_robot/msg_conversion.hpp
  149. +128 −0 include/dasc_robot/trajectory.hpp
  150. +264 −0 motor_characterization/Manifest.toml
  151. +3 −0 motor_characterization/Project.toml
  152. BIN motor_characterization/RS2205s_2300kV_5045prop.pdf
  153. +7 −0 motor_characterization/RS2205s_2300kV_5045prop_coeffs.csv
  154. +126 −0 motor_characterization/analyze_data.jl
  155. +32 −0 motor_characterization/data/characterization_RS2205s_2300kV_5045prop.csv
  156. +2 −0 package.xml
  157. +299 −256 src/{DASCAerialRobot.cpp → DASCRobots.cpp}
  158. +47 −0 src/check_robot.cpp
  159. +122 −0 src/dasc_robot_lib.cpp
  160. +57 −0 src/example_control.cpp
  161. +76 −0 src/example_control_geometric.cpp
  162. +106 −0 src/example_control_geometric_acceleration.cpp
  163. +93 −0 src/example_control_geometric_velocity.cpp
  164. +68 −0 src/example_control_multi_rover.cpp
  165. +96 −0 src/example_quad_circle.cpp
  166. +102 −0 src/example_quad_circle_trajectory.cpp
  167. +69 −0 src/example_quad_takeoff_and_land.cpp
  168. +103 −0 src/example_quad_trefoil.cpp
66 changes: 66 additions & 0 deletions .github/workflows/pages-with-encryption.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Deploy Jekyll with GitHub Pages/Encryption

on:
# Runs on pushes targeting the default branch
push:
branches: ["master", "passwd_test"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
# - name: Setup Pages
# uses: actions/configure-pages@v3
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
source: ./docs
destination: ./docs/_site

# Begin encryption code.
# This portion of the build job was written by Evan Baldonado (EvanBaldonado.com). Please do not remove this comment.
# Note: this only encrypts .html pages and not any of the corresponding assets.
- name: Encrypt pages with PageCrypt
working-directory: ./docs
run: |
npm i -D pagecrypt
cat _protected_pages.txt | while read file password;
do
sudo npx pagecrypt "_site/$file" "_site/$file" "$password"
done
# End encryption code.

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: ./docs/_site

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.idea
.vscode
.DS_Store
72 changes: 66 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

SET(CMAKE_CXX_FLAGS -fPIC)

# find dependencies
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
@@ -27,16 +29,74 @@ find_package(eigen3_cmake_module REQUIRED)
find_package(Eigen3 REQUIRED NO_MODULE)
find_package(px4_ros_com REQUIRED)

add_executable(dascRobot src/DASCAerialRobot.cpp)
ament_target_dependencies(dascRobot rclcpp px4_msgs geometry_msgs tf2 tf2_ros px4_ros_com)
target_include_directories(dascRobot PUBLIC
add_library(dascBots src/DASCRobots.cpp)
ament_target_dependencies(dascBots rclcpp px4_msgs geometry_msgs tf2 tf2_ros px4_ros_com)
target_include_directories(dascBots PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
)
ament_export_libraries(dascBots)
install(
TARGETS dascBots
EXPORT export_dascBots
LIBRARY DESTINATION lib/${PROJECT_NAME}
ARCHIVE DESTINATION lib/${PROJECT_NAME}
RUNTIME DESTINATION bin/${PROJECT_NAME}
INCLUDES DESTINATION include/${PROJECT_NAME}
)

add_library(dasc_robot_lib SHARED src/dasc_robot_lib.cpp)
ament_target_dependencies(dasc_robot_lib rclcpp px4_msgs geometry_msgs tf2 tf2_ros px4_ros_com)
target_link_libraries(dasc_robot_lib dascBots)
target_include_directories(dasc_robot_lib PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
)
ament_export_libraries(dasc_robot_lib)
install(
TARGETS dasc_robot_lib
EXPORT export_dasc_robot_lib
LIBRARY DESTINATION lib/${PROJECT_NAME}
ARCHIVE DESTINATION lib/${PROJECT_NAME}
RUNTIME DESTINATION bin/${PROJECT_NAME}
INCLUDES DESTINATION include/${PROJECT_NAME}
)




set(Examples
check_robot
example_control
example_control_multi_rover
example_control_geometric
example_control_geometric_velocity
example_control_geometric_acceleration
example_quad_takeoff_and_land
example_quad_circle
example_quad_circle_trajectory
# example_quad_trefoil
)

message(STATUS "TEST!!")

foreach( ex ${Examples})

add_executable(${ex} src/${ex}.cpp)
ament_target_dependencies(${ex}
rclcpp px4_msgs geometry_msgs tf2 tf2_ros px4_ros_com)
target_link_libraries(${ex} dascBots)
target_include_directories(${ex}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
)
install(TARGETS
${ex}
DESTINATION lib/${PROJECT_NAME}
)

endforeach()

install(TARGETS
dascRobot
DESTINATION lib/${PROJECT_NAME})

ament_package()
Loading