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

diff --git a/AltOS/launch-sites.txt b/AltOS/launch-sites.txt
index 419b82296a6647da082564fe5faa083bb5ac7e63..847a51abdd52c96472eac5f0371bfb37d339767a 100644 (file)
--- a/AltOS/launch-sites.txt
+++ b/AltOS/launch-sites.txt
@@ -19,6 +19,7 @@ NCR Atlas Site:40.65:-104.38333:http://ncrocketry.org
 NCR Pawnee North Site:40.885955:-104.63793:http://ncrocketry.org
 NOVAAR Great Meadow:38.829743:-77.806898:http://novaar.org
 NSWRA Doonside Sydney:-33.78567:150.866862:http://www.nswrocketry.org.au
+NZRA Taupiri:-37.5492:175.261966666666667:http://www.nzrocketry.org.nz
 OPROC Discovery Bay:47.97808,-122.896383:http://4hrockets.blogspot.com
 OROC Brothers:43.79949786336483:-120.6485810681392:http://www.oregonrocketry.com
 OROC Sheridan:45.044176:-123.314323:http://www.oregonrocketry.com

diff --git a/USBtrng/index.mdwn b/USBtrng/index.mdwn
index d6ebbcaee90f7b0cd989f5ac32157a4bfa960d43..f5df6f88497e63db12257b1ba50da79250459e08 100644 (file)
--- a/USBtrng/index.mdwn
+++ b/USBtrng/index.mdwn
@@ -2,31 +2,49 @@
 
 This is a hardware True Random Number Generator that attaches via USB.
 
+## Version 2.0 ##
+
+Here's a photo of prototype version 2.0:
+
+<a href="v2.0/usbtrng-v2.0.jpg"> <img src="v2.0/usbtrng-v2.0-thumb.jpg"></a>
+
+### Version 2.0 Hardware ###
+
+ * [STM32F042](http://www.st.com/web/catalog/mmc/FM141/SC1169/SS1574/LN1823?icmp=stm32f0x2-line_pron_pr_jan2014&sc=stm32f0x2-pr) System-on-Chip
+    * ARM Cortex-M0 MCU
+    * 32k Flash
+    * 6k RAM
+    * USB 2.0
+    * Crystal-less operation
+ * ZXRE1004 zener-diode noise source
+ * 20V noise source
+    * AP3015A boost regulator
+    * back-to-back 3904 transistor noise
+
+## Version 0.1 ##
+
 These are photos of prototype version 0.1:
 
 <a href="v0.1/usbtrng-v0.1-top.jpg"> <img src="v0.1/usbtrng-v0.1-top-thumb.jpg"></a>
 <a href="v0.1/usbtrng-v0.1-bottom.jpg"> <img src="v0.1/usbtrng-v0.1-bottom-thumb.jpg"></a>
 
-## Documentation ##
-
-There is no documentation yet.
+### Version 0.1 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
+ * ZXRE1004 zener diode noise source
+ * MCP6L92 dual op-amp
 
-* 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
+## Software ##
 
 * Firmware Features
        * [AltOS](../AltOS/) is 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

diff --git a/USBtrng/v2.0.mdwn b/USBtrng/v2.0.mdwn
new file mode 100644 (file)
index 0000000..0a3b2c1
--- /dev/null
+++ b/USBtrng/v2.0.mdwn
@@ -0,0 +1 @@
+[[!map pages="USBtrng/v2.0/* and ! USBtrng/v2.0/*/*"]]

diff --git a/USBtrng/v2.0/usbtrng-v2.0-thumb.jpg b/USBtrng/v2.0/usbtrng-v2.0-thumb.jpg
new file mode 100644 (file)
index 0000000..92c83c2
Binary files /dev/null and b/USBtrng/v2.0/usbtrng-v2.0-thumb.jpg differ

diff --git a/USBtrng/v2.0/usbtrng-v2.0.jpg b/USBtrng/v2.0/usbtrng-v2.0.jpg
new file mode 100644 (file)
index 0000000..08644c8
Binary files /dev/null and b/USBtrng/v2.0/usbtrng-v2.0.jpg differ

diff --git a/production.mdwn b/production.mdwn
index ba257bb79c95eb2d7dcb6662016c3836e69c833c..e8c8dcf1df09b60c9e5771293107703f92652069 100644 (file)
--- a/production.mdwn
+++ b/production.mdwn
@@ -447,3 +447,6 @@ Production run of 216 pieces of TeleMetrum v2.0b by
 Production run of 100 pieces of TeleMega v1.0b by
 [Advanced Circuits](http://4pcb.com), received 2014.12.06.
 
+## sn 2403-2406 ##
+
+Prototype build of 3 USBtrng v2.0 by Keithp 2015.01.25