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

12 files changed, 92 insertions, 29 deletions

diff --git a/AltOS/launch-sites.txt b/AltOS/launch-sites.txt
index 3e4945f..41e24fe 100644
--- a/AltOS/launch-sites.txt
+++ b/AltOS/launch-sites.txt
@@ -19,6 +19,7 @@ LUNAR Moffett Field:37.412582:-122.052290:http://www.lunar.org/
 MDARS Tripoli Mojave Desert:35.1044666667:-117.795666667:http://www.mdars.info/
 MDRA Higgs Farm:39.07854167:-75.87634583:http://www.mdrocketry.org
 METRA Pine Island:41.31939:-74.47077:http://metrarocketclub.org
+MMMMSC Tuckahoe Turf Farms:43.318945:-70.892135:http://mmmsclub.org/
 Mojave Desert Advanced Rocket Society:35.10472:-117.79444:http://www.mojavedesertrocketry.org/
 NCR Atlas Site:40.65:-104.38333:http://ncrocketry.org
 NCR Pawnee North Site:40.885955:-104.63793:http://ncrocketry.org
@@ -45,6 +46,7 @@ SCORE Hudson Ranch:38.155602777777778:-104.809119444444444:http://scronline.net
 SEARS Samson, AL:31.118849:-86.091031:http://www.sears572.com
 SRA Rocket Ranch:27.943333333333333:-80.716666666666667:http://www.spaceportrocketry.org/
 St. Louis Rocketry Elsberry, MO:39.160217:-90.763356:http://stlouisrocketry.com/
+SystemsGO South, Houston, TX:29.562952777777778:-94.731458333333333:http://www.systemsgo.org/
 THOR / Tripoli Nebrask (Jansen):40.150556:-97.032222:http://www.nerocketry.org/history.html
 Torrey Farms of Potter, NY:42.7008967:-77.183656:http://urrg.org/
 TRAAU Serpentine:-36.4823466:144.0180150:http://traau.com/
