Move telemini v1.2 content to telemini page, v1.0 to history

Match TeleMetrum plan, which is quite sensible

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

3 files changed, 69 insertions, 85 deletions

diff --git a/TeleMini/v1.0/index.mdwn b/TeleMini/history.mdwn
index 84215bb..8074dd4 100644
--- a/TeleMini/v1.0/index.mdwn
+++ b/TeleMini/history.mdwn
@@ -1,20 +1,13 @@
-# TeleMini Version 1.0 #
-
-This is a very small, baro-only recording dual-deploy altimeter for 
-model rocketry with integrated telemetry link.  
+# TeleMini History
 
-Production units are available from the 
-[Garbee and Garbee](http://auric.gag.com) web 
-store.  TeleMini starter kits are also available from 
-[Apogee Components](http://www.apogeerockets.com/Altus_Metrum_telemini.asp).
-
-For the latest TeleMini firmware and related ground station software, please
-visit the [AltOS](../AltOS) page on this site.
+# TeleMini Version 1.0 #
 
-These are photos of our current production version: 
+The very first TeleMini design became 1.0. It was a very small,
+baro-only recording dual-deploy altimeter for model rocketry with
+integrated telemetry link.
 
-<a href="telemini_top.jpg"> <img src="telemini_top_thumb.jpg"></a>
-<a href="telemini_bottom.jpg"> <img src="telemini_bottom_thumb.jpg"></a>
+<a href="v1.0/telemini_top.jpg"> <img src="v1.0/telemini_top_thumb.jpg"></a>
+<a href="v1.0/telemini_bottom.jpg"> <img src="v1.0/telemini_bottom_thumb.jpg"></a>
 
 ## Features ##
 
@@ -63,7 +56,7 @@ in the project [hw/telemini](http://git.gag.com/?p=hw/telemini;a=summary).
 For those who don't have ready access to the gEDA suite, here are pdf snapshots
 of the files for Production PCB version 1.0 in more easily readable form.  
 
-* [schematic](telemini.pdf)
-* [pcb artwork](telemini.pcb.pdf)
-* [bill of materials](partslist.csv)
+* [schematic](v1.0/telemini.pdf)
+* [pcb artwork](v1.0/telemini.pcb.pdf)
+* [bill of materials](v1.0/partslist.csv)
 
diff --git a/TeleMini/index.mdwn b/TeleMini/index.mdwn
index 21b3822..26dcabb 100644
--- a/TeleMini/index.mdwn
+++ b/TeleMini/index.mdwn
@@ -1,7 +1,63 @@
 # TeleMini #
 
-There are two versions of TeleMini:
+TeleMini version 1.2 is a small, baro-only recording dual-deploy
+altimeter for model rocketry with integrated telemetry link. It's
+currently in development, with production planned to start in the fall
+of 2013.
 
- * [Version 1.0](v1.0) — the original TeleMini, 0.5 x 1.5 inches
- * [Version 1.2](v1.2) — the new TeleMini, 0.8 x 1.5 inches
+For the latest TeleMini firmware and related ground station software, please
+visit the [AltOS](../AltOS) page on this site.
 
+These are photos of our current prototype version: 
+
+<a href="v1.2/telemini-top.jpg"> <img src="v1.2/telemini-top-thumb.jpg"></a>
+<a href="v1.2/telemini-parts.jpg"> <img src="v1.2/telemini-parts-thumb.jpg"></a>
+
+## Features ##
+
+### User View ###
+
+ * Recording altimeter for model rocketry
+ * Supports dual deployment (can fire 2 ejection charges)
+ * 70cm ham-band transceiver for telemetry downlink
+ * Barometric pressure sensor good to 100k' feet MSL
+ * Designed to use any battery from 3.7 - 12V
+ * Screw terminals for pyro connectors, switch and external battery
+ * Built-in USB connector for configuration and data download
+ * 1.5 x 0.8 inch board designed to fit inside 24mm airframe coupler tube
+
+### Developer View ###
+
+* Hardware Features
+	* [TI CC1111F32](http://focus.ti.com/docs/prod/folders/print/cc1111f32.html) Low Power RF System-on-Chip
+		* Sub-1Ghz transceiver
+		* 8051 MCU
+		* 32k Flash
+		* 4k RAM
+		* USB 2.0
+		* 6 12-bit analog inputs (11 bits with single-ended sensors)
+		* 2 channels of serial I/O
+		* digital I/O
+	* [Measurement Specialties MS5607](http://www.meas-spec.com/product/pressure/MS5607-02BA03.aspx) pressure sensor
+	* 1MB SPI flash
+* Software Features
+	* Written mostly in C with some 8051 assembler
+	* Runs from on-chip flash, uses on-chip RAM, stores flight data to
+		on-board flash memory
+* Tools Used
+	* [gEDA](http://www.gpleda.org/) for schematic capture and PCB layout
+	* [SDCC](http://sdcc.sourceforge.net/) compiler and source debugger
+* Licenses
+	* The hardware is licensed under the [TAPR](http://www.tapr.org) [Open Hardware License](http://www.tapr.org/ohl.html)
+	* The software is licensed [GPL version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+
+## Artifacts ##
+
+There is a single manual for TeleMini and all other Altus Metrum products,
+which is available in [html](../AltOS/doc/altusmetrum.html) and 
+[pdf](../AltOS/doc/altusmetrum.pdf) formats.
+
+The hardware design files can be found on [git.gag.com](http://git.gag.com) 
+in the project [hw/telemini](http://git.gag.com/?p=hw/telemini;a=summary).  
+
+## [History of TeleMini](history) ##
diff --git a/TeleMini/v1.2/index.mdwn b/TeleMini/v1.2/index.mdwn
deleted file mode 100644
index 00950f6..0000000
--- a/TeleMini/v1.2/index.mdwn
+++ /dev/null
@@ -1,65 +0,0 @@
-# TeleMini Version 1.2 #
-
-This is a small, baro-only recording dual-deploy altimeter for 
-model rocketry with integrated telemetry link. It's different from the
-original TeleMini:
-
- * Supports batteries from 3.7V - 12V
- * Screw terminals for switch and external battery
- * Large on-board flash for data recording
- * Built-in USB connector for configuration and data download
- * High precision and digital barometric sensor
-
-For the latest TeleMini firmware and related ground station software, please
-visit the [AltOS](../AltOS) page on this site.
-
-These are photos of our current prototype version: 
-
-<a href="telemini-top.jpg"> <img src="telemini-top-thumb.jpg"></a>
-<a href="telemini-parts.jpg"> <img src="telemini-parts-thumb.jpg"></a>
-
-## Features ##
-
-### User View ###
-
-* Recording altimeter for model rocketry
-* Supports dual deployment (can fire 2 ejection charges)
-* 70cm ham-band transceiver for telemetry downlink
-* Barometric pressure sensor good to 100k' feet MSL
-* Designed to use any battery from 3.7 - 12V
-* 1.5 x 0.8 inch board designed to fit inside 24mm airframe coupler tube
-
-### Developer View ###
-
-* Hardware Features
-	* [TI CC1111F32](http://focus.ti.com/docs/prod/folders/print/cc1111f32.html) Low Power RF System-on-Chip
-		* Sub-1Ghz transceiver
-		* 8051 MCU
-		* 32k Flash
-		* 4k RAM
-		* USB 2.0
-		* 6 12-bit analog inputs (11 bits with single-ended sensors)
-		* 2 channels of serial I/O
-		* digital I/O
-	* [Measurement Specialties MS5607](http://www.meas-spec.com/product/pressure/MS5607-02BA03.aspx) pressure sensor
-	* 1MB SPI flash
-* Software Features
-	* Written mostly in C with some 8051 assembler
-	* Runs from on-chip flash, uses on-chip RAM, stores flight data to
-		on-board flash memory
-* Tools Used
-	* [gEDA](http://www.gpleda.org/) for schematic capture and PCB layout
-	* [SDCC](http://sdcc.sourceforge.net/) compiler and source debugger
-* Licenses
-	* The hardware is licensed under the [TAPR](http://www.tapr.org) [Open Hardware License](http://www.tapr.org/ohl.html)
-	* The software is licensed [GPL version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
-
-## Artifacts ##
-
-There is a single manual for TeleMini and all other Altus Metrum products,
-which is available in [html](../AltOS/doc/altusmetrum.html) and 
-[pdf](../AltOS/doc/altusmetrum.pdf) formats.
-
-The hardware design files can be found on [git.gag.com](http://git.gag.com) 
-in the project [hw/telemini](http://git.gag.com/?p=hw/telemini;a=summary).  
-