Skip to content

Commit

Permalink
fix: adding SITL setup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pedro-Roque
Pedro-Roque committed May 17, 2023
1 parent 8c59028 commit decdb88
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
[submodule "external/PX4"]
path = external/PX4
url = [email protected]:DISCOWER/PX4-Space-Systems.git
branch = main
Empty file added external/COLCON_IGNORE
View file
Empty file.
4 changes: 4 additions & 0 deletions scripts/px4_sitl.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export GAZEBO_PLUGIN_PATH=$GAZEBO_PLUGIN_PATH:/src/astrobee/src/external/PX4/build/px4_sitl_default/build_gazebo-classic
export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:/src/astrobee/src/external/PX4/Tools/simulation/gazebo-classic/sitl_gazebo-classic/models
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/src/astrobee/src/external/PX4/build/px4_sitl_default/build_gazebo-classic
export PX4_ROOT=/src/astrobee/src/external/PX4
2 changes: 1 addition & 1 deletion submodules/android
Submodule android updated 66 files
+4 −0 .gitignore
+39 −0 astrobee_api/api/src/main/generated/gov/nasa/arc/astrobee/internal/BaseRobot.java
+23 −0 astrobee_api/api/src/main/generated/gov/nasa/arc/astrobee/internal/BaseRobotImpl.java
+37 −0 astrobee_api/scripts/astrobee_api_util.py
+140 −147 astrobee_api/scripts/genBaseRobot.py
+127 −87 astrobee_api/scripts/genBaseRobotImpl.py
+88 −61 astrobee_api/scripts/genCommandTypes.py
+23 −5 astrobee_api/scripts/processCommandSchema.sh
+1 −1 core_apks/guest_science_manager/activity/build.gradle
+ − core_apks/guest_science_manager/activity/libs/ff_msgs-0.0.0.jar
+2 −0 core_apks/guest_science_manager/activity/src/main/java/gov/nasa/arc/astrobee/android/gs/manager/CmdInfo.java
+12 −0 core_apks/guest_science_manager/activity/src/main/java/gov/nasa/arc/astrobee/android/gs/manager/CmdStatus.java
+1 −0 core_apks/guest_science_manager/activity/src/main/java/gov/nasa/arc/astrobee/android/gs/manager/CmdType.java
+195 −109 ...apks/guest_science_manager/activity/src/main/java/gov/nasa/arc/astrobee/android/gs/manager/ManagerNode.java
+28 −1 ...guest_science_manager/activity/src/main/java/gov/nasa/arc/astrobee/android/gs/manager/MessengerService.java
+1 −0 core_apks/signal_intention_state/app/src/main/assets/config.json
+22 −4 .../signal_intention_state/app/src/main/java/gov/nasa/arc/astrobee/signal_intention_state/AppCustomConfig.java
+12 −5 ...pks/signal_intention_state/app/src/main/java/gov/nasa/arc/astrobee/signal_intention_state/MainActivity.java
+4 −9 creating_gs_app.md
+13 −7 gs_examples/README.md
+4 −1 gs_examples/test_simple_trajectory/app/build.gradle
+4 −3 ...ajectory/app/src/main/java/gov/nasa/arc/irg/astrobee/test_simple_trajectory/StartTestTrajectoryService.java
+1 −1 guest_science_projects/audio_player/app/build.gradle
+1 −1 ...nce_projects/audio_player/app/src/main/java/gov/nasa/arc/astrobee/audio_player/AudioTimestampPublisher.java
+18 −0 guest_science_projects/port_tester/.gitignore
+1 −0 guest_science_projects/port_tester/app/.gitignore
+41 −0 guest_science_projects/port_tester/app/build.gradle
+ − guest_science_projects/port_tester/app/libs/api-1.0-SNAPSHOT.jar
+ − guest_science_projects/port_tester/app/libs/ff_msgs-0.0.0.jar
+ − guest_science_projects/port_tester/app/libs/ros-1.0-SNAPSHOT.jar
+25 −0 guest_science_projects/port_tester/app/proguard-rules.pro
+34 −0 guest_science_projects/port_tester/app/src/main/AndroidManifest.xml
+35 −0 ..._science_projects/port_tester/app/src/main/java/gov/nasa/arc/astrobee/android/port_tester/MainActivity.java
+277 −0 ...rojects/port_tester/app/src/main/java/gov/nasa/arc/astrobee/android/port_tester/StartPortTesterService.java
+252 −0 guest_science_projects/port_tester/app/src/main/java/gov/nasa/arc/astrobee/android/port_tester/UsbService.java
+23 −0 guest_science_projects/port_tester/app/src/main/res/layout/activity_main.xml
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-hdpi/ic_launcher.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-mdpi/ic_launcher.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+ − guest_science_projects/port_tester/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+6 −0 guest_science_projects/port_tester/app/src/main/res/values/colors.xml
+3 −0 guest_science_projects/port_tester/app/src/main/res/values/strings.xml
+19 −0 guest_science_projects/port_tester/app/src/main/res/values/styles.xml
+13 −0 guest_science_projects/port_tester/app/src/main/res/xml/commands.xml
+27 −0 guest_science_projects/port_tester/build.gradle
+17 −0 guest_science_projects/port_tester/gradle.properties
+ − guest_science_projects/port_tester/gradle/wrapper/gradle-wrapper.jar
+6 −0 guest_science_projects/port_tester/gradle/wrapper/gradle-wrapper.properties
+160 −0 guest_science_projects/port_tester/gradlew
+90 −0 guest_science_projects/port_tester/gradlew.bat
+2 −0 guest_science_projects/port_tester/guest_science_library/build.gradle
+ − guest_science_projects/port_tester/guest_science_library/guest_science_library.aar
+1 −0 guest_science_projects/port_tester/settings.gradle
+1 −1 guest_science_projects/sci_cam_image/app/build.gradle
+93 −35 ...ence_projects/sci_cam_image/app/src/main/java/gov/nasa/arc/irg/astrobee/sci_cam_image/CameraController.java
+82 −15 ...ience_projects/sci_cam_image/app/src/main/java/gov/nasa/arc/irg/astrobee/sci_cam_image/SciCamPublisher.java
+15 −2 ...ence_projects/sci_cam_image/app/src/main/java/gov/nasa/arc/irg/astrobee/sci_cam_image/StartSciCamImage.java
+1 −1 guest_science_projects/sci_cam_image/app/src/main/res/xml/commands.xml
+8 −4 guest_science_projects/sci_cam_image/readme.md
+ − guest_science_projects/sci_cam_image/sci_cam_image_with_rec.apk

0 comments on commit decdb88

Please sign in to comment.