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>

diff --git a/src/Makefile b/src/Makefile
index 3eec3980f6ce9aff2da1fdb0f34ba4a5100194e6..018f0c5c1f7c46300729661f86362e36dff9a26c 100644 (file)
--- 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 cbeb6a24e5b13b141878fea484dfc2d77459f4a5..786dfd11d292dc45830061eca1d380554d4ef5ba 100644 (file)
--- 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 4a03ca508ae9ab628ce17d554ec37c7c502b6243..bc07ad54ff26a8b8b250b6c44449ca156e6cad58 100644 (file)
--- 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 172b6f1756f47654ba5602d67d0990f6112f7258..52f818ed3c09628d3ffe5aa51c4567c95c93a16d 100644 (file)
--- 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/.gitignore b/src/telemini-v0.1/.gitignore
deleted file mode 100644 (file)
index 82868aa..0000000
--- a/src/telemini-v0.1/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-telemini-*
-ao_product.h

diff --git a/src/telemini-v0.1/.sdcdbrc b/src/telemini-v0.1/.sdcdbrc
deleted file mode 100644 (file)
index 710b4a2..0000000
--- a/src/telemini-v0.1/.sdcdbrc
+++ /dev/null
@@ -1 +0,0 @@
---directory=..

diff --git a/src/telemini-v0.1/Makefile b/src/telemini-v0.1/Makefile
deleted file mode 100644 (file)
index d8867b1..0000000
--- a/src/telemini-v0.1/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../Makefile.proto

diff --git a/src/telemini-v0.1/Makefile.defs b/src/telemini-v0.1/Makefile.defs
deleted file mode 100644 (file)
index 94ac126..0000000
--- 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-v1.0/.gitignore b/src/telemini-v1.0/.gitignore
new file mode 100644 (file)
index 0000000..82868aa
--- /dev/null
+++ b/src/telemini-v1.0/.gitignore
@@ -0,0 +1,2 @@
+telemini-*
+ao_product.h

diff --git a/src/telemini-v1.0/.sdcdbrc b/src/telemini-v1.0/.sdcdbrc
new file mode 100644 (file)
index 0000000..710b4a2
--- /dev/null
+++ b/src/telemini-v1.0/.sdcdbrc
@@ -0,0 +1 @@
+--directory=..

diff --git a/src/telemini-v1.0/Makefile b/src/telemini-v1.0/Makefile
new file mode 100644 (file)
index 0000000..d8867b1
--- /dev/null
+++ b/src/telemini-v1.0/Makefile
@@ -0,0 +1 @@
+include ../Makefile.proto

diff --git a/src/telemini-v1.0/Makefile.defs b/src/telemini-v1.0/Makefile.defs
new file mode 100644 (file)
index 0000000..0e91f2f
--- /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