diff --git a/ChaosKey/index.mdwn b/ChaosKey/index.mdwn
index 839fd19..aab5b71 100644
--- a/ChaosKey/index.mdwn
+++ b/ChaosKey/index.mdwn
@@ -43,11 +43,16 @@ bits from the noise source are available here:
 
 [AltOS Git Repository](http://git.gag.com/?p=fw/altos;a=summary)
 
+[ChaosKey Firmware version 1.6.7](v1.0/chaoskey-v1.0-1.6.7.elf)
+
+[ChaosKey Boot Loader version 1.6.7](v1.0/chaoskey-v1.0-altos-flash-1.6.7.elf)
+
 Hardware designs using [gEDA](http://www.geda-project.org/) are
 available here:
 
 [ChaosKey Hardware Design Files](http://git.gag.com/?p=hw/chaoskey;a=summary)
 
+
 ## Version 0.3 ##
 
 This one uses the better noise source coupled with an op amp that
diff --git a/ChaosKey/v1.0/chaoskey-v1.0-1.6.7.elf b/ChaosKey/v1.0/chaoskey-v1.0-1.6.7.elf
new file mode 100755
index 0000000..3f38510
--- /dev/null
+++ b/ChaosKey/v1.0/chaoskey-v1.0-1.6.7.elf
diff --git a/ChaosKey/v1.0/chaoskey-v1.0-altos-flash-1.6.7.elf b/ChaosKey/v1.0/chaoskey-v1.0-altos-flash-1.6.7.elf
new file mode 100755
index 0000000..e38afaf
--- /dev/null
+++ b/ChaosKey/v1.0/chaoskey-v1.0-altos-flash-1.6.7.elf
diff --git a/Documents/telemini-v1-outline.pdf b/Documents/telemini-v1-outline.pdf
new file mode 100644
index 0000000..60896c2
--- /dev/null
+++ b/Documents/telemini-v1-outline.pdf
diff --git a/Documents/telemini-v3-outline.pdf b/Documents/telemini-v3-outline.pdf
new file mode 100644
index 0000000..34d18e2
--- /dev/null
+++ b/Documents/telemini-v3-outline.pdf
diff --git a/TeleMini/index.mdwn b/TeleMini/index.mdwn
index 16ea8b3..6e6078d 100644
--- a/TeleMini/index.mdwn
+++ b/TeleMini/index.mdwn
@@ -3,18 +3,18 @@
 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).
+Version 3.0 is in production now and should be available after April
+1, 2017.
+
+Production units will be available from the [Garbee and
+Garbee](http://shop.gag.com) web store.
 
 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: 
+Here's a photo of a v3.0 prototype:
 
-<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="v3.0/telemini-v3.0.jpg"> <img src="v3.0/telemini-v3.0-640.jpg"></a>
 
 ## Features ##
 
@@ -23,33 +23,35 @@ These are photos of our current production version:
 * 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
+* Barometric pressure sensor good to 100k 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
+* 512kB flight data storage
+* 1.7 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
+	* [ST STM32F042G6](http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f0-series/stm32f0x2/stm32f042g6.html) system on chip
+		* ARM Cortex-M0 MCU
 		* 32k Flash
-		* 4k RAM
+		* 6k 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
+	* [Measurement Specialties MS5607](http://www.te.com/usa-en/product-CAT-BLPS0035.html) 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
+	* Written mostly in C with some ARM assembler
 * 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)
+	* The software is licensed [GPL version 2 or later](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+
+## Older Versions ##
+
+[Version 1.0](v1.0). Same width (0.5 inches), but doesn't have the
+rear two mounting holes so it's a bit shorter (1.5 inches instead of
+1.67 inches).
 
 ## Artifacts ##
 
@@ -58,15 +60,8 @@ 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/telemini-outline.pdf) format.
+[pdf](../Documents/telemini-v3-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).  
 
-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/v1.0/index.mdwn b/TeleMini/v1.0/index.mdwn
new file mode 100644
index 0000000..80f5509
--- /dev/null
+++ b/TeleMini/v1.0/index.mdwn
@@ -0,0 +1,55 @@
+## Version 1.0 ##
+
+This is the original TeleMini using the CC1111 SoC and MP3H6115A
+analog barometric sensor.
+
+<a href="telemini_top.jpg"> <img src="telemini_top_thumb.jpg"></a>
+<a href="telemini_bottom.jpg"> <img src="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
+* 4kB storage
+* 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 or later](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.
+
+An outline of the board with drill hole locations is available in
+[pdf](../Documents/telemini-v1-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).  
diff --git a/TeleMini/v3.0.mdwn b/TeleMini/v3.0.mdwn
new file mode 100644
index 0000000..483832a
--- /dev/null
+++ b/TeleMini/v3.0.mdwn
@@ -0,0 +1 @@
+[[!map pages="TeleMini/v3.0/* and ! TeleMini/v3.0/*/*"]]
diff --git a/TeleMini/v3.0/telemini-v3.0-640.jpg b/TeleMini/v3.0/telemini-v3.0-640.jpg
new file mode 100644
index 0000000..f8fc39b
--- /dev/null
+++ b/TeleMini/v3.0/telemini-v3.0-640.jpg
diff --git a/TeleMini/v3.0/telemini-v3.0.jpg b/TeleMini/v3.0/telemini-v3.0.jpg
new file mode 100644
index 0000000..b71a167
--- /dev/null
+++ b/TeleMini/v3.0/telemini-v3.0.jpg
diff --git a/index.mdwn b/index.mdwn
index 35a2748..f5f5236 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -39,6 +39,10 @@ Altus Metrum products are available directly from
   * New Zealand
     * [Aerospace Education](http://www.rockets.co.nz)
 
+For ChaosKey, there is a distributor in Europe:
+
+  * [Vikings GmbH](https://store.vikings.net/libre-friendly-accessories)
+
 # Products #
 
 These products are available for purchase:
@@ -87,7 +91,8 @@ ideal altimeter for model rocket contests.
 provides an interface between [MicroPeak](MicroPeak/) and USB to
 download flight log data.
 
-* [ChaosKey](ChaosKey) is a USB-attached True Random Number Generator
+* [ChaosKey](ChaosKey/)
+is a true hardware random number generator that connects over USB.
 
 The following product is available in limited quantity from time to time: