TeleMini sn re-assigned from 92 to 96 to resolve conflict.

Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

Conflicts:
	production.mdwn

8 files changed, 84 insertions, 26 deletions

diff --git a/TeleMini/history.mdwn b/TeleMini/history.mdwn
new file mode 100644
index 0000000..8074dd4
--- /dev/null
+++ b/TeleMini/history.mdwn
@@ -0,0 +1,62 @@
+# TeleMini History
+
+# TeleMini Version 1.0 #
+
+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="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 ##
+
+### 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 45k feet MSL
+* Designed to use a single LiPo rechargeable battery
+* 1.5 x 0.5 inch board designed to fit inside 18mm 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
+	* [Freescale MP3H6115A](http://www.freescale.com/webapp/search.partparamdetail.framework?PART_NUMBER=MP3H6115A6U) pressure sensor
+* Software Features
+	* Written mostly in C with some 8051 assembler
+	* Runs from on-chip flash, uses on-chip RAM, stores flight data to
+		upper blocks of on-chip flash
+* 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).  
+
+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](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 5a783cb..ee861c3 100644
--- a/TeleMini/index.mdwn
+++ b/TeleMini/index.mdwn
@@ -1,31 +1,30 @@
-# TeleMini
+# TeleMini #
 
-This is a very small, baro-only recording dual-deploy altimeter for 
-model rocketry with integrated telemetry link.  
-
-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).
+TeleMini version 2.0 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.
 
 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 production version: 
+These are photos of our current prototype version: 
 
-<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>
+<a href="v2.0/telemini-top.jpg"> <img src="v2.0/telemini-top-thumb.jpg"></a>
+<a href="v2.0/telemini-parts.jpg"> <img src="v2.0/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 45k feet MSL
-* Designed to use a single LiPo rechargeable battery
-* 1.5 x 0.5 inch board designed to fit inside 18mm airframe coupler tube
+ * 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 ###
 
@@ -39,11 +38,12 @@ These are photos of our current production version:
 		* 6 12-bit analog inputs (11 bits with single-ended sensors)
 		* 2 channels of serial I/O
 		* digital I/O
-	* [Freescale MP3H6115A](http://www.freescale.com/webapp/search.partparamdetail.framework?PART_NUMBER=MP3H6115A6U) pressure sensor
+	* [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
-		upper blocks of on-chip flash
+		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
@@ -60,10 +60,4 @@ which is available in [html](../AltOS/doc/altusmetrum.html) and
 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).  
 
-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](v1.0/telemini.pdf)
-* [pcb artwork](v1.0/telemini.pcb.pdf)
-* [bill of materials](v1.0/partslist.csv)
-
+## [History of TeleMini](history) ##
diff --git a/TeleMini/v1.2.mdwn b/TeleMini/v1.2.mdwn
new file mode 100644
index 0000000..b1b4a5a
--- /dev/null
+++ b/TeleMini/v1.2.mdwn
@@ -0,0 +1 @@
+[[!map pages="TeleMini/v1.2/* and ! TeleMini/v1.2/*/*"]]
diff --git a/TeleMini/v2.0.mdwn b/TeleMini/v2.0.mdwn
new file mode 100644
index 0000000..bc7a228
--- /dev/null
+++ b/TeleMini/v2.0.mdwn
@@ -0,0 +1 @@
+[[!map pages="TeleMini/v2.0/* and ! TeleMini/v2.0/*/*"]]
diff --git a/TeleMini/v2.0/telemini-parts-thumb.jpg b/TeleMini/v2.0/telemini-parts-thumb.jpg
new file mode 100644
index 0000000..cc56555
--- /dev/null
+++ b/TeleMini/v2.0/telemini-parts-thumb.jpg
diff --git a/TeleMini/v2.0/telemini-parts.jpg b/TeleMini/v2.0/telemini-parts.jpg
new file mode 100644
index 0000000..08adf3b
--- /dev/null
+++ b/TeleMini/v2.0/telemini-parts.jpg
diff --git a/TeleMini/v2.0/telemini-top-thumb.jpg b/TeleMini/v2.0/telemini-top-thumb.jpg
new file mode 100644
index 0000000..aa47526
--- /dev/null
+++ b/TeleMini/v2.0/telemini-top-thumb.jpg
diff --git a/TeleMini/v2.0/telemini-top.jpg b/TeleMini/v2.0/telemini-top.jpg
new file mode 100644
index 0000000..bc8ae45
--- /dev/null
+++ b/TeleMini/v2.0/telemini-top.jpg