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

9 files changed, 37 insertions, 13 deletions

diff --git a/EasyMini/index.mdwn b/EasyMini/index.mdwn
index d1bc1b2..95316a0 100644
--- a/EasyMini/index.mdwn
+++ b/EasyMini/index.mdwn
@@ -4,18 +4,18 @@
 This is a small, baro-only recording dual-deploy altimeter for 
 model rocketry
 
-EasyMini is available from the [Garbee and Garbee](https://shop.gag.com) web 
-store, and should be available from our distributors soon.
+EasyMini version 2.0 is available from the
+[Garbee and Garbee](https://shop.gag.com) web store
+and from our distributors.
 
-For the latest EasyMini firmware and related ground station software, please
-visit the [AltOS](../AltOS) page on this site.  EasyMini requires AltOS
-version 1.3 or later.
+For the latest EasyMini firmware and related ground station software,
+please visit the [AltOS](../AltOS) page on this site.  EasyMini
+version 2.0 requires AltOS version 1.8.4 or later.
 
-These are photos of a prototype version, we haven't take photos of the 
-production units yet:
+These are photos of version 2.0:
 
-<a href="v0.2/easymini-top.jpg"> <img src="v0.2/easymini-top-thumb.jpg"></a>
-<a href="v0.2/easymini-parts.jpg"> <img src="v0.2/easymini-parts-thumb.jpg"></a>
+<a href="v2.0/easymini-v2.0-top.jpg"> <img src="v2.0/easymini-v2.0-top-thumb.jpg"></a>
+<a href="v2.0/easymini-v2.0-bottom.jpg"> <img src="v2.0/easymini-v2.0-bottom-thumb.jpg"></a>
 
 ## Features ##
 
@@ -26,13 +26,13 @@ production units yet:
 * Barometric pressure sensor good to 100k feet MSL
 * Designed to use a battery supplying 3.7V-12V.
 * 1.5 x 0.8 inch board designed to fit inside 24mm airframe coupler tube
-* 2MB on-board data logging flash
+* 1MB on-board data logging flash
 * Weighs only 6.5g (less than 1/4 oz)
 
 ### Developer View ###
 
 * Hardware Features
-	* [NXP LPC11U14](http://www.nxp.com/products/microcontrollers/cortex_m0_m0/LPC11U14FHI33.html) System-on-Chip
+	* [STM32F042](http://www.st.com/en/microcontrollers/stm32f042f6.html) System-on-Chip
 		* ARM Cortex-M0 MCU
 		* 32k Flash
 		* 6k RAM
@@ -74,5 +74,10 @@ in the project [hw/easymini](http://git.gag.com/?p=hw/easymini;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/easymini-sch.pdf)
-* [pcb artwork](v1.0/easymini-pcb.pdf)
+* [schematic](v2.0/easymini-sch.pdf)
+* [pcb artwork](v2.0/easymini-pcb.pdf)
+
+## Older Version ##
+
+Easy Mini [version 1.0](v1.0) was largely the same design but used a
+different processor.
diff --git a/EasyMini/v1.0/index.mdwn b/EasyMini/v1.0/index.mdwn
new file mode 100644
index 0000000..cc54e20
--- /dev/null
+++ b/EasyMini/v1.0/index.mdwn
@@ -0,0 +1,18 @@
+[[!meta title="EasyMini-v1.0"]]
+# EasyMini version 1.0
+
+This is the first production version of EasyMini. The only difference
+from version 2.0 is in the processor; all other specifications are the
+same.
+
+### 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
diff --git a/EasyMini/v2.0.mdwn b/EasyMini/v2.0.mdwn
new file mode 100644
index 0000000..a171d72
--- /dev/null
+++ b/EasyMini/v2.0.mdwn
@@ -0,0 +1 @@
+[[!map pages="EasyMini/v2.0/* and ! EasyMini/v2.0/*/*"]]
diff --git a/EasyMini/v2.0/easymini-pcb.pdf b/EasyMini/v2.0/easymini-pcb.pdf
new file mode 100644
index 0000000..e3ff778
--- /dev/null
+++ b/EasyMini/v2.0/easymini-pcb.pdf
diff --git a/EasyMini/v2.0/easymini-sch.pdf b/EasyMini/v2.0/easymini-sch.pdf
new file mode 100644
index 0000000..27459bf
--- /dev/null
+++ b/EasyMini/v2.0/easymini-sch.pdf
diff --git a/EasyMini/v2.0/easymini-v2.0-bottom-thumb.jpg b/EasyMini/v2.0/easymini-v2.0-bottom-thumb.jpg
new file mode 100644
index 0000000..994aff8
--- /dev/null
+++ b/EasyMini/v2.0/easymini-v2.0-bottom-thumb.jpg
diff --git a/EasyMini/v2.0/easymini-v2.0-bottom.jpg b/EasyMini/v2.0/easymini-v2.0-bottom.jpg
new file mode 100644
index 0000000..bbf841e
--- /dev/null
+++ b/EasyMini/v2.0/easymini-v2.0-bottom.jpg
diff --git a/EasyMini/v2.0/easymini-v2.0-top-thumb.jpg b/EasyMini/v2.0/easymini-v2.0-top-thumb.jpg
new file mode 100644
index 0000000..59fb93e
--- /dev/null
+++ b/EasyMini/v2.0/easymini-v2.0-top-thumb.jpg
diff --git a/EasyMini/v2.0/easymini-v2.0-top.jpg b/EasyMini/v2.0/easymini-v2.0-top.jpg
new file mode 100644
index 0000000..12ad635
--- /dev/null
+++ b/EasyMini/v2.0/easymini-v2.0-top.jpg