scorpio1
/
oscillation_ctrl
forked from cesar.alejandro/oscillation_ctrl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.spirirobotics.com/cesar.alejandro/oscillation_ctrl

This commit is contained in:
cesar 2022-03-04 14:27:17 -04:00
parent bee8a6033d 82c7bd26a0
commit a6d9d8bd21
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -106,10 +106,17 @@ Initilize rosdep:
copy (or add) files from px4_launch directory to '~/PX4-Autopilot/launch' copy (or add) files from px4_launch directory to '~/PX4-Autopilot/launch'
### MAVROS ### MAVROS
- in px4.launch, replace: - in px4.launch, replace:
<<<<<<< HEAD
''' '''
arg name="fcu_url" default="/dev/ttyACM0:57600" arg name="fcu_url" default="/dev/ttyACM0:57600"
arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550" arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550"
''' '''
=======
arg name="fcu_url" default="/dev/ttyACM0:57600"
arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550"
>>>>>>> 82c7bd26a006f5ffb4d0f2a2a6dc623552984cef
- with: - with:
arg name="fcu_url" default="udp://:14551@192.168.1.91:14556" arg name="fcu_url" default="udp://:14551@192.168.1.91:14556"
@ -138,4 +145,8 @@ In catkin_ws (or any working directory) add to devel/setup.bash:
<<<<<<< HEAD
=======
>>>>>>> 82c7bd26a006f5ffb4d0f2a2a6dc623552984cef