[paparazzi-commits] [paparazzi/paparazzi] 95781c: ezosd current sensor integration

[GitHub]

  Branch: refs/heads/v4.1
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 95781c25b1dc98a98ce54d27950b0f9d531c7f8a
      
https://github.com/paparazzi/paparazzi/commit/95781c25b1dc98a98ce54d27950b0f9d531c7f8a
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-05 (Fri, 05 Oct 2012)

  Changed paths:
    A conf/modules/ezcurrent.xml
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    A sw/airborne/modules/sensors/ezcurrent.c
    A sw/airborne/modules/sensors/ezcurrent.h
    M sw/airborne/subsystems/electrical.h

  Log Message:
  -----------
  ezosd current sensor integration


  Commit: 3f86973e4c4f045a42ec150a5213368bac381fa6
      
https://github.com/paparazzi/paparazzi/commit/3f86973e4c4f045a42ec150a5213368bac381fa6
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-05 (Fri, 05 Oct 2012)

  Changed paths:
    A conf/radios/ezuhf.xml

  Log Message:
  -----------
  ezuhf radio integration


  Commit: 08d34940944ddb97aa399d9e9d501abf5e2cb017
      
https://github.com/paparazzi/paparazzi/commit/08d34940944ddb97aa399d9e9d501abf5e2cb017
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M CHANGELOG.md
    M conf/boards/lisa_m_2.0.makefile
    M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
    A conf/radios/ezuhf.xml
    M paparazzi_version
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
    M sw/airborne/arch/stm32/stm32_vector_table.c
    M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/ground_segment/tmtc/link.ml
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/cserial.c
    M sw/lib/ocaml/gm.ml
    M sw/lib/ocaml/http.ml
    M sw/lib/ocaml/http.mli
    M sw/lib/ocaml/serial.ml
    M sw/lib/ocaml/serial.mli
    M sw/logalizer/play_core.ml
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_common.ml
    M sw/tools/Makefile
    M sw/tools/wiki_gen/Makefile

  Log Message:
  -----------
  Merge branch 'v4.1' of git://github.com/paparazzi/paparazzi into 
ezcurrent_sensor


  Commit: c40f1c1855079d219c42e8df4e00d8afa0b83810
      
https://github.com/paparazzi/paparazzi/commit/c40f1c1855079d219c42e8df4e00d8afa0b83810
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M conf/modules/ezcurrent.xml
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/modules/sensors/ezcurrent.c
    M sw/airborne/modules/sensors/ezcurrent.h

  Log Message:
  -----------
  updates review Felix: 05-10-2012


  Commit: 6d52aea5b6b7adc783d5dfbedd7f4d859ed8569f
      
https://github.com/paparazzi/paparazzi/commit/6d52aea5b6b7adc783d5dfbedd7f4d859ed8569f
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M sw/airborne/subsystems/gps/gps_skytraq.c

  Log Message:
  -----------
  skytraq fixes


  Commit: 23440b1c4ae5676fddef6479ea947d2f78fcf1fd
      
https://github.com/paparazzi/paparazzi/commit/23440b1c4ae5676fddef6479ea947d2f78fcf1fd
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M .gitignore
    M CHANGELOG.md
    M conf/airframes/CDW/debug_i2c_lpc.xml
    M conf/airframes/CDW/yapa3_aspirin2.xml
    M conf/airframes/CDW/yapa_xsens.xml
    A conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    A conf/airframes/examples/separate_fbw_ap.xml
    M conf/airframes/obsolete/twinjet1.xml
    M conf/airframes/obsolete/twinstar6.xml
    A conf/boards/yapa_2.0.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/fixedwing/intermcu_spi.makefile
    A conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
    A conf/firmwares/subsystems/shared/actuators_dummy.makefile
    M conf/flight_plans/flight_plan.dtd
    M conf/flight_plans/versatile.xml
    A conf/modules/geo_mag.xml
    A sw/airborne/boards/yapa_2.0.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/inter_mcu.c
    R sw/airborne/link_mcu.c
    R sw/airborne/link_mcu.h
    A sw/airborne/link_mcu_spi.c
    A sw/airborne/link_mcu_spi.h
    A sw/airborne/link_mcu_usart.c
    A sw/airborne/link_mcu_usart.h
    M sw/airborne/math/pprz_algebra_double.h
    A sw/airborne/math/pprz_geodetic_wmm2010.c
    A sw/airborne/math/pprz_geodetic_wmm2010.h
    A sw/airborne/modules/geo_mag/geo_mag.c
    A sw/airborne/modules/geo_mag/geo_mag.h
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
    M sw/airborne/subsystems/nav.c
    M sw/ground_segment/cockpit/live.ml
    M sw/lib/ocaml/mapCanvas.ml
    M sw/lib/ocaml/mapCanvas.mli
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/mergelogs.c
    M sw/tools/wiki_gen/wiki_gen.c

  Log Message:
  -----------
  Merge branch 'v4.1' of git://github.com/paparazzi/paparazzi into skytraq_fix


  Commit: d36830a37ed17afb670005465fd98a81f6ad573b
      
