X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fproduct%2Fao_micropeak.h;h=240eed5966dc28e35749ba8a0ebb91fe37879580;hb=HEAD;hp=396b9a235b60ac304107d1e6bcb45cedc503e59d;hpb=d1527a5457210eb914312cf8857bfb88982a8462;p=fw%2Faltos

diff --git a/src/product/ao_micropeak.h b/src/product/ao_micropeak.h
index 396b9a23..240eed59 100644
--- 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
@@ -18,7 +19,9 @@
 #ifndef _AO_MICROPEAK_H_
 #define _AO_MICROPEAK_H_
 
+#ifndef SAMPLE_SLEEP
 #define SAMPLE_SLEEP		AO_MS_TO_TICKS(96)
+#endif
 
 /* 64 sample, or about six seconds worth */
 #define GROUND_AVG_SHIFT	6
@@ -35,13 +38,16 @@
 
 #define AO_LOG_ID_MICROPEAK	0
 #define AO_LOG_ID_MICROKITE	1
+#define AO_LOG_ID_MICROPEAK2	2
 
 #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 */