Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:PX4/Firmware into px4dev_new_param

Browse Source
This commit is contained in:
Lorenz Meier
2012-08-20 19:38:40 +02:00
parent 4ddf93bd06 821306bc4d
commit df07ff8056
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/scripts/rcS
+9 -4
View File
@@ -18,7 +18,7 @@
# can change this to prevent automatic startup of the flight script. # can change this to prevent automatic startup of the flight script.
# #
set MODE autostart set MODE autostart
set USB no set USB autoconnect
# #
# Try to mount the microSD card. # Try to mount the microSD card.
@@ -46,11 +46,16 @@ fi
# #
# Check for USB host # Check for USB host
# #
if sercon if [ $USB != autoconnect ]
then then
echo "[init] USB interface connected" echo "[init] not connecting USB"
else else
echo "[init] No USB connected" if sercon
then
echo "[init] USB interface connected"
else
echo "[init] No USB connected"
fi
fi fi
# #
apps/sensors/sensors.c
+3 -2
View File
@@ -514,6 +514,7 @@ int sensors_thread_main(int argc, char *argv[])
mag_offset[1] = global_data_parameter_storage->pm.param_values[PARAM_SENSOR_MAG_YOFFSET]; mag_offset[1] = global_data_parameter_storage->pm.param_values[PARAM_SENSOR_MAG_YOFFSET];
mag_offset[2] = global_data_parameter_storage->pm.param_values[PARAM_SENSOR_MAG_ZOFFSET]; mag_offset[2] = global_data_parameter_storage->pm.param_values[PARAM_SENSOR_MAG_ZOFFSET];
paramcounter = 0; paramcounter = 0;
} }
@@ -565,7 +566,7 @@ int sensors_thread_main(int argc, char *argv[])
if (ret_accelerometer != sizeof(buf_accelerometer)) { if (ret_accelerometer != sizeof(buf_accelerometer)) {
acc_fail_count++; acc_fail_count++;
if (acc_fail_count & 0b1000 || (acc_fail_count > 20 && acc_fail_count < 100)) { if (acc_fail_count & 0b111 || (acc_fail_count > 20 && acc_fail_count < 100)) {
fprintf(stderr, "[sensors] BMA180 ERROR #%d: %s\n", (int)*get_errno_ptr(), strerror((int)*get_errno_ptr())); fprintf(stderr, "[sensors] BMA180 ERROR #%d: %s\n", (int)*get_errno_ptr(), strerror((int)*get_errno_ptr()));
} }
@@ -618,7 +619,7 @@ int sensors_thread_main(int argc, char *argv[])
if (ret_magnetometer != sizeof(buf_magnetometer)) { if (ret_magnetometer != sizeof(buf_magnetometer)) {
mag_fail_count++; mag_fail_count++;
if (mag_fail_count & 0b1000 || (mag_fail_count > 20 && mag_fail_count < 100)) { if (mag_fail_count & 0b111 || (mag_fail_count > 20 && mag_fail_count < 100)) {
fprintf(stderr, "[sensors] HMC5883L ERROR #%d: %s\n", (int)*get_errno_ptr(), strerror((int)*get_errno_ptr())); fprintf(stderr, "[sensors] HMC5883L ERROR #%d: %s\n", (int)*get_errno_ptr(), strerror((int)*get_errno_ptr()));
} }
apps/uORB/Makefile
+1 -1
View File
@@ -37,6 +37,6 @@
APPNAME = uorb APPNAME = uorb
PRIORITY = SCHED_PRIORITY_DEFAULT PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 2048 STACKSIZE = 4096
include $(APPDIR)/mk/app.mk include $(APPDIR)/mk/app.mk