Home.md

@@ -9,21 +9,19 @@ and supervision level.
 With [Alstom](http://www.alstom.com) phasing out WorldFIP support in
 2009, it was decided to insource this technology at CERN.
 
-The insourcing project includes a radiation-tolerant agent in an FPGA,
-called [nanoFIP](https://www.ohwr.org/project/nanofip/wiki) and a master
-card in  
-PCI express format, called
-[masterFIP](https://www.ohwr.org/project/masterfip/wiki). Also a
-diagnostic module called the
-[nanoFIPdiag](https://www.ohwr.org/project/nanofipdiag/wiki) has been
-designed.  
-These designs are available under the [CERN Open Hardware
-Licence](https://www.ohwr.org/project/cernohl/wiki).
+The insourcing project includes different hardware designs as an FPGA
+agent, FMC mezzanine cards for use as master or agent,  
+while for the master a full gateware and software stack has been written
+with Linux driver support.  
+The designs are available under the [CERN Open Hardware
+Licence](https://www.ohwr.org/project/cernohl/wiki) or other open
+licences.
 
 All the projects still make use of the Alstom components
 [FielDrive](https://www.ohwr.org/project/cern-fip/wikis/FielDrive) and
 [FieldTR](https://www.ohwr.org/project/cern-fip/wikis/FieldTR).  
-These components are available for purchase from Alstom.
+These components are available for purchase from
+[Alstom](/Alstom-components).
 
 -----
 
@@ -32,7 +30,7 @@ These components are available for purchase from Alstom.
 <table>
 <tbody>
 <tr class="odd">
-<td>radiation-tolerant agent</td>
+<td>radiation-tolerant agent in FPGA</td>
 <td>[nanoFIP](https://www.ohwr.org/project/nanofip/wiki)</td>
 </tr>
 <tr class="even">
@@ -43,6 +41,14 @@ These components are available for purchase from Alstom.
 <td>diagnostic module</td>
 <td>[nanoFIPdiag](https://www.ohwr.org/project/nanofipdiag/wiki)</td>
 </tr>
+<tr class="even">
+<td>worldFIP master FMC card</td>
+<td>[fmc-masterFIP](https://www.ohwr.org/project/fmc-masterfip/wiki)</td>
+</tr>
+<tr class="odd">
+<td>worldFIP agent FMC card</td>
+<td>[fmc-nanoFIP](https://www.ohwr.org/project/fmc-nanofip/wiki)</td>
+</tr>
 </tbody>
 </table>
 
@@ -80,9 +86,13 @@ These components are available for purchase from Alstom.
 <td>development of the radiation-tolerant WorldFIP diagnostic module, [nanoFIPdiag](https://www.ohwr.org/project/nanofipdiag/wiki)</td>
 </tr>
 <tr class="even">
-<td>2014-today</td>
+<td>2014-2017</td>
 <td>development of the WorldFIP master, [masterFIP](https://www.ohwr.org/project/masterfip/wiki)</td>
 </tr>
+<tr class="odd">
+<td>2017-</td>
+<td>development of the WorldFIP agent FMC card <a href="https://www.ohwr.org/project/fmc-nanofip/wiki">fmc-nanoFIP</a> based on the nanoFIP</td>
+</tr>
 </tbody>
 </table>
 
@@ -98,5 +108,5 @@ Palluel](mailto:julien.palluel@cern.ch) **
 
 -----
 
-*E.Gousiou, E.Van der Bij, July 2015*
+*E.Gousiou, E.Van der Bij, 29 March 2017*