https://github.com/paparazzi/paparazzi/commit/d36830a37ed17afb670005465fd98a81f6ad573b
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Log Message:
  -----------
  Merge branch 'ezuhf' of github.com:gtoonstra/paparazzi into skytraq_fix


  Commit: 34e33bbc0fb8f3d68aad406d62a56135de2522d5
      
https://github.com/paparazzi/paparazzi/commit/34e33bbc0fb8f3d68aad406d62a56135de2522d5
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Log Message:
  -----------
  Merge branch 'ezcurrent_sensor' of github.com:gtoonstra/paparazzi into 
skytraq_fix


  Commit: 3c502eebb542a8255dddb5b85dc8c5e05d000aec
      
https://github.com/paparazzi/paparazzi/commit/3c502eebb542a8255dddb5b85dc8c5e05d000aec
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M .gitignore
    M CHANGELOG.md
    M Doxyfile
    M Makefile
    M conf/Makefile.stm32
    R conf/airframes/CDW/ChimuJTinyFwSpi.xml
    R conf/airframes/CDW/ChimuLisaFw.xml
    R conf/airframes/CDW/ChimuTinyFw.xml
    A conf/airframes/CDW/DualBoardApFbw.xml
    R conf/airframes/CDW/LisaAspirin2.xml
    A conf/airframes/CDW/classix.xml
    R conf/airframes/CDW/debug_i2c.xml
    R conf/airframes/CDW/debug_i2c_lpc.xml
    A conf/airframes/CDW/test/ChimuJTinyFwSpi.xml
    A conf/airframes/CDW/test/ChimuLisaFw.xml
    A conf/airframes/CDW/test/ChimuTinyFw.xml
    A conf/airframes/CDW/test/yapa3_aspirin2.xml
    A conf/airframes/CDW/tiny2_chimu_spi_pt.xml
    R conf/airframes/CDW/yapa3_aspirin2.xml
    M conf/airframes/CDW/yapa_xsens.xml
    A conf/airframes/examples/MentorEnergy.xml
    R conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    A conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    M conf/conf.xml.example
    M conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
    M conf/messages.xml
    M conf/modules/cam_point.xml
    M conf/modules/digital_cam.xml
    R conf/modules/geo_mag.xml
    A conf/modules/geo_mag.xml
    M conf/settings/control/ctl_energy.xml
    A conf/tests_conf.xml
    M sw/airborne/firmwares/fixedwing/autopilot.h
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/inter_mcu.h
    M sw/airborne/link_mcu_usart.c
    A sw/airborne/math/pprz_geodetic_wmm2010.c
    R sw/airborne/math/pprz_geodetic_wmm2010.c
    R sw/airborne/math/pprz_geodetic_wmm2010.h
    A sw/airborne/math/pprz_geodetic_wmm2010.h
    M sw/airborne/modules/digital_cam/led_cam_ctrl.h
    M sw/airborne/modules/geo_mag/geo_mag.c
    M sw/airborne/modules/geo_mag/geo_mag.h
    M sw/airborne/modules/sensors/ezcurrent.c
    M sw/airborne/subsystems/electrical.h
    M sw/ground_segment/tmtc/ivy_serial_bridge.c
    M sw/in_progress/rctx/main_rctx.c
    M sw/in_progress/satcom/tcp2ivy.c
    M sw/in_progress/satcom/tcp2ivy_generic.c
    R sw/in_progress/videolizer/Module.symvers_Debian_4.0_2.6.18-5-686
    R sw/in_progress/videolizer/README
    R sw/in_progress/videolizer/em28xx
    R sw/in_progress/videolizer/spook/COPYING
    R sw/in_progress/videolizer/spook/INSTALL
    R sw/in_progress/videolizer/spook/Makefile.am
    R sw/in_progress/videolizer/spook/Makefile.in
    R sw/in_progress/videolizer/spook/README
    R sw/in_progress/videolizer/spook/README-paparazzi
    R sw/in_progress/videolizer/spook/access_log.c
    R sw/in_progress/videolizer/spook/aclocal.m4
    R sw/in_progress/videolizer/spook/audio.c
    R sw/in_progress/videolizer/spook/base64_table.h
    R sw/in_progress/videolizer/spook/bswap.h
    R sw/in_progress/videolizer/spook/conf_parse.c
    R sw/in_progress/videolizer/spook/conf_parse.h
    R sw/in_progress/videolizer/spook/conf_scan.c
    R sw/in_progress/videolizer/spook/conf_scan.l
    R sw/in_progress/videolizer/spook/config.guess
    R sw/in_progress/videolizer/spook/config.h.in
    R sw/in_progress/videolizer/spook/config.sub
    R sw/in_progress/videolizer/spook/configure
    R sw/in_progress/videolizer/spook/configure.ac
    R sw/in_progress/videolizer/spook/control.c
    R sw/in_progress/videolizer/spook/conversions.c
    R sw/in_progress/videolizer/spook/conversions.h
    R sw/in_progress/videolizer/spook/decoder-mpeg4.c
    R sw/in_progress/videolizer/spook/depcomp
    R sw/in_progress/videolizer/spook/encoder-alaw.c
    R sw/in_progress/videolizer/spook/encoder-jpeg.c
    R sw/in_progress/videolizer/spook/encoder-mp2.c
    R sw/in_progress/videolizer/spook/encoder-mpeg4.c
    R sw/in_progress/videolizer/spook/encoders.h
    R sw/in_progress/videolizer/spook/event.c
    R sw/in_progress/videolizer/spook/event.h
    R sw/in_progress/videolizer/spook/filter-framedrop.c
    R sw/in_progress/videolizer/spook/filters.h
    R sw/in_progress/videolizer/spook/frame.c
    R sw/in_progress/videolizer/spook/frame.h
    R sw/in_progress/videolizer/spook/global_config.h
    R sw/in_progress/videolizer/spook/http-auth.c
    R sw/in_progress/videolizer/spook/http.c
    R sw/in_progress/videolizer/spook/input-dc1394.c
    R sw/in_progress/videolizer/spook/input-oss.c
    R sw/in_progress/videolizer/spook/input-v4l.c
    R sw/in_progress/videolizer/spook/input-v4l2.c
    R sw/in_progress/videolizer/spook/input-vdig.c
    R sw/in_progress/videolizer/spook/inputs.h
    R sw/in_progress/videolizer/spook/install-sh
    R sw/in_progress/videolizer/spook/jpeg_tables.h
    R sw/in_progress/videolizer/spook/live.c
    R sw/in_progress/videolizer/spook/log.c
    R sw/in_progress/videolizer/spook/log.h
    R sw/in_progress/videolizer/spook/md5.c
    R sw/in_progress/videolizer/spook/md5.h
    R sw/in_progress/videolizer/spook/missing
    R sw/in_progress/videolizer/spook/mpegaudio.c
    R sw/in_progress/videolizer/spook/mpegaudio.h
    R sw/in_progress/videolizer/spook/outputs.h
    R sw/in_progress/videolizer/spook/pmsg.c
    R sw/in_progress/videolizer/spook/pmsg.h
    R sw/in_progress/videolizer/spook/rtp-h263.c
    R sw/in_progress/videolizer/spook/rtp-jpeg.c
    R sw/in_progress/videolizer/spook/rtp-mpa.c
    R sw/in_progress/videolizer/spook/rtp-mpeg4.c
    R sw/in_progress/videolizer/spook/rtp-mpv.c
    R sw/in_progress/videolizer/spook/rtp-rawaudio.c
    R sw/in_progress/videolizer/spook/rtp.c
    R sw/in_progress/videolizer/spook/rtp.h
    R sw/in_progress/videolizer/spook/rtp_media.h
    R sw/in_progress/videolizer/spook/rtsp.c
    R sw/in_progress/videolizer/spook/session.c
    R sw/in_progress/videolizer/spook/sound_conv.c
    R sw/in_progress/videolizer/spook/spook.c
    R sw/in_progress/videolizer/spook/spook.conf.dist
    R sw/in_progress/videolizer/spook/spook.conf.usbmpeg4
    R sw/in_progress/videolizer/spook/spook.conf.usbraw
    R sw/in_progress/videolizer/spook/spookctl.c
    R sw/in_progress/videolizer/spook/stream.c
    R sw/in_progress/videolizer/spook/stream.h
    R sw/in_progress/videolizer/spook/tcp.c
    R sw/in_progress/videolizer/v4l-dvb-experimental/em28xx-cards.c
    R sw/in_progress/videolizer/v4l-dvb-experimental/em28xx.h
    R sw/in_progress/videolizer/wis-go7007-linux/COPYING
    R sw/in_progress/videolizer/wis-go7007-linux/Changes
    R sw/in_progress/videolizer/wis-go7007-linux/Makefile
    R sw/in_progress/videolizer/wis-go7007-linux/README
    R sw/in_progress/videolizer/wis-go7007-linux/README-paparazzi
    R sw/in_progress/videolizer/wis-go7007-linux/README.saa7134
    R sw/in_progress/videolizer/wis-go7007-linux/RELEASE-NOTES
    R sw/in_progress/videolizer/wis-go7007-linux/apps/Makefile
    R sw/in_progress/videolizer/wis-go7007-linux/apps/gorecord.c
    R sw/in_progress/videolizer/wis-go7007-linux/apps/modet.c
    R sw/in_progress/videolizer/wis-go7007-linux/apps/tv-freq.c
    R sw/in_progress/videolizer/wis-go7007-linux/checkfwdir
    R sw/in_progress/videolizer/wis-go7007-linux/firmware/ezusb/hpi_LR192.hex
    R sw/in_progress/videolizer/wis-go7007-linux/firmware/ezusb/hpi_PX-M402U.hex
    R 
