[paparazzi-commits] [paparazzi/paparazzi] c8487d: [nps] ups, add missing nps_electrical files

[GitHub]

  Branch: refs/heads/baro_abi
  Home:   https://github.com/paparazzi/paparazzi
  Commit: c8487dc5735875de98d630749b377761c13b2414
      
https://github.com/paparazzi/paparazzi/commit/c8487dc5735875de98d630749b377761c13b2414
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-13 (Fri, 13 Sep 2013)

  Changed paths:
    A sw/simulator/nps/nps_electrical.c
    A sw/simulator/nps/nps_electrical.h

  Log Message:
  -----------
  [nps] ups, add missing nps_electrical files


  Commit: 06e69bcaeab8fcfe96449dcccb1c51aea1b2a74d
      
https://github.com/paparazzi/paparazzi/commit/06e69bcaeab8fcfe96449dcccb1c51aea1b2a74d
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-13 (Fri, 13 Sep 2013)

  Changed paths:
    M Makefile.ac

  Log Message:
  -----------
  TELEMETRY_FREQUENCY defaults to PERIODIC_FREQUENCY

also default to 60Hz if PERIODIC_FREQUENCY is not configured


  Commit: d817c1e5ec4b3cf8d0be4f159523dfbeddd6b603
      
https://github.com/paparazzi/paparazzi/commit/d817c1e5ec4b3cf8d0be4f159523dfbeddd6b603
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-13 (Fri, 13 Sep 2013)

  Changed paths:
    M Makefile.ac
    A sw/simulator/nps/nps_electrical.c
    A sw/simulator/nps/nps_electrical.h

  Log Message:
  -----------
  Merge branch 'master' into baro_abi

get fixes from master:
  TELEMETRY_FREQUENCY defaults to PERIODIC_FREQUENCY or 60Hz
  [nps] ups, add missing nps_electrical files


Compare: 
https://github.com/paparazzi/paparazzi/compare/8f8a2674cfe5...d817c1e5ec4b