diff options
| author | Stefan Rado <px4@sradonia.net> | 2014-02-17 22:10:06 +0100 |
|---|---|---|
| committer | Stefan Rado <px4@sradonia.net> | 2014-02-17 22:10:06 +0100 |
| commit | 7fa82a27a7bb3be6793375d666474b93f0f5c5d0 (patch) | |
| tree | 5cc35ffc53d278bd82b57d753e3c8207687501e1 /ROMFS | |
| parent | d9031844da2ed4c085db57d9793ef1b5b1913c3e (diff) | |
| parent | 4219de678971bddf0ac7cf538e8847a423a98bbf (diff) | |
| download | px4-firmware-7fa82a27a7bb3be6793375d666474b93f0f5c5d0.tar.gz px4-firmware-7fa82a27a7bb3be6793375d666474b93f0f5c5d0.tar.bz2 px4-firmware-7fa82a27a7bb3be6793375d666474b93f0f5c5d0.zip | |
Merge branch 'master' into beta
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/logging/conv.zip | bin | 10087 -> 9922 bytes | |||
| -rw-r--r-- | ROMFS/px4fmu_logging/init.d/rcS | 88 | ||||
| -rw-r--r-- | ROMFS/px4fmu_logging/logging/conv.zip | bin | 10087 -> 0 bytes |
3 files changed, 0 insertions, 88 deletions
diff --git a/ROMFS/px4fmu_common/logging/conv.zip b/ROMFS/px4fmu_common/logging/conv.zip Binary files differindex 7cb837e56..7f485184c 100644 --- a/ROMFS/px4fmu_common/logging/conv.zip +++ b/ROMFS/px4fmu_common/logging/conv.zip diff --git a/ROMFS/px4fmu_logging/init.d/rcS b/ROMFS/px4fmu_logging/init.d/rcS deleted file mode 100644 index 7b8856719..000000000 --- a/ROMFS/px4fmu_logging/init.d/rcS +++ /dev/null @@ -1,88 +0,0 @@ -#!nsh -# -# PX4FMU startup script for logging purposes -# - -# -# Try to mount the microSD card. -# -echo "[init] looking for microSD..." -if mount -t vfat /dev/mmcsd0 /fs/microsd -then - echo "[init] card mounted at /fs/microsd" - # Start playing the startup tune - tone_alarm start -else - echo "[init] no microSD card found" - # Play SOS - tone_alarm error -fi - -uorb start - -# -# Start sensor drivers here. -# - -ms5611 start -adc start - -# mag might be external -if hmc5883 start -then - echo "using HMC5883" -fi - -if mpu6000 start -then - echo "using MPU6000" -fi - -if l3gd20 start -then - echo "using L3GD20(H)" -fi - -if lsm303d start -then - set BOARD fmuv2 -else - set BOARD fmuv1 -fi - -# Start airspeed sensors -if meas_airspeed start -then - echo "using MEAS airspeed sensor" -else - if ets_airspeed start - then - echo "using ETS airspeed sensor (bus 3)" - else - if ets_airspeed start -b 1 - then - echo "Using ETS airspeed sensor (bus 1)" - fi - fi -fi - -# -# Start the sensor collection task. -# IMPORTANT: this also loads param offsets -# ALWAYS start this task before the -# preflight_check. -# -if sensors start -then - echo "SENSORS STARTED" -fi - -sdlog2 start -r 250 -e -b 16 - -if sercon -then - echo "[init] USB interface connected" - - # Try to get an USB console - nshterm /dev/ttyACM0 & -fi
\ No newline at end of file diff --git a/ROMFS/px4fmu_logging/logging/conv.zip b/ROMFS/px4fmu_logging/logging/conv.zip Binary files differdeleted file mode 100644 index 7cb837e56..000000000 --- a/ROMFS/px4fmu_logging/logging/conv.zip +++ /dev/null |