From 690094e2d7d9cfe5eb4edb478fd79e5d133c6b4b Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 15 Sep 2013 14:11:50 -0700
Subject: [PATCH] altos: Move micropeak sources around

This sticks the micropeak sources in appropriate directories, rather
than in the micropeak product directory so that they can be shared
with future micropeak-style products.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/{micropeak => attiny}/ao_async.c                       | 0
 src/{micropeak => attiny}/ao_async.h                       | 0
 src/{micropeak => core}/ao_log_micro.c                     | 0
 src/{micropeak => core}/ao_log_micro.h                     | 0
 src/{micropeak => core}/ao_microflight.c                   | 0
 src/{micropeak => core}/ao_microkalman.c                   | 0
 src/{micropeak/ao_report_tiny.c => core/ao_report_micro.c} | 0
 src/micropeak/Makefile                                     | 6 +++---
 src/{micropeak => product}/ao_micropeak.c                  | 0
 src/{micropeak => product}/ao_micropeak.h                  | 2 +-
 10 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{micropeak => attiny}/ao_async.c (100%)
 rename src/{micropeak => attiny}/ao_async.h (100%)
 rename src/{micropeak => core}/ao_log_micro.c (100%)
 rename src/{micropeak => core}/ao_log_micro.h (100%)
 rename src/{micropeak => core}/ao_microflight.c (100%)
 rename src/{micropeak => core}/ao_microkalman.c (100%)
 rename src/{micropeak/ao_report_tiny.c => core/ao_report_micro.c} (100%)
 rename src/{micropeak => product}/ao_micropeak.c (100%)
 rename src/{micropeak => product}/ao_micropeak.h (98%)

diff --git a/src/micropeak/ao_async.c b/src/attiny/ao_async.c
similarity index 100%
rename from src/micropeak/ao_async.c
rename to src/attiny/ao_async.c
diff --git a/src/micropeak/ao_async.h b/src/attiny/ao_async.h
similarity index 100%
rename from src/micropeak/ao_async.h
rename to src/attiny/ao_async.h
diff --git a/src/micropeak/ao_log_micro.c b/src/core/ao_log_micro.c
similarity index 100%
rename from src/micropeak/ao_log_micro.c
rename to src/core/ao_log_micro.c
diff --git a/src/micropeak/ao_log_micro.h b/src/core/ao_log_micro.h
similarity index 100%
rename from src/micropeak/ao_log_micro.h
rename to src/core/ao_log_micro.h
diff --git a/src/micropeak/ao_microflight.c b/src/core/ao_microflight.c
similarity index 100%
rename from src/micropeak/ao_microflight.c
rename to src/core/ao_microflight.c
diff --git a/src/micropeak/ao_microkalman.c b/src/core/ao_microkalman.c
similarity index 100%
rename from src/micropeak/ao_microkalman.c
rename to src/core/ao_microkalman.c
diff --git a/src/micropeak/ao_report_tiny.c b/src/core/ao_report_micro.c
similarity index 100%
rename from src/micropeak/ao_report_tiny.c
rename to src/core/ao_report_micro.c
diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index 44e0b873..e51b2847 100644
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -2,7 +2,7 @@
 # Tiny AltOS build
 #
 #
-vpath % ../attiny:../drivers:../core:..
+vpath % ../attiny:../drivers:../core:../product:..
 vpath ao-make-product.5c ../util
 vpath make-altitude-pa ../util
 
@@ -30,7 +30,7 @@ ALTOS_SRC = \
 	ao_ms5607.c \
 	ao_exti.c \
 	ao_convert_pa.c \
-	ao_report_tiny.c \
+	ao_report_micro.c \
 	ao_notask.c \
 	ao_eeprom_tiny.c \
 	ao_panic.c \
@@ -53,7 +53,7 @@ INC=\
 IDPRODUCT=0
 PRODUCT=MicroPeak-v0.1
 PRODUCT_DEF=-DMICROPEAK
-CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers
+CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers -I../product
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
 
 NICKLE=nickle
diff --git a/src/micropeak/ao_micropeak.c b/src/product/ao_micropeak.c
similarity index 100%
rename from src/micropeak/ao_micropeak.c
rename to src/product/ao_micropeak.c
diff --git a/src/micropeak/ao_micropeak.h b/src/product/ao_micropeak.h
similarity index 98%
rename from src/micropeak/ao_micropeak.h
rename to src/product/ao_micropeak.h
index 382b98d9..3e3dec15 100644
--- a/src/micropeak/ao_micropeak.h
+++ b/src/product/ao_micropeak.h
@@ -28,7 +28,7 @@
 #define BOOST_DETECT		120	/* 10m at sea level, 12m at 2000m */
 
 /* Wait after power on before doing anything to give the user time to assemble the rocket */
-#define BOOST_DELAY		AO_SEC_TO_TICKS(30)
+#define BOOST_DELAY		AO_SEC_TO_TICKS(60)
 
 /* Pressure change (in Pa) to detect landing */
 #define LAND_DETECT		24	/* 2m at sea level, 2.4m at 2000m */
-- 
2.30.2