Commit Graph

10478 Commits

Author SHA1 Message Date
Felix Ruess 4e86e7c89b Merge branch 'master' into telemetry
to resolve
Conflicts:
	sw/airborne/firmwares/fixedwing/ap_downlink.h
2013-10-28 16:07:02 +01:00
Felix Ruess 13c9f3b7ca [conf] remove non-functional FIRMWARE define
Defines don't work this way...
Was only used in gps_ubx_ucenter, replace it with GPS_UBX_UCENTER_SLOW_NAV_SOL flag
to set a lower NAV_SOL message rate (currently not set anywhere).
So you get full NAV_SOL messages rate for fixedwings as well
(just like before since the test for rotorcraft firmware was non-functional and always true).
2013-10-28 15:09:08 +01:00
Felix Ruess a243be0f59 [boards] fix umarim BARO_ABS_ADS 2013-10-28 12:02:52 +01:00
Felix Ruess 50cd280114 [dox] fix filename for baro_mpl3115 2013-10-28 12:02:22 +01:00
Felix Ruess ef9951ac47 [doc] minor descrption update for gps_ubx_ucenter 2013-10-28 12:01:38 +01:00
Ben Laurie 5f3b16bafa [modules] gps_ubx_ucenter: USB support
closes #569
2013-10-28 11:56:02 +01:00
Felix Ruess 3fe72e28e3 [test] update compare_ahrs 2013-10-24 00:07:22 +02:00
Felix Ruess f6bb5f1fad [fixedwing] remove sys_time include from autopilot.h 2013-10-24 00:06:53 +02:00
Felix Ruess 0bcdaeaaa6 [conf] remove some now obsolete flags 2013-10-23 22:47:24 +02:00
Felix Ruess fecd7e7aaf [fixedwing] add PERIODIC_SEND_AHRS_QUAT_INT 2013-10-23 22:34:16 +02:00
Gautier Hattenberger 3717ead582 [fix] fix compile warning with c++ (nps) 2013-10-23 18:37:37 +02:00
Felix Ruess bc3848104e Merge branch 'master' into telemetry
get INS_Z fix from master
2013-10-23 13:44:06 +02:00
Felix Ruess 3a3dc5def7 [telemetry] fix INS_Z 2013-10-23 13:41:02 +02:00
Felix Ruess 4310e5f743 [telemetry] fix TUNE_VERT 2013-10-23 13:25:57 +02:00
Felix Ruess fcb7949147 [telemetry] fix ARDRONE_NAVDATA 2013-10-23 13:24:45 +02:00
Felix Ruess dd718fb597 [telemetry] send STAB_ATTITUDE and STAB_ATTITUDE_REF in quat_float
and fix body_rate and att_euler sending for euler_float
2013-10-23 13:18:18 +02:00
Felix Ruess c384bc158f Merge branch 'master' into telemetry
fix ahrs_gx3 and stabilization_attitude_euler_float
2013-10-23 13:05:35 +02:00
Felix Ruess cd834bce01 [rotorcraft] quat_float: rename x_sum_err_eulers to x_sum_err 2013-10-23 11:59:09 +02:00
podhrmic 5cf0b28d46 [stabilization] float_euler fixes so it actually compiles 2013-10-23 11:39:14 +02:00
podhrmic a0214d8eb0 [ahrs] gx3 minor fixes
closes #565
2013-10-23 10:17:06 +02:00
Felix Ruess 91fd8ef88c [conf][nps] same simple_quad JSBSim model for most quadrotors 2013-10-22 19:44:21 +02:00
Felix Ruess ee6f9e17c6 [boards] stm32f4_discovery: fix/switch LED 3 and 4
to match board doc and silkscreen
2013-10-22 17:34:15 +02:00
Felix Ruess eff7bef854 ignore .idea dir from JetBrains IDEs 2013-10-22 11:12:47 +02:00
Gautier Hattenberger 8d28d27335 [uart] fix name for parity value 2013-10-22 10:53:24 +02:00
Felix Ruess f4a9c1c3bd [ground_segment] python settingsapp: no default ac ids 2013-10-21 18:20:16 +02:00
Felix Ruess e08d1bdf35 [ground_segment] sane error when launching settings without specifying aircraft 2013-10-21 18:00:06 +02:00
Felix Ruess 74cee625a4 [nps] fix number of actuator commands used
This makes it finally possible to have e.g. a hexarotor:
Six "commands" (one per motor) from motor_mixing sent to the FDM.
2013-10-21 15:55:27 +02:00
Gautier Hattenberger 80479ee805 [crrcsim] fix udp sending compatibility with OSX 2013-10-19 22:33:05 +02:00
Gautier Hattenberger dd8389baf3 [crrcsim] fix crrcsim/nps for 64bit computers 2013-10-18 18:11:58 +02:00
Felix Ruess dcf678b417 [ground_segment] one warning per line
for values not setable form GCS strip
2013-10-17 19:38:34 +02:00
Gautier Hattenberger 3040dced41 [crrcsim] use crrcsim as fdm with nps
Install the patched version of crrcsim:
https://github.com/paparazzi/crrcsim-pprz
Select MNAV as input of crrcsim
Run nps simulator with crrcsim fdm type
2013-10-16 14:02:38 +02:00
Gautier Hattenberger 3614f53c02 [telemetry] fix some messages downlink in main_ap and cam 2013-10-15 23:53:16 +02:00
Felix Ruess 3dd68bf5ed [state interface] fix stateCalcHorizontalSpeedNorm_i 2013-10-15 19:26:41 +02:00
Gautier Hattenberger ce84749114 [fix] if no baro and no kalman, get vz from gps 2013-10-15 18:46:41 +02:00
Gautier Hattenberger 8f13aef998 [fix] fix mpl3115 driver and apogee baro_board 2013-10-15 18:45:58 +02:00
Felix Ruess 3c7c08d16f [rotorcraft][guidance_h] GUIDANCE_H_USE_SPEED_REF defaults to TRUE
This also allows to give velocity commands via RC in GUIDANCE_H_MODE_HOVER.
2013-10-15 17:24:12 +02:00
Felix Ruess cd86acde78 [conf] remove obsolete RC_CLIMB_COEF and RC_CLIMB_DEAD_BAND 2013-10-15 17:18:40 +02:00
Gautier Hattenberger 0d6db6469a [settings] fix GCS settings page when only one mode in a process
This solves the case where a process as only one mode by removing the
corresponding setting (since there is nothing to change) and by removing
the complete telemetry page if no more process.
The case without modes in a process fails at code generation since at
least one mode is required.

