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

6 files changed, 62 insertions, 0 deletions

diff --git a/TeleGPS/index.mdwn b/TeleGPS/index.mdwn
new file mode 100644
index 0000000..7d4a163
--- /dev/null
+++ b/TeleGPS/index.mdwn
@@ -0,0 +1,61 @@
+# TeleGPS
+
+This is a GPS-based position tracker and logger.
+
+TeleGPS is currently in development, with a handful of prototype
+boards built. Production units will eventually be available from the 
+[Garbee and Garbee](http://auric.gag.com) web 
+store.
+
+For the latest TeleGPS 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="v0.3/telegps-top.jpg"> <img src="v0.3/telegps-top-thumb.jpg"></a>
+<a href="v0.3/telegps-parts.jpg"> <img src="v0.3/telegps-parts-thumb.jpg"></a>
+
+## Features ##
+
+### User View ###
+
+* GPS tracker and logger
+* Offers custom digital telemetry, APRS and direction beacons
+* High-dynamics GPS receiver for accurate tracking
+* Uses 3.7V Lithium Polymer battery.
+* 1.5 x 0.8 inch board designed to fit inside 24mm airframe coupler tube
+* 2MB on-board data logging flash
+* Built-in USB connection for configuration, data download and battery charging
+
+### Developer View ###
+
+* Hardware Features
+	* [NXP LPC11U14](http://www.nxp.com/products/microcontrollers/cortex_m0_m0/LPC11U14FHI33.html) System-on-Chip
+		* ARM Cortex-M0 MCU
+		* 32k Flash
+		* 6k RAM
+		* USB 2.0
+		* 8 12-bit analog inputs
+		* I2C, SPI, async serial
+		* digital I/O
+	* [uBlox Max 7Q](http://www.u-blox.com/en/gps-modules/pvt-modules/max-7.html) GPS receiver
+	* 2MB SPI flash
+* Software Features
+	* Written mostly in C with some ARM assembler
+	* Runs from on-chip flash, uses on-chip RAM, stores tracking data to
+		flash memory part
+* Tools Used
+	* [gEDA](http://www.gpleda.org/) for schematic capture and PCB layout
+	* [GCC](http://gcc.gnu.org/) 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 TeleGPS 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/telegps](http://git.gag.com/?p=hw/telegps;a=summary).  
diff --git a/TeleGPS/v0.3.mdwn b/TeleGPS/v0.3.mdwn
new file mode 100644
index 0000000..9c149a6
--- /dev/null
+++ b/TeleGPS/v0.3.mdwn
@@ -0,0 +1 @@
+[[!map pages="TeleGPS/v0.3/* and ! TeleGPS/v0.3/*/*"]]
diff --git a/TeleGPS/v0.3/telegps-parts-thumb.jpg b/TeleGPS/v0.3/telegps-parts-thumb.jpg
new file mode 100644
index 0000000..f89bb1d
--- /dev/null
+++ b/TeleGPS/v0.3/telegps-parts-thumb.jpg
diff --git a/TeleGPS/v0.3/telegps-parts.jpg b/TeleGPS/v0.3/telegps-parts.jpg
new file mode 100644
index 0000000..088e9eb
--- /dev/null
+++ b/TeleGPS/v0.3/telegps-parts.jpg
diff --git a/TeleGPS/v0.3/telegps-top-thumb.jpg b/TeleGPS/v0.3/telegps-top-thumb.jpg
new file mode 100644
index 0000000..4b5f858
--- /dev/null
+++ b/TeleGPS/v0.3/telegps-top-thumb.jpg
diff --git a/TeleGPS/v0.3/telegps-top.jpg b/TeleGPS/v0.3/telegps-top.jpg
new file mode 100644
index 0000000..fdeb0d4
--- /dev/null
+++ b/TeleGPS/v0.3/telegps-top.jpg