Experimental Physics and
Industrial Control System

Hi Kazimierz

We are working towards a merge of
https://github.com/epics-modules/mrfioc2
and
https://github.com/paulscherrerinstitute/mrfioc2.
But as Michael stated, it is not easy and it will take some time.

Regards
Roger

--------------------------------------------------------------------
Paul Scherrer Institut
Roger Biffiger
WBGB/007
5232 Villigen PSI
Schweiz

Tel. +41 56 310 45 16
[email protected]
http://www.psi.ch

________________________________________
From: [email protected] [[email protected]] on behalf of Michael Davidsaver [[email protected]]
Sent: Tuesday, July 18, 2017 4:08 PM
To: Gofron, Kazimierz; '[email protected]'
Subject: Re: mrfioc2 repositories

Hi Kaz,

My "official" repo is:

> https://github.com/epics-modules/mrfioc2

which is the source for release tars found here:

> https://sourceforge.net/projects/epics/files/mrfioc2/


Yes I would like to merge these two full.  Parts already have been in
mrfioc2 2.1.0.  The PSI fork adds support for some newer MRF 300 series
hardware.  However, it breaks compatibility in several ways which I
don't like.  The source tree has also been extensively rearranged, which
complicates merge work.

There has been some recent progress in this area which may give a
resolution.


Michael


On 07/18/2017 03:35 PM, Gofron, Kazimierz wrote:
> There seem to be several repositories for the mrfioc2. Are there plans
> to merge these; otherwise, do changes end up eventually in one of these
> (i.e. github.com/epics-modules/).
>
>
>
> Almost at version: 3.0.1
>
> https://github.com/paulscherrerinstitute/mrfioc2
>
>
>
> At version 2.1.x
>
> http://epics.sourceforge.net/mrfioc2/
>
> https://sourceforge.net/projects/epics/files/mrfioc2/
>
>
>
> Release 2.1.0
>
> https://github.com/epics-modules/mrfioc2
>
>
>
> (NLSLS-2 internal @V2)
>
>
>
> Kazimierz Gofron
>
> NSLS-II Controls Group
>
> Brookhaven National Laboratory
>
> (p) +1 (631) 344 5283
>
> (f) +1 (631) 344 8085
>
> (e) [email protected] <mailto:[email protected]>
>
> (w) www.bnl.gov/nsls2 <http://www.bnl.gov/nsls2>
>
>
>

References:

mrfioc2 repositories Gofron, Kazimierz

Re: mrfioc2 repositories Michael Davidsaver

Navigate by Date:

Prev: Re: Debian packages for debian 9 (stretch) ? Carlos Pascual

Next: Re: Debian packages for debian 9 (stretch) ? Michael Davidsaver

Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017>  2018  2019  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: Re: mrfioc2 repositories Michael Davidsaver

Next: cross-gcc for vxWorks 5.4.2 on linux Dunning, Michael

Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017>  2018  2019  2020  2021  2022  2023  2024