All the directories under /opt/rtcds/userapps/release are now svn1.8 checkouts of the various subsystems. Where there were conflicts between locally modified files and the repo versions, I have copied the locally modified file across (we'll resolve the conflict at a later date).
All the original 1.6 directories have been moved to a new location /opt/rtcds/userapps_1.6 and each system has a _1.6 suffix (e.g. /opt/rtcds/userapps_1.6/release/cds_1.6). If a file has gone missing from the new userapps, it should be found in the old 1.6 area.
For each front end model, I compiled a list of source code (mdl and c files) and checked if there were any differences between the new and old userapps. Of the 321 files, 13 showed a difference. Of these, 7 have differences we should use (e.g. converting to 2015b version of matlab, removing hard coded file paths).
The remaining 6 files need some system manager input:
lsc/common/models/lsc.mdl: Daniel's latest LHO changes, not sure if LLO is ready for this update
sus/common/models/ESD_LINEARIZATION_WITH_CHARGE_MASTER.mdl: repo has Stuart Aston's changes "Updated SUS QUAD library model parts for independant linearization switching and charge balancing removal"
sus/common/models/OFIS_MASTER.mdl: repo has Stuart Aston's addition of a DACKILL to the watchdog
sus/common/models/QUAD_MASTER.mdl: repo has Stuart Aston's changes "Updated SUS QUAD library model parts for independant linearization switching and charge balancing removal"
sys/common/models/IWAVE.mdl: repo has Edo's changes "Updated the MUX and DEMUX bus in both IWAVE_V0 and IWAVE blocks in order to pass the additional feedback button variable to the underlying iwave c-code."
sys/common/src/IWAVE.c: repo has Edo's changes "Added a feedback button to the I/O ports (in[6] & out[6]) in order to switch the state of the code between a static and dynamic mode."
Action item to SUS and PI developers: should H1 use the new or old versions of these files?