Switch from GPLv2 to GPLv2+

[fw/altos] / src / product / ao_micropeak.h

diff --git a/src/product/ao_micropeak.h b/src/product/ao_micropeak.h
index 3e3dec1527a5d804d13d77700002d6f69fd039ab..6dc7a465167318d7d9984efcf743ef07f53c8d80 100644 (file)
--- a/src/product/ao_micropeak.h
+++ b/src/product/ao_micropeak.h
@@ -3,7 +3,8 @@
  *
  * This program 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; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,15 +21,30 @@
 
 #define SAMPLE_SLEEP           AO_MS_TO_TICKS(96)
 
-/* 16 sample, or about two seconds worth */
-#define GROUND_AVG_SHIFT       4
+/* 64 sample, or about six seconds worth */
+#define GROUND_AVG_SHIFT       6
 #define GROUND_AVG             (1 << GROUND_AVG_SHIFT)
 
 /* Pressure change (in Pa) to detect boost */
-#define BOOST_DETECT           120     /* 10m at sea level, 12m at 2000m */
+#ifndef BOOST_DETECT
+#define BOOST_DETECT           360     /* 30m at sea level, 36m at 2000m */
+#endif
+
+#ifndef LOG_INTERVAL
+#define LOG_INTERVAL            2      /* 192 ms */
+#endif
+
+#define AO_LOG_ID_MICROPEAK    0
+#define AO_LOG_ID_MICROKITE    1
+
+#ifndef AO_LOG_ID
+#define AO_LOG_ID              AO_LOG_ID_MICROPEAK
+#endif
 
 /* Wait after power on before doing anything to give the user time to assemble the rocket */
+#ifndef BOOST_DELAY
 #define BOOST_DELAY            AO_SEC_TO_TICKS(60)
+#endif
 
 /* Pressure change (in Pa) to detect landing */
 #define LAND_DETECT            24      /* 2m at sea level, 2.4m at 2000m */