diff options
| author | Keith Packard <keithp@keithp.com> | 2013-09-15 14:11:50 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-09-15 14:11:50 -0700 |
| commit | 690094e2d7d9cfe5eb4edb478fd79e5d133c6b4b (patch) | |
| tree | 613a0369133174f7365e78fc6b29c8ca1cad0aa5 /src | |
| parent | 2449d123690746d0d0d5d66dfc4d3a05b9f5dc0c (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/attiny/ao_async.c (renamed from src/micropeak/ao_async.c) | 0 | ||||
| -rw-r--r-- | src/attiny/ao_async.h (renamed from src/micropeak/ao_async.h) | 0 | ||||
| -rw-r--r-- | src/core/ao_log_micro.c (renamed from src/micropeak/ao_log_micro.c) | 0 | ||||
| -rw-r--r-- | src/core/ao_log_micro.h (renamed from src/micropeak/ao_log_micro.h) | 0 | ||||
| -rw-r--r-- | src/core/ao_microflight.c (renamed from src/micropeak/ao_microflight.c) | 0 | ||||
| -rw-r--r-- | src/core/ao_microkalman.c (renamed from src/micropeak/ao_microkalman.c) | 0 | ||||
| -rw-r--r-- | src/core/ao_report_micro.c (renamed from src/micropeak/ao_report_tiny.c) | 0 | ||||
| -rw-r--r-- | src/micropeak/Makefile | 6 | ||||
| -rw-r--r-- | src/product/ao_micropeak.c (renamed from src/micropeak/ao_micropeak.c) | 0 | ||||
| -rw-r--r-- | src/product/ao_micropeak.h (renamed from src/micropeak/ao_micropeak.h) | 2 |
10 files changed, 4 insertions, 4 deletions
diff --git a/src/micropeak/ao_async.c b/src/attiny/ao_async.c index 3556f54c..3556f54c 100644 --- a/src/micropeak/ao_async.c +++ b/src/attiny/ao_async.c diff --git a/src/micropeak/ao_async.h b/src/attiny/ao_async.h index 1b239712..1b239712 100644 --- a/src/micropeak/ao_async.h +++ b/src/attiny/ao_async.h diff --git a/src/micropeak/ao_log_micro.c b/src/core/ao_log_micro.c index d665efb5..d665efb5 100644 --- a/src/micropeak/ao_log_micro.c +++ b/src/core/ao_log_micro.c diff --git a/src/micropeak/ao_log_micro.h b/src/core/ao_log_micro.h index 976852ee..976852ee 100644 --- a/src/micropeak/ao_log_micro.h +++ b/src/core/ao_log_micro.h diff --git a/src/micropeak/ao_microflight.c b/src/core/ao_microflight.c index 714bb90a..714bb90a 100644 --- a/src/micropeak/ao_microflight.c +++ b/src/core/ao_microflight.c diff --git a/src/micropeak/ao_microkalman.c b/src/core/ao_microkalman.c index 0684ea2b..0684ea2b 100644 --- a/src/micropeak/ao_microkalman.c +++ b/src/core/ao_microkalman.c diff --git a/src/micropeak/ao_report_tiny.c b/src/core/ao_report_micro.c index 0e8e287f..0e8e287f 100644 --- a/src/micropeak/ao_report_tiny.c +++ b/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 index 10f0d192..10f0d192 100644 --- a/src/micropeak/ao_micropeak.c +++ b/src/product/ao_micropeak.c diff --git a/src/micropeak/ao_micropeak.h b/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 */ |