fix #553
2013-10-15 13:50:42 +02:00
Felix Ruess 131f63a5dd [conf] remove obsolete INS_BARO_SENS 2013-10-14 20:36:09 +02:00
Gautier Hattenberger 7c8be3839c [fix] typo in i2c.c 2013-10-14 18:29:53 +02:00
Felix Ruess f9fc9a6541 [conf][stm32] separate file for upload rules 2013-10-14 18:13:50 +02:00
Felix Ruess 25c7a7eaf6 [boards] fix missing brackets in baro_board_ms5611 2013-10-14 17:13:46 +02:00
Felix Ruess 61cb9a568e [telemetry] some updates for baro, ins, etc..
after merging master
2013-10-14 15:15:13 +02:00
Felix Ruess d3768649e3 [conf] only error on unconfigured x_I2C_DEV if TARGET is ap 2013-10-12 01:03:08 +02:00
Felix Ruess 72ea3b6aa6 [telemetry] update HOVER_LOOP
remove unused cmd_body and nav_err
2013-10-11 16:58:52 +02:00
Felix Ruess 8ac5fd8d5b Merge branch 'master' into telemetry
* master: (125 commits)
  [abi] define ABI x_SENDER_IDs in abi_sender_ids.h
  [sim] flight gear viz: daytime on all spots on the planet, not only France
  [abi] split abi messages from telemetry messages
  [fix] fix typo in actuators asctec v2
  [baro] fix baro scaling for booz and navgo
  [boards] sim pc: only USE_BARO_BOARD for nps
  [conf] move some airframes to obsolete
  [modules] add baro_sim
  [sim] remove unused sim_baro
  [apogee] fix baro mpl3115 init on apogee
  Update README for recommended gcc-arm-embedded toolchain
  [boards] stm32f4_discovery typo in description
  [boards] roughly correct BOOZ_BARO_SENS
  [modules] baro_ets: BARO_ETS_SCALE
  [modules] baro modules for real sensors only for ap target, not sim
  [conf] remove baro_board.xml module file
  [boards] update stm32f4_discovery
  [lib/ocaml] update leap_seconds
  [mission] fix segmentation fault and add generic mission FP
  [generator] generate arrays of the settings and fp blocks names
  ...