sw/in_progress/videolizer/wis-go7007-linux/firmware/ezusb/hpi_PX-TV402U.hex
    R sw/in_progress/videolizer/wis-go7007-linux/firmware/ezusb/hpi_StarTrek.hex
    R sw/in_progress/videolizer/wis-go7007-linux/firmware/go7007fw.bin
    R sw/in_progress/videolizer/wis-go7007-linux/firmware/go7007tv.bin
    R sw/in_progress/videolizer/wis-go7007-linux/hotplug/wis-ezusb.in
    R sw/in_progress/videolizer/wis-go7007-linux/hotplug/wis.usermap-ezusb
    R sw/in_progress/videolizer/wis-go7007-linux/include/go7007.h
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/Makefile
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-driver.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-fw.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-i2c.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-priv.h
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-usb.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-v4l2.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/saa7134-go7007.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/snd-go7007.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-i2c.h
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-ov7640.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7113.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7115.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-sony-tuner.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw2804.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw9903.c
    R sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-uda1342.c
    R 
sw/in_progress/videolizer/wis-go7007-linux/patches/2.6.11/saa7134-voyager.diff
    R 
sw/in_progress/videolizer/wis-go7007-linux/patches/2.6.11/tda8275-newaddr.diff
    R 
sw/in_progress/videolizer/wis-go7007-linux/patches/2.6.11/tda8290-ntsc.diff
    R sw/in_progress/videolizer/wis-go7007-linux/udev/wis-ezusb.rules.in
    M sw/logalizer/matlab_log/messages.xml
    A sw/tools/stm32loader/COPYING3
    A sw/tools/stm32loader/README
    A sw/tools/stm32loader/stm32loader.py
    M sw/tools/wiki_gen/Makefile
    R tests/examples/01_compile_all_example_targets.t
    A tests/examples/01_compile_all_test_targets.t

  Log Message:
  -----------
  Merge branch 'v4.1' of git://github.com/paparazzi/paparazzi into skytraq_fix


  Commit: f7d87092497966b6d8cfd89bfc4c3094ed6d0cce
      
https://github.com/paparazzi/paparazzi/commit/f7d87092497966b6d8cfd89bfc4c3094ed6d0cce
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M sw/airborne/subsystems/gps/gps_skytraq.c

  Log Message:
  -----------
  fix for gps issue


  Commit: 372912b9c2fb1f7ffce08cbb4eb78c0522b250ff
      
https://github.com/paparazzi/paparazzi/commit/372912b9c2fb1f7ffce08cbb4eb78c0522b250ff
  Author: Gerard Toonstra <address@hidden>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M sw/airborne/subsystems/gps/gps_skytraq.c

  Log Message:
  -----------
  fixed course


  Commit: 398581e12e4839944cd2cf9619d2f17aab3a6db2
      
https://github.com/paparazzi/paparazzi/commit/398581e12e4839944cd2cf9619d2f17aab3a6db2
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M sw/airborne/subsystems/gps/gps_skytraq.c

  Log Message:
  -----------
  Merge pull request #308 from gtoonstra/skytraq_fix

Skytraq fix


Compare: 
https://github.com/paparazzi/paparazzi/compare/358497a96464...398581e12e48