update, add ARTIQ

about.html

@@ -49,7 +49,7 @@
 	<div id="footerinside">
 		<table width="100%"><tr>
 		<td><p><img src="logo_small.png"><br /><br />fka the Milkymist project<br />est. 2007</p></td>
-		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59362721</p></td>
+		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59185098</p></td>
 		<td><a href="https://webchat.freenode.net/?channels=m-labs">Freenode #m-labs</a><br /><a href="https://ssl.serverraum.org/lists/listinfo/devel/">Developer mailing list</a><br />
 		GitHub: <a href="https://github.com/m-labs">m-labs</a><br />
 		Twitter: @<a href="http://twitter.com/M_Labs_Ltd">M_Labs_Ltd</a><br />

gateware.html

@@ -30,7 +30,7 @@
 	<div class="full">
 		<h2>Migen</h2>
 <div style="float: right;"><img src="migen.svg"></div>
-<p>Migen is a Python-based tool that aims at automating further the VLSI design process.</p>
+<p>Migen is a Python-based tool that automates further the VLSI design process.</p>
 
 <p>Despite being faster than schematics entry, hardware design with Verilog and VHDL remains tedious and inefficient for several reasons. The event-driven model introduces issues and manual coding that are unnecessary for synchronous circuits, which represent the lion's share of today's logic designs. Counter-intuitive arithmetic rules result in steeper learning curves and provide a fertile ground for subtle bugs in designs. Finally, support for procedural generation of logic (metaprogramming) through "generate" statements is very limited and restricts the ways code can be made generic, reused and organized.</p>
 
@@ -85,7 +85,7 @@
 	<div id="footerinside">
 		<table width="100%"><tr>
 		<td><p><img src="logo_small.png"><br /><br />fka the Milkymist project<br />est. 2007</p></td>
-		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59362721</p></td>
+		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59185098</p></td>
 		<td><a href="https://webchat.freenode.net/?channels=m-labs">Freenode #m-labs</a><br /><a href="https://ssl.serverraum.org/lists/listinfo/devel/">Developer mailing list</a><br />
 		GitHub: <a href="https://github.com/m-labs">m-labs</a><br />
 		Twitter: @<a href="http://twitter.com/M_Labs_Ltd">M_Labs_Ltd</a><br />

index.html

@@ -29,26 +29,38 @@
 <div style="width: 100%; background: #1d1d20;">
 <div id="container">
 	<div class="pictures">
+		
 		<div class="picture" style="width: 700px; margin-left: auto; margin-right: auto;">
-			<a href="mixxeo.html"><img src="mixxeo_render.jpg" class="picimg"></a>
+		<center><img src="artiq.png"></center>
-			<center><img src="mixxeo_logo_small.png"></center>
+		<p>ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is an open source control system for laser-cooled trapped ion experiments, being developed for the Nobel prize-winning <a href="http://www.nist.gov/pml/div688/grp10/index.cfm">Ion Storage Group</a> at NIST.</p>
-<p>The Mixxeo is the first open source digital video mixer. It will support mixing from two DVI or HDMI sources up to 720p60, with crossfade, fade to black and other effects with a latency of less than two frames.</p><p>End-user device planned for late 2014.</p>
+		<p>The system features a high-level programming language that helps describing complex experiments, which is compiled and executed on dedicated hardware with nanosecond timing resolution and sub-microsecond latency.</p>
-<p><ul>
+		<p>Technologies employed include <a href="http://python.org">Python</a>, <a href="gateware.html">Migen</a>, <a href="gateware.html">MiSoC</a>/<a href="https://github.com/openrisc/mor1kx">mor1kx</a>, <a href="http://llvm.org">LLVM</a> and <a href="http://llvmpy.org">llvmpy</a>.</p>
-<li><a href="https://docs.google.com/forms/d/10o7PhkX2YdeHjoaV0noCN_-9WmJPMLMscpqqP1auNQ8/viewform?embedded=false">Sign up for email announcements</a></li>
+		<p>More information will be posted later!</p>
-<li><a href="mixxeo.html">More...</a></li>
+		<p><ul>
-</ul></p>
+			<li><a href="https://github.com/m-labs/ARTIQ">Repository</a></li>
+			<li><a href="https://ssl.serverraum.org/lists/listinfo/artiq">Mailing list</a></li>
+		</ul></p>
 		</div>
 
 		<br />
 
-		<center><a href="http://ehsm.eu"><img src="ehsm_logo.png"></a></center><br />
+		<div class="picture" style="width: 700px; margin-left: auto; margin-right: auto;">
-
+		<a href="gateware.html"><img src="wafer.jpg" class="picimg" alt="Intel Sandy Bridge Wafer, CC-BY-SA Flickr intelfreepress"></a>
-		<div class="picture" style="width: 350px; float: left;">
-		<a href="gateware.html"><img src="wafer.jpg" class="picimg" alt="Wafer, CC-BY-SA Flickr intelfreepress"></a>
 		<h3>Gateware and system-on-chip design</h3>
 		<p>Traditional gateware design with Verilog and VHDL is well known to be tedious and inefficient. M-Labs have developed Migen, a Python-based HDL and toolbox that addresses many of their issues and makes gateware design more productive.</p>
 		<p>Built on Migen, MiSoC provides a high performance, flexible and lightweight solution to build system-on-chips for various applications.</p>
