[paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in

paparazzi-commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in_progres

From:	noreply
Subject:	[paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in_progress
Date:	Tue, 30 Nov 2010 07:28:11 -0800

Branch: refs/heads/nav
Home:   https://github.com/paparazzi/paparazzi

Commit: 0c4ef5af65b97b827c25c2ca91262d9179b69eec
    
https://github.com/paparazzi/paparazzi/commit/0c4ef5af65b97b827c25c2ca91262d9179b69eec
Author: MarkGriffin <address@hidden>
Date:   2010-11-28 (Sun, 28 Nov 2010)

Changed paths:
  R sw/in_progress/antenna_track/Makefile
  R sw/in_progress/antenna_track/ant_track_pmm.c

Log Message:
-----------
move out of in_progress


Commit: 9798e0b6398c0fb686ae63a1ae81935546ac19ca
    
https://github.com/paparazzi/paparazzi/commit/9798e0b6398c0fb686ae63a1ae81935546ac19ca
Author: MarkGriffin <address@hidden>
Date:   2010-11-28 (Sun, 28 Nov 2010)

Changed paths:
  M Makefile
  M conf/Makefile.lpc21
  M sw/airborne/arch/lpc21/lpcusb/Makefile
  M sw/ground_segment/cockpit/Makefile
  A sw/ground_segment/cockpit/ant_track_pmm.c

Log Message:
-----------
Merge branch 'master' of git://github.com/paparazzi/paparazzi

Conflicts:
        sw/in_progress/antenna_track/Makefile
        sw/in_progress/antenna_track/ant_track_pmm.c


Commit: 992e60b979538c77234254ee132d4aab301f6729
    
https://github.com/paparazzi/paparazzi/commit/992e60b979538c77234254ee132d4aab301f6729
Author: Gautier Hattenberger <address@hidden>
Date:   2010-11-29 (Mon, 29 Nov 2010)

Changed paths:
  M sw/tools/gen_aircraft.ml

Log Message:
-----------
improve the makefile generator


Commit: 874506cf7652383865edc9a9d9f05063e4e80a54
    
https://github.com/paparazzi/paparazzi/commit/874506cf7652383865edc9a9d9f05063e4e80a54
Author: Gautier Hattenberger <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M sw/tools/gen_aircraft.ml

Log Message:
-----------
fix raw makefile parsing


Commit: da1c4db86c813917cc99f3cb74e02fbaaeff5a9d
    
https://github.com/paparazzi/paparazzi/commit/da1c4db86c813917cc99f3cb74e02fbaaeff5a9d
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M conf/airframes/booz2_flixr.xml

Log Message:
-----------
update airframe file


Commit: 89e44072fc9c4178cef6137cb9e5cb25c2134e49
    
https://github.com/paparazzi/paparazzi/commit/89e44072fc9c4178cef6137cb9e5cb25c2134e49
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M conf/airframes/booz2_flixr.xml
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  R conf/autopilot/subsystems/fixedwing/actuators_4015.makefile
  R conf/autopilot/subsystems/fixedwing/actuators_4017.makefile
  R conf/autopilot/subsystems/fixedwing/actuators_direct.makefile
  R conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
  R conf/autopilot/subsystems/fixedwing/radio_control_spektrum.makefile
  R conf/autopilot/subsystems/rotorcraft/radio_control_ppm.makefile
  R conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
  R conf/autopilot/subsystems/setup/actuators_4015.makefile
  R conf/autopilot/subsystems/setup/actuators_4017.makefile
  R conf/autopilot/subsystems/setup/actuators_direct.makefile
  A conf/autopilot/subsystems/shared/actuators_4015.makefile
  A conf/autopilot/subsystems/shared/actuators_4017.makefile
  A conf/autopilot/subsystems/shared/actuators_direct.makefile
  A conf/autopilot/subsystems/shared/radio_control_ppm.makefile
  A conf/autopilot/subsystems/shared/radio_control_spektrum.makefile
  M sw/tools/gen_aircraft.ml

Log Message:
-----------
Merge branch 'shared_subsystems'


Commit: 634d36e07996bd26178147f2cbfa21af268711be
    
https://github.com/paparazzi/paparazzi/commit/634d36e07996bd26178147f2cbfa21af268711be
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  R sw/airborne/max1167.c
  R sw/airborne/max1167.h

Log Message:
-----------
remove obsolete max1167 files, they already exist in obsolete folder


Commit: 5bb5c3cf072ee4362fc6dce3f8abaf9e9ccc04ee
    
https://github.com/paparazzi/paparazzi/commit/5bb5c3cf072ee4362fc6dce3f8abaf9e9ccc04ee
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  R sw/airborne/arch/lpc21/max1167_hw.c
  R sw/airborne/arch/lpc21/max1167_hw.h
  A sw/airborne/obsolete/max1167_hw.c
  A sw/airborne/obsolete/max1167_hw.h

Log Message:
-----------
move max1167_hw files to obsolete folder


Commit: 8ea86c49729fff27afaa60e726b1a02d5f4640e7
    
https://github.com/paparazzi/paparazzi/commit/8ea86c49729fff27afaa60e726b1a02d5f4640e7
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M conf/autopilot/subsystems/fixedwing/testing.makefile
  R sw/airborne/nova_test_imu.c
  A sw/airborne/test/nova_test_imu.c
  A sw/airborne/test/test_adcs.c
  R sw/airborne/test_adcs.c

Log Message:
-----------
move some test files to test dir


Commit: 166c3a40ed9921031cd6393c0d7d9d2e474173f7
    
https://github.com/paparazzi/paparazzi/commit/166c3a40ed9921031cd6393c0d7d9d2e474173f7
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M conf/autopilot/setup.makefile
  A sw/airborne/firmwares/setup/setup_actuators.c
  R sw/airborne/setup_actuators.c

Log Message:
-----------
move setup_actuators to firmwares/setup


Commit: a926164fba68443aa6b7330e28e67cd5c8066b8f
    
https://github.com/paparazzi/paparazzi/commit/a926164fba68443aa6b7330e28e67cd5c8066b8f
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M sw/tools/gen_aircraft.ml
  M sw/tools/gen_airframe.ml
  M sw/tools/gen_flight_plan.ml
  M sw/tools/gen_modules.ml
  M sw/tools/gen_settings.ml

Log Message:
-----------
cleanup trailing whitespaces in gen_* files


Commit: 85391d6ea262d99b8bed0a1bf5502c8f17eeef9b
    
https://github.com/paparazzi/paparazzi/commit/85391d6ea262d99b8bed0a1bf5502c8f17eeef9b
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M sw/tools/gen_flight_plan.ml
  M sw/tools/gen_modules.ml
  M sw/tools/gen_settings.ml

Log Message:
-----------
fix generated includes for generated header files


Commit: 1a6940f63c06642f0d1c7fa062b174cc523e9846
    
https://github.com/paparazzi/paparazzi/commit/1a6940f63c06642f0d1c7fa062b174cc523e9846
Author: Gautier Hattenberger <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M conf/airframes/airframe.dtd
  M sw/tools/gen_aircraft.ml

Log Message:
-----------
add subsystem target dependent support


Commit: f3cd997e737e01bc4e82ee251a2316834666a8d3
    
https://github.com/paparazzi/paparazzi/commit/f3cd997e737e01bc4e82ee251a2316834666a8d3
Author: Gautier Hattenberger <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M sw/tools/gen_aircraft.ml

Log Message:
-----------
switch order of subsystem parsing


Commit: 00b8ad0490e08288dae97448c0ac2ef119734c54
    
https://github.com/paparazzi/paparazzi/commit/00b8ad0490e08288dae97448c0ac2ef119734c54
Author: Felix Ruess <address@hidden>
Date:   2010-11-30 (Tue, 30 Nov 2010)

Changed paths:
  M conf/airframes/airframe.dtd
  M conf/airframes/booz2_flixr.xml
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  R conf/autopilot/subsystems/fixedwing/actuators_4015.makefile
  R conf/autopilot/subsystems/fixedwing/actuators_4017.makefile
  R conf/autopilot/subsystems/fixedwing/actuators_direct.makefile
  R conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
  R conf/autopilot/subsystems/fixedwing/radio_control_spektrum.makefile
  M conf/autopilot/subsystems/fixedwing/testing.makefile
  R conf/autopilot/subsystems/rotorcraft/radio_control_ppm.makefile
  R conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
  R conf/autopilot/subsystems/setup/actuators_4015.makefile
  R conf/autopilot/subsystems/setup/actuators_4017.makefile
  R conf/autopilot/subsystems/setup/actuators_direct.makefile
  A conf/autopilot/subsystems/shared/actuators_4015.makefile
  A conf/autopilot/subsystems/shared/actuators_4017.makefile
  A conf/autopilot/subsystems/shared/actuators_direct.makefile
  A conf/autopilot/subsystems/shared/radio_control_ppm.makefile
  A conf/autopilot/subsystems/shared/radio_control_spektrum.makefile
  R sw/airborne/arch/lpc21/max1167_hw.c
  R sw/airborne/arch/lpc21/max1167_hw.h
  A sw/airborne/firmwares/setup/setup_actuators.c
  R sw/airborne/max1167.c
  R sw/airborne/max1167.h
  R sw/airborne/nova_test_imu.c
  A sw/airborne/obsolete/max1167_hw.c
  A sw/airborne/obsolete/max1167_hw.h
  R sw/airborne/setup_actuators.c
  A sw/airborne/test/nova_test_imu.c
  A sw/airborne/test/test_adcs.c
  R sw/airborne/test_adcs.c
  M sw/ground_segment/cockpit/Makefile
  A sw/ground_segment/cockpit/ant_track_pmm.c
  R sw/in_progress/antenna_track/Makefile
  R sw/in_progress/antenna_track/ant_track_pmm.c
  M sw/tools/gen_aircraft.ml
  M sw/tools/gen_airframe.ml
  M sw/tools/gen_flight_plan.ml
  M sw/tools/gen_modules.ml
  M sw/tools/gen_settings.ml

Log Message:
-----------
Merge remote branch 'paparazzi/master' into nav

[Prev in Thread]

Current Thread

[Next in Thread]

[paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in_progress, noreply, 2010/11/28
- [paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in_progress, noreply <=

Prev by Date: [paparazzi-commits] [paparazzi/paparazzi] 01d255: fix includes so fixedwing ap also works with dummy...
Next by Date: [paparazzi-commits] [paparazzi/paparazzi] 1a6940: add subsystem target dependent support
Previous by thread: [paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in_progress
Next by thread: [paparazzi-commits] [paparazzi/paparazzi] 644fa7: remove all references to booz_fms from basic_booz ...
Index(es):
- Date
- Thread