[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 3107ec: Merge pull request #55
|
From: |
noreply |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] 3107ec: Merge pull request #55 from akochevar/master |
|
Date: |
Sat, 18 Jun 2011 07:23:11 -0700 |
Branch: refs/heads/dev
Home: https://github.com/paparazzi/paparazzi
Commit: 3107ece8d8f2faed1a5b7c79fbe93669fa3e9908
https://github.com/paparazzi/paparazzi/commit/3107ece8d8f2faed1a5b7c79fbe93669fa3e9908
Author: Felix Ruess <address@hidden>
Date: 2011-06-09 (Thu, 09 Jun 2011)
Changed paths:
A conf/airframes/NoVa_L.xml
Log Message:
-----------
Merge pull request #55 from akochevar/master
Testing Git with my airframe
Commit: 44e9c68ed1d26f785f188cf1e8a0051797bcd39a
https://github.com/paparazzi/paparazzi/commit/44e9c68ed1d26f785f188cf1e8a0051797bcd39a
Author: Gautier Hattenberger <address@hidden>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
M sw/airborne/modules/com/generic_com.c
M sw/ground_segment/tmtc/fw_server.ml
M sw/in_progress/satcom/tcp2ivy_generic.c
Log Message:
-----------
update generic_com module to new gps interface
Commit: 71d42c0698ec3977ea5b40c80f392b9b728aef6c
https://github.com/paparazzi/paparazzi/commit/71d42c0698ec3977ea5b40c80f392b9b728aef6c
Author: Gautier Hattenberger <address@hidden>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
M sw/airborne/modules/ins/ins_arduimu_basic.c
Log Message:
-----------
fix huge bug in high accel hack; set USE_HIGH_ACCEL_FLAG to enable this
feature
Commit: 06dad5b201d2a5e758c9de71bf894a7cff064706
https://github.com/paparazzi/paparazzi/commit/06dad5b201d2a5e758c9de71bf894a7cff064706
Author: Gautier Hattenberger <address@hidden>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
M sw/airborne/modules/ins/ins_arduimu_basic.c
Log Message:
-----------
bug fix (forgot to save on previous commit)
Commit: 9d3dc80e1cd6b9aa44d11fefe79074c6b0f0b2e9
https://github.com/paparazzi/paparazzi/commit/9d3dc80e1cd6b9aa44d11fefe79074c6b0f0b2e9
Author: akochevar <address@hidden>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
Log Message:
-----------
Commit to fix errors in the original release of this subsystem.
Commit: 1a5ee01a8d4d62e34b26bfe456262461da94641c
https://github.com/paparazzi/paparazzi/commit/1a5ee01a8d4d62e34b26bfe456262461da94641c
Author: akochevar <address@hidden>
Date: 2011-06-11 (Sat, 11 Jun 2011)
Changed paths:
M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
Log Message:
-----------
Fixes based on comments from Felix.
Commit: 83459c64884f37353b8eaa463d72404d477e3174
https://github.com/paparazzi/paparazzi/commit/83459c64884f37353b8eaa463d72404d477e3174
Author: Felix Ruess <address@hidden>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
Log Message:
-----------
Merge pull request #56 from akochevar/master
crista_hmc5843
Commit: d07f1e7b9477f63ee9e7093dceea30e0ddc15e77
https://github.com/paparazzi/paparazzi/commit/d07f1e7b9477f63ee9e7093dceea30e0ddc15e77
Author: Felix Ruess <address@hidden>
Date: 2011-06-13 (Mon, 13 Jun 2011)
Changed paths:
M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
Log Message:
-----------
added imu_overrun to sim of imu_b2 to stop settings from complaining
Commit: 99b8d0bf9bce85f4f5fc21db80226239d99453e9
https://github.com/paparazzi/paparazzi/commit/99b8d0bf9bce85f4f5fc21db80226239d99453e9
Author: Felix Ruess <address@hidden>
Date: 2011-06-13 (Mon, 13 Jun 2011)
Changed paths:
R conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
M conf/autopilot/subsystems/shared/imu_aspirin.makefile
Log Message:
-----------
just one shared imu subsystem for aspirin
Commit: bb2f6f729392f4b7669b203c1952f8a9ecda2af9
https://github.com/paparazzi/paparazzi/commit/bb2f6f729392f4b7669b203c1952f8a9ecda2af9
Author: Felix Ruess <address@hidden>
Date: 2011-06-13 (Mon, 13 Jun 2011)
Changed paths:
M conf/autopilot/subsystems/fixedwing/imu_ppzuav.makefile
Log Message:
-----------
check arch correctly in imu_ppzuav.makefile
Commit: 808205d346f9fe6f65e9b6516c23216217da1496
https://github.com/paparazzi/paparazzi/commit/808205d346f9fe6f65e9b6516c23216217da1496
Author: Felix Ruess <address@hidden>
Date: 2011-06-15 (Wed, 15 Jun 2011)
Changed paths:
R conf/settings/fw_ctl_n.xml
Log Message:
-----------
cleanup: removed fw_ctl_n.xml settings file, please use tuning_ctl_new.xml
instead
Commit: 65b8f956cfa3891cec1adaf7c87266e42f459dcb
https://github.com/paparazzi/paparazzi/commit/65b8f956cfa3891cec1adaf7c87266e42f459dcb
Author: Felix Ruess <address@hidden>
Date: 2011-06-15 (Wed, 15 Jun 2011)
Changed paths:
M conf/settings/basic.xml
M conf/settings/flight_params.xml
Log Message:
-----------
settings: fix module in basic.xml, update flight_params.xml
Commit: f725e69c2de3477658d5c232fd272d09da29e7d4
https://github.com/paparazzi/paparazzi/commit/f725e69c2de3477658d5c232fd272d09da29e7d4
Author: Felix Ruess <address@hidden>
Date: 2011-06-15 (Wed, 15 Jun 2011)
Changed paths:
M conf/airframes/flixr_discovery.xml
Log Message:
-----------
update discovery airframe file for new adaptive control and other small things
Commit: f077eb14fc00cbb15c029f0a7cba1f873938c519
https://github.com/paparazzi/paparazzi/commit/f077eb14fc00cbb15c029f0a7cba1f873938c519
Author: Felix Ruess <address@hidden>
Date: 2011-06-15 (Wed, 15 Jun 2011)
Changed paths:
M conf/airframes/flixr_discovery.xml
Log Message:
-----------
discovery airframe: use THROTTLE_SLEW_LIMITER instead of THROTTLE_SLEW
directly
Commit: 7556f5460844754e8f46124184cfced71ba51e29
https://github.com/paparazzi/paparazzi/commit/7556f5460844754e8f46124184cfced71ba51e29
Author: Gautier Hattenberger <address@hidden>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M sw/ground_segment/cockpit/gcs.ml
Log Message:
-----------
fix -google_fill uncaught error
Commit: b0565a9ac89ea7cc222297d73ef04ff20f547434
https://github.com/paparazzi/paparazzi/commit/b0565a9ac89ea7cc222297d73ef04ff20f547434
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M conf/modules/light.xml
M sw/airborne/modules/light/light.c
Log Message:
-----------
Lights
Commit: dbb28bc6106fdf7fd444de9109c2d65e13365f96
https://github.com/paparazzi/paparazzi/commit/dbb28bc6106fdf7fd444de9109c2d65e13365f96
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M sw/ground_segment/cockpit/gcs.ml
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi
Commit: 4a1f67d8fc0aac074f9f8a9683f518d388713c19
https://github.com/paparazzi/paparazzi/commit/4a1f67d8fc0aac074f9f8a9683f518d388713c19
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M sw/ground_segment/cockpit/live.ml
M sw/ground_segment/tmtc/fw_server.ml
Log Message:
-----------
GCS issues a warning when FBW is in FAILSAFE mode
Commit: 7e0a1a96c5fd19552e0696c8f6505c16ab16d064
https://github.com/paparazzi/paparazzi/commit/7e0a1a96c5fd19552e0696c8f6505c16ab16d064
Author: Felix Ruess <address@hidden>
Date: 2011-06-17 (Fri, 17 Jun 2011)
Changed paths:
M conf/modules/light.xml
M sw/airborne/modules/light/light.c
M sw/ground_segment/cockpit/gcs.ml
M sw/ground_segment/cockpit/live.ml
M sw/ground_segment/tmtc/fw_server.ml
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi
Commit: 67cd383a5a310249d42b3e22767389a9f685eda1
https://github.com/paparazzi/paparazzi/commit/67cd383a5a310249d42b3e22767389a9f685eda1
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-17 (Fri, 17 Jun 2011)
Changed paths:
M sw/airborne/firmwares/fixedwing/main_fbw.c
Log Message:
-----------
FailSafe actuator commands must update immediately
Commit: 9f1b87f88d13e704bffb99e6c486681278e78d44
https://github.com/paparazzi/paparazzi/commit/9f1b87f88d13e704bffb99e6c486681278e78d44
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-17 (Fri, 17 Jun 2011)
Changed paths:
M conf/messages.xml
M sw/ground_segment/cockpit/live.ml
M sw/ground_segment/tmtc/aircraft.ml
M sw/ground_segment/tmtc/aircraft.mli
M sw/ground_segment/tmtc/fw_server.ml
M sw/ground_segment/tmtc/rotorcraft_server.ml
M sw/ground_segment/tmtc/server.ml
M sw/ground_segment/tmtc/server_globals.ml
Log Message:
-----------
Fixedwing: show FAIL when in FailSafe mode + issue speech warning |
Fixedwing: GCS thrust FBW_STATUS better than PPRZ_MODE when FAIL mode is active
| FW+RW: Collect state_filter status in GCS with new common STATE_FILTER_STATUS
message to show IMU/AHRS failures
Commit: def5b8cde32475f6e61f0d30c034fa820e81ad31
https://github.com/paparazzi/paparazzi/commit/def5b8cde32475f6e61f0d30c034fa820e81ad31
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-17 (Fri, 17 Jun 2011)
Changed paths:
M conf/messages.xml
M conf/telemetry/default.xml
M conf/telemetry/default_fixedwing_imu.xml
M sw/airborne/ap_downlink.h
M sw/ground_segment/cockpit/live.ml
Log Message:
-----------
Low Contrast Warning, AHRS Alinger Warning
Commit: 21b4532f21e5b9e5baab3bd9027d68ae3e6b1048
https://github.com/paparazzi/paparazzi/commit/21b4532f21e5b9e5baab3bd9027d68ae3e6b1048
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-17 (Fri, 17 Jun 2011)
Changed paths:
A conf/airframes/TU_Delft/MicrojetBRimu.xml
Log Message:
-----------
PPZIMU in Microjet
Commit: d1c02eb87fdac6ff271b21723516eb5f5d4a42c8
https://github.com/paparazzi/paparazzi/commit/d1c02eb87fdac6ff271b21723516eb5f5d4a42c8
Author: Christophe De Wagter <address@hidden>
Date: 2011-06-17 (Fri, 17 Jun 2011)
Changed paths:
M sw/airborne/ap_downlink.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/inter_mcu.h
Log Message:
-----------
FBW->AP still working on FAILSAFE, IMU failure visible in GCS
Commit: 0a93537c727992915c7072d2e300f3744e6d1861
https://github.com/paparazzi/paparazzi/commit/0a93537c727992915c7072d2e300f3744e6d1861
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
A conf/airframes/TU_Delft/MicrojetBRimu.xml
M conf/messages.xml
M conf/telemetry/default.xml
M conf/telemetry/default_fixedwing_imu.xml
M sw/airborne/ap_downlink.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/inter_mcu.h
M sw/ground_segment/cockpit/live.ml
M sw/ground_segment/tmtc/aircraft.ml
M sw/ground_segment/tmtc/aircraft.mli
M sw/ground_segment/tmtc/fw_server.ml
M sw/ground_segment/tmtc/rotorcraft_server.ml
M sw/ground_segment/tmtc/server.ml
M sw/ground_segment/tmtc/server_globals.ml
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi
Commit: 4a6eeae45625d1c9470a7083eff43528463efec6
https://github.com/paparazzi/paparazzi/commit/4a6eeae45625d1c9470a7083eff43528463efec6
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
M conf/airframes/flixr_discovery.xml
Log Message:
-----------
discovery airframe: enable ets airspeeds sensor and use different vic slot
for i2c0 as slot 9 is already in use by imu
Commit: c87be8a41e8ab910c942a410e01fb588857a7c65
https://github.com/paparazzi/paparazzi/commit/c87be8a41e8ab910c942a410e01fb588857a7c65
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
A conf/settings/tuning_ctl_adaptive.xml
Log Message:
-----------
added settings file to tune adaptive control (without airspeed)
Commit: e7f4281da0838fb632ddac19257d667554bfe598
https://github.com/paparazzi/paparazzi/commit/e7f4281da0838fb632ddac19257d667554bfe598
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
M conf/telemetry/default_fixedwing_imu.xml
Log Message:
-----------
default fw imu telemetry: send desired with higher rate, don't send raw
values in default mode (use debug imu for that)
Commit: d0cc41cc8e6e7b52bc66aff02a09c0bdaa98a118
https://github.com/paparazzi/paparazzi/commit/d0cc41cc8e6e7b52bc66aff02a09c0bdaa98a118
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
M conf/airframes/funjet_cam_example.xml
M conf/messages.xml
M conf/modules/digital_cam.xml
M conf/settings/dc.xml
M sw/airborne/ap_downlink.h
M sw/airborne/modules/cam_control/cam.c
M sw/airborne/modules/cam_control/cam.h
M sw/airborne/modules/cam_control/point.c
M sw/airborne/modules/cam_control/point.h
M sw/airborne/modules/digital_cam/dc.c
M sw/airborne/modules/digital_cam/dc.h
M sw/airborne/subsystems/navigation/poly_survey_adv.c
M sw/airborne/subsystems/navigation/spiral.c
Log Message:
-----------
Merge branch 'cam' into dev
resolved conflicts:
conf/messages.xml
sw/airborne/modules/digital_cam/dc.c
Commit: 9cae0a30014208adc04e613aba27cbc20a02054f
https://github.com/paparazzi/paparazzi/commit/9cae0a30014208adc04e613aba27cbc20a02054f
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
M sw/airborne/modules/ins/alt_filter.c
M sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_chimu_uart.c
Log Message:
-----------
some fixes for ins modules to use new gps interface
Commit: ef0a3b8a25073a0d6e238c0b3ae38f81fea872f5
https://github.com/paparazzi/paparazzi/commit/ef0a3b8a25073a0d6e238c0b3ae38f81fea872f5
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
M conf/airframes/ENAC/fixed-wing/funjet3.xml
A conf/airframes/ENAC/fixed-wing/spocIII-1.xml
A conf/airframes/ENAC/fixed-wing/spocIII-2.xml
A conf/airframes/ENAC/fixed-wing/spocIII-3.xml
A conf/airframes/NoVa_L.xml
A conf/airframes/TU_Delft/MicrojetBRimu.xml
M conf/airframes/flixr_discovery.xml
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
M conf/autopilot/subsystems/fixedwing/imu_ppzuav.makefile
R conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
M conf/autopilot/subsystems/shared/imu_aspirin.makefile
A conf/flight_plans/corsica.xml
A conf/flight_plans/corsica_sectors.xml
A conf/gcs/wide.xml
A conf/joystick/gp_interlink.xml
M conf/messages.xml
A conf/modules/alt_filter.xml
A conf/modules/generic_com.xml
M conf/modules/light.xml
M conf/settings/basic.xml
M conf/settings/flight_params.xml
R conf/settings/fw_ctl_n.xml
A conf/settings/tuning_ctl_adaptive.xml
M conf/telemetry/default.xml
M conf/telemetry/default_fixedwing_imu.xml
M sw/airborne/ap_downlink.h
M sw/airborne/arch/sim/jsbsim_ir.c
M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
M sw/airborne/firmwares/fixedwing/autopilot.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
A sw/airborne/firmwares/non_ap/satcom/satcom.pde
M sw/airborne/inter_mcu.h
A sw/airborne/modules/com/generic_com.c
A sw/airborne/modules/com/generic_com.h
A sw/airborne/modules/ins/alt_filter.c
A sw/airborne/modules/ins/alt_filter.h
M sw/airborne/modules/ins/ins_arduimu_basic.c
M sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_chimu_uart.c
M sw/airborne/modules/light/light.c
M sw/airborne/modules/sensors/airspeed_ets.c
M sw/airborne/modules/sensors/baro_ets.c
M sw/ground_segment/cockpit/gcs.ml
M sw/ground_segment/cockpit/live.ml
M sw/ground_segment/tmtc/aircraft.ml
M sw/ground_segment/tmtc/aircraft.mli
M sw/ground_segment/tmtc/fw_server.ml
M sw/ground_segment/tmtc/rotorcraft_server.ml
M sw/ground_segment/tmtc/server.ml
M sw/ground_segment/tmtc/server_globals.ml
A sw/in_progress/satcom/Makefile
A sw/in_progress/satcom/email2udp.c
A sw/in_progress/satcom/grlobke
A sw/in_progress/satcom/tcp2ivy.c
A sw/in_progress/satcom/tcp2ivy_generic.c
A sw/in_progress/satcom/udp2tcp.c
Log Message:
-----------
Merge branch 'master' into dev
Commit: 07839bb0535809a4d80f66aca356837e7e9dd464
https://github.com/paparazzi/paparazzi/commit/07839bb0535809a4d80f66aca356837e7e9dd464
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
M sw/airborne/modules/cam_control/point.c
M sw/airborne/modules/digital_cam/dc.c
M sw/airborne/modules/digital_cam/dc.h
Log Message:
-----------
updated cam modules dc and point to use new gps interface
Commit: 5e34be0ed2030932ec709b9807eee685edd4b175
https://github.com/paparazzi/paparazzi/commit/5e34be0ed2030932ec709b9807eee685edd4b175
Author: Felix Ruess <address@hidden>
Date: 2011-06-18 (Sat, 18 Jun 2011)
Changed paths:
M sw/airborne/subsystems/navigation/spiral.c
Log Message:
-----------
CamAngle in spiral if DIGITAL_CAM
Compare: https://github.com/paparazzi/paparazzi/compare/539a5bd...5e34be0