Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 11:06:04 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge branch 'cmake-2' of github.com:PX4/Firmware into cmake-2

Browse Source
This commit is contained in:
Lorenz Meier
2015-09-20 17:32:04 +02:00
parent 1cdbd4ca1e e38eba0934
commit 046babed33
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -111,7 +111,7 @@ lldb_sitl_ros: posix
Tools/sitl_run.sh posix-configs/SITL/init/rc_iris_ros lldb Tools/sitl_run.sh posix-configs/SITL/init/rc_iris_ros lldb
gdb_sitl_quad: posix gdb_sitl_quad: posix
Tools/sitl_run.sh posix-configs/SITL/init/rcS lldb Tools/sitl_run.sh posix-configs/SITL/init/rcS gdb
gdb_sitl_plane: posix gdb_sitl_plane: posix
Tools/sitl_run.sh posix-configs/SITL/init/rc.fixed_wing lldb Tools/sitl_run.sh posix-configs/SITL/init/rc.fixed_wing lldb
Tools/sitl_run.sh
+2 -1
View File
@@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
cp Tools/posix_lldbinit build_posix_sitl_simple/src/firmware/posix/.lldbinit cp Tools/posix_lldbinit build_posix_sitl_simple/src/firmware/posix/.lldbinit
cp Tools/posix.gdbinit build_posix_sitl_simple/src/firmware/posix/.gdbinit
cd build_posix_sitl_simple/src/firmware/posix cd build_posix_sitl_simple/src/firmware/posix
mkdir -p rootfs/fs/microsd mkdir -p rootfs/fs/microsd
mkdir -p rootfs/eeprom mkdir -p rootfs/eeprom
@@ -9,7 +10,7 @@ then
lldb -- mainapp ../../../../$1 lldb -- mainapp ../../../../$1
elif [ "$2" == "gdb" ] elif [ "$2" == "gdb" ]
then then
gdb -- mainapp ../../../../$1 gdb --args mainapp ../../../../$1
else else
./mainapp ../../../../$1 ./mainapp ../../../../$1
fi fi
src/platforms/posix/drivers/barosim/barosim.h
+1 -1
View File
@@ -80,5 +80,5 @@ extern bool crc4(uint16_t *n_prom);
} /* namespace */ } /* namespace */
/* interface factories */ /* interface factories */
extern device::Device *BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum) __attribute__((weak)); extern device::Device *BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum);
typedef device::Device *(*BAROSIM_constructor)(barosim::prom_u &prom_buf, uint8_t busnum); typedef device::Device *(*BAROSIM_constructor)(barosim::prom_u &prom_buf, uint8_t busnum);