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

Makefile.ac

@@ -65,13 +65,14 @@ Q=@
 ifeq ($(MAKECMDGOALS),all_ac_h)
 -include $(MAKEFILE_AC)
 
-# telemetry periodic frequency defaults to 60Hz
-TELEMETRY_FREQUENCY ?= 60
-
-ifdef PERIODIC_FREQUENCY
+ifdef PERIODIC_FREQUENC
+# telemetry and module periodic frequency default to PERIODIC_FREQUENCY
+TELEMETRY_FREQUENCY ?= $(PERIODIC_FREQUENCY)
 DEFAULT_MODULES_FREQUENCY = $(PERIODIC_FREQUENCY)
 else
-$(error Error: PERIODIC_FREQUENCY not configured)
+$(warning Info: PERIODIC_FREQUENCY not configured, defaulting to 60Hz for modules and telemetry)
+TELEMETRY_FREQUENCY ?= 60
+DEFAULT_MODULES_FREQUENCY = 60
 endif
 
 endif

sw/simulator/nps/nps_electrical.c

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013 Felix Ruess <felix.ruess@gmail.com>
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#include "nps_electrical.h"
+#include "generated/airframe.h"
+#include "subsystems/electrical.h"
+
+struct NpsElectrical nps_electrical;
+
+void nps_electrical_init(void) {
+
+#ifdef MAX_BAT_LEVEL
+  nps_electrical.supply_voltage = MAX_BAT_LEVEL;
+#else
+  nps_electrical.supply_voltage = 11.1;
+#endif
+
+}
+
+void nps_electrical_run_step(double time __attribute__ ((unused))) {
+  // todo: auto-decrease bat voltage
+  electrical.vsupply = nps_electrical.supply_voltage * 10;
+}

sw/simulator/nps/nps_electrical.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Felix Ruess <felix.ruess@gmail.com>
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef NPS_ELECTRICAL_H
+#define NPS_ELECTRICAL_H
+
+struct NpsElectrical {
+  float supply_voltage;
+};
+
+extern struct NpsElectrical nps_electrical;
+
+extern void nps_electrical_init(void);
+extern void nps_electrical_run_step(double time);
+
+#endif