altos: Create TeleMetrum v1.2 directory

The hardware is software-compatible with v1.1, but it's nice to have
the right version number in all of the files.

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

9 files changed, 65 insertions, 7 deletions

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 7cd383ac..fc024fff 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -171,7 +171,8 @@ FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 
 FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
 FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1-$(VERSION).ihx
-FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1)
+FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2-$(VERSION).ihx
+FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2)
 
 FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0-$(VERSION).ihx
 FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index cbcb389d..e5e01d79 100644
--- a/altosui/altos-windows.nsi
+++ b/altosui/altos-windows.nsi
@@ -112,6 +112,7 @@ Section "TeleMetrum and TeleDongle Firmware"
 
 	File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
 	File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx"
+	File "../src/telemetrum-v1.2/telemetrum-v1.2-${VERSION}.ihx"
 	File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
 	File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
 
diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl
index 606c8b99..5c18fec3 100644
--- a/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@ -586,7 +586,7 @@ NAR #88757, TRA #12200
       <section>
 	<title>Maximum Flight Log</title>
 	<para>
-	  TeleMetrum version 1.1 has 2MB of on-board flash storage,
+	  TeleMetrum version 1.1 and 1.2 have 2MB of on-board flash storage,
 	  enough to hold over 40 minutes of data at full data rate
 	  (100 samples/second). TeleMetrum 1.0 has 1MB of on-board
 	  storage. As data are stored at a reduced rate during descent
@@ -602,7 +602,7 @@ NAR #88757, TRA #12200
 	</para>
 	<para>
 	  All of the configuration data is also stored in the flash
-	  memory, which consumes 64kB on TeleMetrum v1.1 and 256B on
+	  memory, which consumes 64kB on TeleMetrum v1.1/v1.2 and 256B on
 	  TeleMetrum v1.0. This configuration space is not available
 	  for storing flight log data.
 	</para>
@@ -619,7 +619,7 @@ NAR #88757, TRA #12200
 	</para>
 	<para>
 	  The default size, 192kB, allows for 10 flights of storage on
-	  TeleMetrum v1.1 and 5 flights on TeleMetrum v1.0. This
+	  TeleMetrum v1.1/v1.2 and 5 flights on TeleMetrum v1.0. This
 	  ensures that you won't need to erase the memory before
 	  flying each time while still allowing more than sufficient
 	  storage for each flight.
@@ -1842,7 +1842,7 @@ NAR #88757, TRA #12200
         </listitem>
         <listitem>
           Select the image you want put on the TeleMetrum, which should have a
-          name in the form telemetrum-v1.1-1.0.0.ihx.  It should be visible
+          name in the form telemetrum-v1.2-1.0.0.ihx.  It should be visible
 	in the default directory, if not you may have to poke around
 	your system to find it.
         </listitem>
diff --git a/src/Makefile b/src/Makefile
index 61b1a835..d3173254 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,7 +13,7 @@ vpath matrix.5c kalman
 include Version
 
 SUBDIRS=\
-	telemetrum-v1.1 telemetrum-v1.0 \
+	telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
 	teledongle-v0.2 teledongle-v0.1 \
 	telemini-v1.0 telenano-v0.1 \
 	telebt-v0.0 telebt-v0.1 \
diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index ca85c39f..a18c74c8 100644
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -89,6 +89,43 @@
 	#define HAS_MONITOR		0
 #endif
 
+#if defined(TELEMETRUM_V_1_2)
+	#define HAS_FLIGHT		1
+	#define HAS_USB			1
+	#define HAS_BEEP		1
+	#define HAS_GPS			1
+	#define HAS_SERIAL_1		1
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			1
+	#define HAS_EEPROM		1
+	#define HAS_LOG			1
+	#define USE_INTERNAL_FLASH	0
+	#define HAS_DBG			1
+	#define DBG_ON_P1 		1
+	#define DBG_ON_P0 		0
+	#define IGNITE_ON_P2		1
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	0
+	#define PACKET_HAS_SLAVE	1
+
+	#define HAS_COMPANION		1
+	#define COMPANION_CS_ON_P1	1
+	#define COMPANION_CS_MASK	0x4	/* CS1 is P1_2 */
+	#define COMPANION_CS		P1_2
+
+	#define AO_LED_RED		1
+	#define LEDS_AVAILABLE		(AO_LED_RED)
+	#define HAS_EXTERNAL_TEMP	0
+	#define HAS_ACCEL_REF		1
+	#define SPI_CS_ON_P1		1
+	#define SPI_CS_ON_P0		0
+	#define M25_CS_MASK		0x02	/* CS0 is P1_1 */
+	#define M25_MAX_CHIPS		1
+	#define HAS_ACCEL		1
+	#define HAS_IGNITE		1
+	#define HAS_MONITOR		0
+#endif
+
 #if defined(TELEDONGLE_V_0_2)
 	#define HAS_FLIGHT		0
 	#define HAS_USB			1
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index c68f1589..eb614b0f 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -35,7 +35,7 @@ static __pdata uint16_t ao_rdf_time;
 #define AO_RDF_INTERVAL_TICKS	AO_SEC_TO_TICKS(5)
 #define AO_RDF_LENGTH_MS	500
 
-#if defined(TELEMETRUM_V_0_1) || defined(TELEMETRUM_V_0_2) || defined(TELEMETRUM_V_1_0) || defined(TELEMETRUM_V_1_1) || defined(TELEBALLOON_V_1_1)
+#if defined(TELEMETRUM_V_0_1) || defined(TELEMETRUM_V_0_2) || defined(TELEMETRUM_V_1_0) || defined(TELEMETRUM_V_1_1) || defined(TELEBALLOON_V_1_1) || defined(TELEMETRUM_V_1_2)
 #define AO_TELEMETRY_SENSOR	AO_TELEMETRY_SENSOR_TELEMETRUM
 #endif
 
diff --git a/src/telemetrum-v1.2/.gitignore b/src/telemetrum-v1.2/.gitignore
new file mode 100644
index 00000000..c2212151
--- /dev/null
+++ b/src/telemetrum-v1.2/.gitignore
@@ -0,0 +1,2 @@
+telemetrum-*
+ao_product.h
diff --git a/src/telemetrum-v1.2/.sdcdbrc b/src/telemetrum-v1.2/.sdcdbrc
new file mode 100644
index 00000000..710b4a2f
--- /dev/null
+++ b/src/telemetrum-v1.2/.sdcdbrc
@@ -0,0 +1 @@
+--directory=..
diff --git a/src/telemetrum-v1.2/Makefile b/src/telemetrum-v1.2/Makefile
new file mode 100644
index 00000000..4b650adf
--- /dev/null
+++ b/src/telemetrum-v1.2/Makefile
@@ -0,0 +1,16 @@
+#
+# AltOS build
+#
+#
+
+TM_VER=1.2
+TM_DEF=1_2
+
+TM_INC =
+
+TM_SRC = \
+	ao_companion.c \
+	ao_gps_skytraq.c \
+	ao_m25.c
+
+include ../product/Makefile.telemetrum