Switch TeleMetrum from v0.2 to v1.0

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/Makefile b/src/Makefile
index e2699ee680350e8d9b982393ff72c4aa7bb3ff67..24f562e1062e109002cd6eafc2ba62b2f1dea33a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 #
 CC=sdcc
 
 #
 CC=sdcc
 

-SUBDIRS=telemetrum-v0.2 teledongle-v0.2 telemetrum-v0.1-sky telemetrum-v0.1-sirf teledongle-v0.1 tidongle test
+SUBDIRS=telemetrum-v1.0 teledongle-v0.2 telemetrum-v0.1-sky telemetrum-v0.1-sirf teledongle-v0.1 tidongle test

 
 all: all-recursive
 
 
 all: all-recursive
 

diff --git a/src/ao_pins.h b/src/ao_pins.h
index 771d9c7f7ac1791113fd5edea2a192f907c6988a..e9a265b0837a4c300f54f1c8e51e94b4b6d1ee54 100644 (file)
--- a/src/ao_pins.h
+++ b/src/ao_pins.h
@@ -18,7 +18,7 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 

-#if defined(TELEMETRUM_V_0_2)
+#if defined(TELEMETRUM_V_1_0)

        #define HAS_SERIAL_1            1
        #define HAS_ADC                 1
        #define HAS_EEPROM              1
        #define HAS_SERIAL_1            1
        #define HAS_ADC                 1
        #define HAS_EEPROM              1

diff --git a/src/telemetrum-v0.2/.gitignore b/src/telemetrum-v0.2/.gitignore
deleted file mode 100644 (file)
index 7622809..0000000
--- a/src/telemetrum-v0.2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-telemetrum-v0.2
-ao_product.h

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

diff --git a/src/telemetrum-v0.2/Makefile.defs b/src/telemetrum-v0.2/Makefile.defs
deleted file mode 100644 (file)
index eb11e7d..0000000
--- a/src/telemetrum-v0.2/Makefile.defs
+++ /dev/null
@@ -1,10 +0,0 @@
-PROG = telemetrum-v0.2.ihx
-
-SRC = \
-       $(TM_BASE_SRC) \
-       $(FLASH_DRIVER_SRC) \
-       $(SKY_DRIVER_SRC) \
-       $(DBG_SRC)
-
-PRODUCT=TeleMetrum-v0.2
-PRODUCT_DEF=-DTELEMETRUM_V_0_2

diff --git a/src/telemetrum-v1.0/.gitignore b/src/telemetrum-v1.0/.gitignore
new file mode 100644 (file)
index 0000000..7622809
--- /dev/null
+++ b/src/telemetrum-v1.0/.gitignore
@@ -0,0 +1,2 @@
+telemetrum-v0.2
+ao_product.h

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

diff --git a/src/telemetrum-v1.0/Makefile.defs b/src/telemetrum-v1.0/Makefile.defs
new file mode 100644 (file)
index 0000000..e3cc5eb
--- /dev/null
+++ b/src/telemetrum-v1.0/Makefile.defs
@@ -0,0 +1,10 @@
+PROG = telemetrum-v1.0.ihx
+
+SRC = \
+       $(TM_BASE_SRC) \
+       $(FLASH_DRIVER_SRC) \
+       $(SKY_DRIVER_SRC) \
+       $(DBG_SRC)
+
+PRODUCT=TeleMetrum-v1.0
+PRODUCT_DEF=-DTELEMETRUM_V_1_0