-		<p><ul><li><a href="gateware.html">More...</a></ul></li></p>
+		<p><ul><li><a href="gateware.html">More...</a></li></ul></p>
+		</div>
+
+		<br />
+
+		<div class="picture" style="width: 350px; float: left;">
+			<a href="mixxeo.html"><img src="mixxeo_render_small.jpg" class="picimg"></a>
+			<center><img src="mixxeo_logo_small.png"></center>
+<p>The Mixxeo is the first open source digital video mixer. It will support mixing from two DVI or HDMI sources up to 720p60, with crossfade, fade to black and other effects with a latency of less than two frames.</p>
+<p><ul>
+<li><a href="mixxeo.html">More...</a></li>
+</ul></p>
 		</div>
 
 		<div class="picture" style="width: 350px; float: right;">
@@ -66,7 +78,7 @@
 	<div id="footerinside">
 		<table width="100%"><tr>
 		<td><p><img src="logo_small.png"><br /><br />fka the Milkymist project<br />est. 2007</p></td>
-		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59362721</p></td>
+		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59185098</p></td>
 		<td><a href="https://webchat.freenode.net/?channels=m-labs">Freenode #m-labs</a><br /><a href="https://ssl.serverraum.org/lists/listinfo/devel/">Developer mailing list</a><br />
 		GitHub: <a href="https://github.com/m-labs">m-labs</a><br />
 		Twitter: @<a href="http://twitter.com/M_Labs_Ltd">M_Labs_Ltd</a><br />

m1.html

@@ -29,7 +29,7 @@
 <div id="container">
 	<div class="full">
 <a href="m1_large.jpg"><img src="m1.jpg" style="float: right;"></a>
-<p>The Milkymist One was an experimental hardware appliance for live video effects.</p>
+<p>The Milkymist One is an experimental hardware appliance for live video effects.</p>
 
 <p>The small 172x145x45mm device creates visualizations similar to those generated by the <a href="http://www.geisswerks.com/milkdrop/">MilkDrop</a> software, and enables you to mix them with live footage from a camera and interact using MIDI and DMX controllers.</p>
 
@@ -192,7 +192,7 @@
 	<div id="footerinside">
 		<table width="100%"><tr>
 		<td><p><img src="logo_small.png"><br /><br />fka the Milkymist project<br />est. 2007</p></td>
-		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59362721</p></td>
+		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59185098</p></td>
 		<td><a href="https://webchat.freenode.net/?channels=m-labs">Freenode #m-labs</a><br /><a href="https://ssl.serverraum.org/lists/listinfo/devel/">Developer mailing list</a><br />
 		GitHub: <a href="https://github.com/m-labs">m-labs</a><br />
 		Twitter: @<a href="http://twitter.com/M_Labs_Ltd">M_Labs_Ltd</a><br />

mixxeo.html

@@ -31,7 +31,7 @@
 		<center><img src="mixxeo_logo.png"></center>
 <p>The Mixxeo is the first open source digital video mixer.</p>
 
-<center><a href="mixxeo_render_large.png"><img src="mixxeo_render_small.jpg"></a><br />
+<center><a href="mixxeo_render_large.png"><img src="mixxeo_render.jpg"></a><br />
 <em>[picture is a rendering - actual product appearance may vary]</em>
 </center>
 
@@ -39,12 +39,10 @@
 
 <p>The Mixxeo will support mixing from two DVI or HDMI sources up to 720p60, with crossfade, fade to black and potentially other effects with a latency of less than two frames.</p>
 
-<p><center><img src="mixxeo_menu.png"></center></p>
+<p><b>Status (Aug 2014)</b> - Main board and gateware have been <a href="mixxeo_result.jpg">mostly functional</a> for a while, mechanical design and manufacturing for the case/mechatronics are progressing slowly. If you have the skills and would like to help out, email sb at m-labs.hk or the mailing list.</p>
+
+<p><center><img src="mixxeo_menu.png"><br /><br /><img src="mixxeo_board.jpg" class="picimg"></center></p>
 
-<p><ul>
-<li><a href="https://docs.google.com/forms/d/10o7PhkX2YdeHjoaV0noCN_-9WmJPMLMscpqqP1auNQ8/viewform?embedded=false">Sign up for email announcements</a></li>
-<li><a href="http://www.vjunion.se/2013/05/the-mixxeo-hdmidvi-mixer-project/">Read the article from vjunion.se</a></li>
-</ul></p>
 	</div>
 </div>
 
@@ -52,7 +50,7 @@
 	<div id="footerinside">
 		<table width="100%"><tr>
 		<td><p><img src="logo_small.png"><br /><br />fka the Milkymist project<br />est. 2007</p></td>
-		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59362721</p></td>
+		<td><p><b>M-Labs Limited</b><br />5/F., Yat Chau Building<br />262 Des Voeux Road Central<br />Hong Kong<br />+852-59185098</p></td>
 		<td><a href="https://webchat.freenode.net/?channels=m-labs">Freenode #m-labs</a><br /><a href="https://ssl.serverraum.org/lists/listinfo/devel/">Developer mailing list</a><br />
 		GitHub: <a href="https://github.com/m-labs">m-labs</a><br />
 		Twitter: @<a href="http://twitter.com/M_Labs_Ltd">M_Labs_Ltd</a><br />