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

10 files changed, 29 insertions, 91 deletions

diff --git a/EasyMega/index.mdwn b/EasyMega/index.mdwn
index e180f1a..1eba3d7 100644
--- a/EasyMega/index.mdwn
+++ b/EasyMega/index.mdwn
@@ -72,6 +72,9 @@ There is a single manual for EasyMega and most other Altus Metrum products,
 which is available in [html](../AltOS/doc/altusmetrum.html) and 
 [pdf](../AltOS/doc/altusmetrum.pdf) formats.
 
+An outline of the board with drill hole locations is available in
+[pdf](../Documents/easymega-outline.pdf) format.
+
 The hardware design current gEDA files are available from 
 [git.gag.com](http://git.gag.com) in the project 
 [hw/easymega](http://git.gag.com/?p=hw/easymega;a=summary).  
diff --git a/TeleMega/v2.0.mdwn b/TeleMega/v2.0.mdwn
new file mode 100644
index 0000000..573ccb3
--- /dev/null
+++ b/TeleMega/v2.0.mdwn
@@ -0,0 +1 @@
+[[!map pages="TeleMega/v2.0/* and ! TeleMega/v2.0/*/*"]]
diff --git a/TeleMini/history.mdwn b/TeleMini/history.mdwn
deleted file mode 100644
index 8074dd4..0000000
--- a/TeleMini/history.mdwn
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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 4383179..16ea8b3 100644
--- a/TeleMini/index.mdwn
+++ b/TeleMini/index.mdwn
@@ -1,32 +1,31 @@
-# TeleMini #
+# TeleMini
 
-TeleMini version 2.0 is a small, baro-only recording dual-deploy
-altimeter for model rocketry with integrated telemetry link.  The board 
-form factor and features are identical to [EasyMini](../EasyMini/), with the
-addition of radio telemetry and direction finding.  TeleMini is an excellent
-choice for mid-power and smaller high-power rockets, and can also be a
-cost-effective solution for booster recovery in multi-stage projects, etc.
+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).
 
 For the latest TeleMini firmware and related ground station software, please
 visit the [AltOS](../AltOS) page on this site.
 
-These are photos of an early prototype version: 
+These are photos of our current production version: 
 
-<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>
+<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 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
+* 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 ###
 
@@ -40,12 +39,11 @@ These are photos of an early prototype version:
 		* 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
+	* [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
-		on-board flash memory
+		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
@@ -60,15 +58,15 @@ which is available in [html](../AltOS/doc/altusmetrum.html) and
 [pdf](../AltOS/doc/altusmetrum.pdf) formats.
 
 An outline of the board with drill hole locations is available in
-[pdf](../Documents/easymini-outline.pdf) format.
+[pdf](../Documents/telemini-outline.pdf) format.
 
 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) ##
+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.  
 
-## Future Plans ##
+* [schematic](v1.0/telemini.pdf)
+* [pcb artwork](v1.0/telemini.pcb.pdf)
+* [bill of materials](v1.0/partslist.csv)
 
-Our current prototypes mostly work, but there are a couple issues yet to 
-resolve.  We hope to complete this design and put TeleMini v2.0 into production
-sometime in mid-2014.
diff --git a/TeleMini/v1.2.mdwn b/TeleMini/v1.2.mdwn
deleted file mode 100644
index b1b4a5a..0000000
--- a/TeleMini/v1.2.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-[[!map pages="TeleMini/v1.2/* and ! TeleMini/v1.2/*/*"]]
diff --git a/TeleMini/v2.0.mdwn b/TeleMini/v2.0.mdwn
deleted file mode 100644
index bc7a228..0000000
--- a/TeleMini/v2.0.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-[[!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
deleted file mode 100644
index cc56555..0000000
--- a/TeleMini/v2.0/telemini-parts-thumb.jpg
+++ /dev/null
diff --git a/TeleMini/v2.0/telemini-parts.jpg b/TeleMini/v2.0/telemini-parts.jpg
deleted file mode 100644
index 08adf3b..0000000
--- a/TeleMini/v2.0/telemini-parts.jpg
+++ /dev/null
diff --git a/TeleMini/v2.0/telemini-top-thumb.jpg b/TeleMini/v2.0/telemini-top-thumb.jpg
deleted file mode 100644
index aa47526..0000000
--- a/TeleMini/v2.0/telemini-top-thumb.jpg
+++ /dev/null
diff --git a/TeleMini/v2.0/telemini-top.jpg b/TeleMini/v2.0/telemini-top.jpg
deleted file mode 100644
index bc8ae45..0000000
--- a/TeleMini/v2.0/telemini-top.jpg
+++ /dev/null