From 81ad44d4b6d9ad2f6b91d0906e8543da82da424f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 9 Aug 2011 14:26:43 -0700
Subject: [PATCH] altos: Switch telemini from v0.1 to v1.0

TeleMini production boards are firmware compatible with the v0.1
design, so instead of creating another product, just rename the
existing one.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/Makefile                                    | 2 +-
 src/ao_adc.c                                    | 2 +-
 src/ao_pins.h                                   | 2 +-
 src/ao_telemetry.c                              | 2 +-
 src/telemini-v0.1/Makefile.defs                 | 9 ---------
 src/{telemini-v0.1 => telemini-v1.0}/.gitignore | 0
 src/{telemini-v0.1 => telemini-v1.0}/.sdcdbrc   | 0
 src/{telemini-v0.1 => telemini-v1.0}/Makefile   | 0
 src/telemini-v1.0/Makefile.defs                 | 9 +++++++++
 9 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 src/telemini-v0.1/Makefile.defs
 rename src/{telemini-v0.1 => telemini-v1.0}/.gitignore (100%)
 rename src/{telemini-v0.1 => telemini-v1.0}/.sdcdbrc (100%)
 rename src/{telemini-v0.1 => telemini-v1.0}/Makefile (100%)
 create mode 100644 src/telemini-v1.0/Makefile.defs

diff --git a/src/Makefile b/src/Makefile
index 3eec3980..018f0c5c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,7 +9,7 @@ include Version
 SUBDIRS=\
 	telemetrum-v1.1 telemetrum-v1.0 \
 	teledongle-v0.2 teledongle-v0.1 \
-	telemini-v0.1 telenano-v0.1 \
+	telemini-v1.0 telenano-v0.1 \
 	telebt-v0.0 telebt-v0.1 \
 	telemetrum-v0.1-sky telemetrum-v0.1-sirf \
 	tidongle test
diff --git a/src/ao_adc.c b/src/ao_adc.c
index cbeb6a24..786dfd11 100644
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -84,7 +84,7 @@ ao_adc_isr(void) __interrupt 1
 #if IGNITE_ON_P0
 	/* TeleMini readings */
 	a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].pres);
-#ifdef TELEMINI_V_0_1
+#ifdef TELEMINI_V_1_0
 	switch (sequence) {
 	case 0:
 		/* pressure */
diff --git a/src/ao_pins.h b/src/ao_pins.h
index 4a03ca50..bc07ad54 100644
--- a/src/ao_pins.h
+++ b/src/ao_pins.h
@@ -97,7 +97,7 @@
 	#define HAS_IGNITE		0
 #endif
 
-#if defined(TELEMINI_V_0_1)
+#if defined(TELEMINI_V_1_0)
 	#define HAS_FLIGHT		1
 	#define HAS_USB			0
 	#define HAS_BEEP		0
diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c
index 172b6f17..52f818ed 100644
--- a/src/ao_telemetry.c
+++ b/src/ao_telemetry.c
@@ -35,7 +35,7 @@ static __pdata uint16_t ao_rdf_time;
 #define AO_TELEMETRY_SENSOR	AO_TELEMETRY_SENSOR_TELEMETRUM
 #endif
 
-#if defined(TELEMINI_V_0_1)
+#if defined(TELEMINI_V_1_0)
 #define AO_TELEMETRY_SENSOR	AO_TELEMETRY_SENSOR_TELEMINI
 #endif
 
diff --git a/src/telemini-v0.1/Makefile.defs b/src/telemini-v0.1/Makefile.defs
deleted file mode 100644
index 94ac1268..00000000
--- a/src/telemini-v0.1/Makefile.defs
+++ /dev/null
@@ -1,9 +0,0 @@
-PROG = telemini-v0.1-$(VERSION).ihx
-
-SRC = \
-	$(TMINI_BASE_SRC)
-
-PRODUCT=TeleMini-v0.1
-PRODUCT_DEF=-DTELEMINI_V_0_1
-IDPRODUCT=0x000a
-CODESIZE=0x6700
diff --git a/src/telemini-v0.1/.gitignore b/src/telemini-v1.0/.gitignore
similarity index 100%
rename from src/telemini-v0.1/.gitignore
rename to src/telemini-v1.0/.gitignore
diff --git a/src/telemini-v0.1/.sdcdbrc b/src/telemini-v1.0/.sdcdbrc
similarity index 100%
rename from src/telemini-v0.1/.sdcdbrc
rename to src/telemini-v1.0/.sdcdbrc
diff --git a/src/telemini-v0.1/Makefile b/src/telemini-v1.0/Makefile
similarity index 100%
rename from src/telemini-v0.1/Makefile
rename to src/telemini-v1.0/Makefile
diff --git a/src/telemini-v1.0/Makefile.defs b/src/telemini-v1.0/Makefile.defs
new file mode 100644
index 00000000..0e91f2fc
--- /dev/null
+++ b/src/telemini-v1.0/Makefile.defs
@@ -0,0 +1,9 @@
+PROG = telemini-v1.0-$(VERSION).ihx
+
+SRC = \
+	$(TMINI_BASE_SRC)
+
+PRODUCT=TeleMini-v1.0
+PRODUCT_DEF=-DTELEMINI_V_1_0
+IDPRODUCT=0x000a
+CODESIZE=0x6700
-- 
2.30.2