Jeff, Oli
ECR E1700228
More preparation to make way for PM1 - Jeff and I went into the h1sushtts simulink model and added in PM1 and its necessary connections(h1sushtts before). It was basically a copy of the RM1 and RM2 control blocks, with the input ADC channels taking 24 - 27, and channels 8 - 11 on the DAC (h1sushtts after - PM1+output).
We also copied the RMs PCIe inputs, but the channels coming in from the TTL4C on HAM1 are going to be removed for the RMs when the ISI is installed on HAM1 and replaced with the new ISI channels, and so PM1 will never have the HAM1_TTL4C channels. Since we want to be able to compile and test the model before then, I have put in a constant 0 in place of the TTL4C channels for PM1 (h1sushtts after - IPC INP). Once we have the new ISI channels, we can add these connections in using those channels, as well as update the channels for the RMs.
Daniel just added in the new ASC channels for PM1 (83195), so I was able to successfully compile h1sushtts. It has not yet been installed.
The model file can be found in /opt/rtcds/userapps/release/sus/h1/models/, and the changes to h1sushtts.mdl have been committed to the svn as revision 30907.
Just few "slept on it, and remembered we should" things to add:
(1) Attached is the DAQ channel list that comes with the installation of PM1. We didn't cover it explicitly above because it comes standard with the
/opt/rtcds/userapps/release/sus/common/models/
HSSS_FF_MASTER.mdl
library part, but as it is new (small) weight on the DAQ, it's worth calling out. 4x new channels stored at 512 Hz, and 13x at 256 Hz.
(2) Also, the oft-forgotten coil driver output voltage monitor channels, the so-called VMONs needed to be absorbed by the h1susauxh2 front-end too, so we've now done the model prep that as well -- see LHO:83211.
