update address and some details

This commit is contained in:
Sebastien Bourdeauducq 2016-09-21 17:28:50 +08:00
parent 22d587bc09
commit 95cda5a6d1
10 changed files with 28 additions and 49 deletions

View File

@ -52,8 +52,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="logo_small.png"><br /><br />The open source experimental physics company.</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><img src="logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -59,8 +59,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="../logo_small.png"><br /><br />The open source experimental physics company.</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><img src="../logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -127,18 +127,18 @@ class Experiment(EnvExperiment):
</pre>
<h2>Is ARTIQ right for my lab?</h2>
<p>It's easy to find out by yourself! The core device is based on the resource-efficient MiSoC system-on-chip design, and you can use a limited version of ARTIQ with the small and low-cost <a href="http://pipistrello.saanlima.com/">Pipistrello</a> board. Feel free to send feedback to the mailing list! See <a href="manual/installing.html">the manual</a> for instructions.</p>
<p>It's easy to find out by yourself! The core device is based on the resource-efficient MiSoC system-on-chip design, and you can use a limited version of ARTIQ with the small and low-cost <a href="http://pipistrello.saanlima.com/">Pipistrello</a> board. Feel free to send feedback to the mailing list! See <a href="manual/installing.html">the manual</a> for instructions. Note that Windows is not currently supported with the Pipistrello due to problems with the Windows PPP stack.</p>
<h2>Resources</h2>
<p>
<ul>
<li>Press release: <a href="http://nist.gov/pml/div688/grp10/open-source-software-for-quantum-information.cfm">Open-Source Software for Quantum Information</a></li>
<li><a href="artiq_overview.pdf">Slides: Overview</a></li>
<li><a href="https://github.com/m-labs/artiq">Source code repository</a></li>
<li><a href="https://ssl.serverraum.org/lists/listinfo/artiq">Public mailing list</a></li>
<li><a href="manual/">Manual</a></a>
<li><a href="artiq_overview.pdf">Slides: Overview</a></li>
<li><a href="slides_timing.pdf">Slides: Timing control in ARTIQ</a></li>
<li>Commercial support available - contact sales at m-labs.hk. <a href="extensions.html">Extensions</a>.</li>
<li><a href="https://ssl.serverraum.org/lists/listinfo/artiq">Public mailing list</a> - use for community technical support, questions, discussions, announcements</li>
<li><a href="https://github.com/m-labs/artiq">Source code repository</a></li>
<li>Commercial support available (ports to your hardware, feature development, technical support, bugfixing) - contact sales at m-labs.hk. We welcome inquiries from research groups of all sizes. <a href="https://github.com/m-labs/artiq/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Afor-contract">Proposed extensions</a>.</li>
<li>NIST press release: <a href="https://www.nist.gov/news-events/news/2015/01/open-source-software-quantum-information">Open-Source Software for Quantum Information</a></li>
</ul></p>
</div>
</div>
@ -147,8 +147,8 @@ class Experiment(EnvExperiment):
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="../logo_small.png"><br /><br />The open source experimental physics company.</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><img src="../logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -67,8 +67,7 @@
<li>LatticeMico32, modified to include an optional MMU (experimental).</li>
<li><a href="https://github.com/openrisc/mor1kx">mor1kx</a>, a better OpenRISC implementation.</li>
</ul></li>
<li>High performance memory controller capable of issuing several SDRAM commands per FPGA cycle.</li>
<li>Supports SDR, DDR, LPDDR and DDR2.</li>
<li>Memory controller supports SDR, DDR, LPDDR, DDR2 and DDR3.</li>
<li>Provided peripherals: UART, GPIO, timer, GPIO, NOR flash controller, SPI flash controller, Ethernet MAC, and more.</li>
<li>High performance: on Spartan-6, 83MHz system clock frequencies, 10+Gbps DDR SDRAM bandwidth, 1080p 32bpp framebuffer, etc.</li>
<li>Low resource usage: basic implementation fits easily in Spartan-6 LX9.</li>
@ -86,8 +85,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="logo_small.png"><br /><br />The open source experimental physics company.</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><img src="logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -52,24 +52,6 @@
<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;">
<a href="m1.html"><img src="m1.jpg" class="picimg"></a>
<h3>Milkymist One</h3>
<p>Milkymist One is a digital video synthesizer released in 2011. It produces real-time visual effects similar to those of MilkDrop, with the extra possibility to use a camera or other video sources as inputs.</p>
<p>It is based on a custom open source Verilog system-on-chip design that contains the LM32 soft CPU with many custom peripherals such as a SDRAM controller that <a href="jpl_letter.jpg">went into space</a>, a VLIW floating-point coprocessor and a 2D texture mapping accelerator.</p>
<p><ul><li><a href="m1.html">More...</a></li></ul></p>
</div>
</div>
</div>
@ -77,8 +59,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="logo_small.png"><br /><br />The open source experimental physics company.</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><img src="logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -193,8 +193,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="logo_small.png"><br /><br />The open source experimental physics company.</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><img src="logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -51,8 +51,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="logo_small.png"><br /><br />The open source experimental physics company.</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><img src="logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -31,7 +31,7 @@
<div id="container">
<div class="full">
<h2>June 23rd, 20:00 &mdash; Lecture: Harnessing social media data with machine learning</h2>
<h2>June 23rd 2016, 20:00 &mdash; Lecture: Harnessing social media data with machine learning</h2>
<p>
Judging others' psychological traits is not only an essential skill in successful social living, but also an important factor in product development. Psychological traits are a key driver behind human interaction, behavior and emotions. Although accurate judgments stem from social-cognitive skills, developments in machine learning show that computer models can also make valid judgments. It is also possible that this technique can assist clinical diagnosis in the future.
@ -64,16 +64,14 @@ Yau Tong, Hong Kong
When entering from Ko Fai Road, get inside the courtyard, the entrance to Block B1 is in front of you on your left. Take the elevator or the stairs to the 6th floor.
</p>
<p>Note that there are <b>no public events</b> at our address in Des Voeux Road Central.</p>
</div>
</div>
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="logo_small.png"><br /><br />The open source experimental physics company.</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><img src="logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -181,8 +181,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="../logo_small.png"><br /><br />The open source experimental physics company.</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><img src="../logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />

View File

@ -55,8 +55,8 @@
<div id="footer">
<div id="footerinside">
<table width="100%"><tr>
<td><p><img src="logo_small.png"><br /><br />The open source experimental physics company.</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><img src="logo_small.png"><br /><br />Open tools for open physics</p></td>
<td><p><b>M-Labs Limited</b><br />Workshop 15B 6/F Block B1<br />17 Ko Fai Road, Yau Tong<br />Hong Kong<br />+852-59362721</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 />