diff options
| author | px4dev <px4@purgatory.org> | 2013-03-20 23:05:19 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-03-20 23:05:19 -0700 |
| commit | db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0 (patch) | |
| tree | 0c6e8e86891285c45f7a60d857929a2a5e963599 /ROMFS | |
| parent | f7b14b2e23113093d1f76565041b91f22be79246 (diff) | |
| parent | b7d65bf8fc65b2fd7c98d46d60fb24fb937baa94 (diff) | |
| download | px4-firmware-db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0.tar.gz px4-firmware-db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0.tar.bz2 px4-firmware-db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0.zip | |
Merge branch 'master' into export-build
Diffstat (limited to 'ROMFS')
| -rwxr-xr-x | ROMFS/px4fmu_default/logging/logconv.m | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_default/mixers/FMU_Q.mix | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_default/mixers/FMU_X5.mix | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ROMFS/px4fmu_default/logging/logconv.m b/ROMFS/px4fmu_default/logging/logconv.m index 5ea2aeb95..92ee01413 100755 --- a/ROMFS/px4fmu_default/logging/logconv.m +++ b/ROMFS/px4fmu_default/logging/logconv.m @@ -33,7 +33,7 @@ end % float vbat; //battery voltage in [volt] % float bat_current - current drawn from battery at this time instant % float bat_discharged - discharged energy in mAh -% float adc[3]; //remaining auxiliary ADC ports [volt] +% float adc[4]; //ADC ports [volt] % float local_position[3]; //tangent plane mapping into x,y,z [m] % int32_t gps_raw_position[3]; //latitude [degrees] north, longitude [degrees] east, altitude above MSL [millimeter] % float attitude[3]; //pitch, roll, yaw [rad] @@ -57,7 +57,7 @@ logFormat{9} = struct('name', 'actuators', 'bytes', 4, 'array', 8, ' logFormat{10} = struct('name', 'vbat', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le'); logFormat{11} = struct('name', 'bat_current', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le'); logFormat{12} = struct('name', 'bat_discharged', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le'); -logFormat{13} = struct('name', 'adc', 'bytes', 4, 'array', 3, 'precision', 'float', 'machineformat', 'ieee-le'); +logFormat{13} = struct('name', 'adc', 'bytes', 4, 'array', 4, 'precision', 'float', 'machineformat', 'ieee-le'); logFormat{14} = struct('name', 'local_position', 'bytes', 4, 'array', 3, 'precision', 'float', 'machineformat', 'ieee-le'); logFormat{15} = struct('name', 'gps_raw_position', 'bytes', 4, 'array', 3, 'precision', 'uint32', 'machineformat', 'ieee-le'); logFormat{16} = struct('name', 'attitude', 'bytes', 4, 'array', 3, 'precision', 'float', 'machineformat', 'ieee-le'); diff --git a/ROMFS/px4fmu_default/mixers/FMU_Q.mix b/ROMFS/px4fmu_default/mixers/FMU_Q.mix index a35d299fd..ebcb66b24 100644 --- a/ROMFS/px4fmu_default/mixers/FMU_Q.mix +++ b/ROMFS/px4fmu_default/mixers/FMU_Q.mix @@ -26,12 +26,12 @@ for the elevons. M: 2 O: 10000 10000 0 -10000 10000 S: 0 0 -5000 -8000 0 -10000 10000 -S: 0 1 -8000 -8000 0 -10000 10000 +S: 0 1 8000 8000 0 -10000 10000 M: 2 O: 10000 10000 0 -10000 10000 S: 0 0 -8000 -5000 0 -10000 10000 -S: 0 1 8000 8000 0 -10000 10000 +S: 0 1 -8000 -8000 0 -10000 10000 Output 2 -------- diff --git a/ROMFS/px4fmu_default/mixers/FMU_X5.mix b/ROMFS/px4fmu_default/mixers/FMU_X5.mix index 981466704..9f81e1dc3 100644 --- a/ROMFS/px4fmu_default/mixers/FMU_X5.mix +++ b/ROMFS/px4fmu_default/mixers/FMU_X5.mix @@ -23,13 +23,13 @@ for the elevons. M: 2 O: 10000 10000 0 -10000 10000 -S: 0 0 3000 5000 0 -10000 10000 -S: 0 1 5000 5000 0 -10000 10000 +S: 0 0 -3000 -5000 0 -10000 10000 +S: 0 1 -5000 -5000 0 -10000 10000 M: 2 O: 10000 10000 0 -10000 10000 -S: 0 0 5000 3000 0 -10000 10000 -S: 0 1 -5000 -5000 0 -10000 10000 +S: 0 0 -5000 -3000 0 -10000 10000 +S: 0 1 5000 5000 0 -10000 10000 Output 2 -------- |