diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-20 19:38:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-20 19:38:40 +0200 |
| commit | df07ff8056ccc8e6b174404c2120f83d676ac0db (patch) | |
| tree | 85a539958414ae735372ab9020355832e1140232 | |
| parent | 4ddf93bd065ef5fb0f78ce2ff6b7654841946eaa (diff) | |
| parent | 821306bc4dccf9bd58112680f499602d384db917 (diff) | |
| download | px4-firmware-df07ff8056ccc8e6b174404c2120f83d676ac0db.tar.gz px4-firmware-df07ff8056ccc8e6b174404c2120f83d676ac0db.tar.bz2 px4-firmware-df07ff8056ccc8e6b174404c2120f83d676ac0db.zip | |
Merge branch 'master' of github.com:PX4/Firmware into px4dev_new_param
| -rwxr-xr-x | ROMFS/scripts/rcS | 13 | ||||
| -rw-r--r-- | apps/sensors/sensors.c | 5 | ||||
| -rw-r--r-- | apps/uORB/Makefile | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/ROMFS/scripts/rcS b/ROMFS/scripts/rcS index 33f63ca87..7b8d51338 100755 --- a/ROMFS/scripts/rcS +++ b/ROMFS/scripts/rcS @@ -18,7 +18,7 @@ # can change this to prevent automatic startup of the flight script. # set MODE autostart -set USB no +set USB autoconnect # # Try to mount the microSD card. @@ -46,11 +46,16 @@ fi # # Check for USB host # -if sercon +if [ $USB != autoconnect ] then - echo "[init] USB interface connected" + echo "[init] not connecting USB" else - echo "[init] No USB connected" + if sercon + then + echo "[init] USB interface connected" + else + echo "[init] No USB connected" + fi fi # diff --git a/apps/sensors/sensors.c b/apps/sensors/sensors.c index 6a06a786f..ef8ff798f 100644 --- a/apps/sensors/sensors.c +++ b/apps/sensors/sensors.c @@ -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[2] = global_data_parameter_storage->pm.param_values[PARAM_SENSOR_MAG_ZOFFSET]; + paramcounter = 0; } @@ -565,7 +566,7 @@ int sensors_thread_main(int argc, char *argv[]) if (ret_accelerometer != sizeof(buf_accelerometer)) { 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())); } @@ -618,7 +619,7 @@ int sensors_thread_main(int argc, char *argv[]) if (ret_magnetometer != sizeof(buf_magnetometer)) { 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())); } diff --git a/apps/uORB/Makefile b/apps/uORB/Makefile index 0766a66eb..64ba52e9c 100644 --- a/apps/uORB/Makefile +++ b/apps/uORB/Makefile @@ -37,6 +37,6 @@ APPNAME = uorb PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +STACKSIZE = 4096 include $(APPDIR)/mk/app.mk |