Conflicts:
	sw/airborne/firmwares/fixedwing/ap_downlink.h
	sw/airborne/firmwares/fixedwing/main_ap.c
	sw/airborne/firmwares/rotorcraft/telemetry.h
	sw/airborne/modules/sensors/baro_MS5534A.c
2013-10-11 16:51:44 +02:00
Felix Ruess ede94e0375 Merge pull request #539 quat_transformations
Rotorcraft guidance fixes/improvements

So now horizontal guidance returns commands in north/east earth frame and doesn't already rotate it to body frame.
This allows for better handling of them in different controllers.

New and properly working transformations from earth commands to quaternions added.
No proper fixedpoint implementation so far... no change there compared to current master though.
Should still be done for efficiency.

Tested the int_quat stablizitation with this in simulation and it works perfectly as expected.

IMPORTANT: This does currently not have the feature to "add" roll/pitch setpoints via RC in nav/hover anymore.
Is that really used, instead of switching to manual if needed?
Instead you can give velocity commands in hover mode via RC.

Includes max bank improvements proposed in #546

Split PD and I-gain with separate max bank
no wind: integrator (trim attitude) = 0, PD maxbank = -20 to 20 extra: total: -20 to 20
huge wind: integrator (trim attitude) = 20, PD maxbank = -20 to 20 extra: total: 0 to 40
Put gain before integrator to get better insight in the saturation values
Reduce integration overshoots while increasing integration speed by adding the speed error as well
no speed error: integrate as before
counterproductive speed error, integrate faster
if the position error is already decreasing fast, no integrator is needed or it will overshoot

closes #539
2013-10-11 15:52:39 +02:00
Felix Ruess f9a3c2f18d Merge pull request #525 baro_abi
Baro event handling using ABI interface

Main benefits:

less crappy handler functions in main.c files
possibility to use multiple sources of sensors (integrated to the board or not)
the filters don't need to know who is sending the raw values (not completely true with the old alt_float filter yet)

the pressure are now standardized in Pascal and the standard atmosphere model is used

The INS_BARO_SENS is hence not needed anymore.
onboard baros are automatically available in fixedwing firmware as well (use same code as rotorcraft now)

disable onboard baro with <configure name="USE_BARO_BOARD" value="FALSE"/>
Some stuff to do before using: find the default conversion factor to convert ADC values to Pascal
(mostly older boards/baro, recent digital sensors can output pressure in Pascal already)

Also all baro_board implementations use the same BARO_BOARD_SENDER_ID,
since there can only be one baro_board at the same time and this provides a good default for INS_BARO_ID.
So if you want to use an onboard baro the INS_BARO_ID is already ok (also if you have additional baro modules).
To use a baro module for INS: <define name="INS_BARO_ID" value="BARO_x_SENDER_ID"/>

closes #525
2013-10-11 15:25:14 +02:00
Felix Ruess b40da0ae56 Merge pull request #371 from paparazzi/ahrs_int_cmpl_quat_correction_scaling
ahrs_int_cmpl_quat frequency scaling

Proper scaling of corrections.
Using AHRS_PROPAGATE_FREQUENCY, AHRS_CORRECT_FREQUENCY and AHRS_MAG_CORRECT_FREQUENCY.
Hence this will also give you correct gains for 100Hz fixedwings, see #240.

Allow tuning of the accel and mag correction natural freqency and damping.
Tunable gravity_heuristic_factor (set to zero to turn it off and replaces the boolean AHRS_GRAVITY_UPDATE_NORM_HEURISTIC)
If you have high vibrations, reduce this factor or completely turn it off...
2013-10-11 06:12:05 -07:00
Felix Ruess 78ede475d4 [abi] define ABI x_SENDER_IDs in abi_sender_ids.h
Same BARO_BOARD_SENDER_ID for all baro_board implementations.
Since there can only be one baro_board at the same time and
this provides a good default for INS_BARO_ID.

The abi_sender_ids.h can be considered a temporary solution,
we might come up with a different scheme later...
2013-10-10 21:40:37 +02:00