Updated the c1scx model to have two Lockin demodulators (C1:SUS-ETMX_LOCKIN1 and C1:SUS-ETMX_LOCKIN2). There is a matrix C1:SUS-ETMX_INMUX which directs signals to the inputs of LOCKIN1 and LOCKIN2. Currently only the GREEN_TRX signal is the only signal going in to this matrix, the other 3 are grounds. The actual clocks themselves had to be at the top level (they don't work inside blocks) and thus named C1:SCX-ETMX_LOCKIN1_OSC and C1:SCX-ETMX_LOCKIN2_OSC.
There is a signal (IPC name is C1:GCV-SCX_GREEN_TRX) going from the c1gcv model to the c1scx model, which will contain the output from Jenne's green transmission PD which will eventually be placed. I've placed a filter bank on it in the c1gcv model as a monitor point, and it corresponds to C1:GCV-GREEN_TRX.
The suspension control screens were modified to have a screen for the Matrix feeding signals into the two lockin demodulators. The green medm screen was also modified to have readbacks for the GREEN_TRX and GREEN_TRY channels.
So on the board, the top channel (labeled 1, corresponds to code ADC_0_0) is MCL.
Channel 2 (ADC_0_1) is assigned to frequency divided green signal.
Channel 3 (ADC_0_2) is assigned to the beat PD's DC output.
Channel 4 (ADC_0_3) is assigned to the green power transmission for the x-arm.
Channel 5 (ADC_0_4) is assigned to the green power transmission for the y-arm. |