FEBII developments

Author: corrodis

otsdaq-mu2e-crv/FEInterfaces/FEBII_Registers.h

@@ -27,18 +27,24 @@ enum Register : uint16_t
     CntHI            = 0x1022,
     CntLO            = 0x1023,
     ThresholdGlobal  = 0x1026,
+    Port             = 0x1029,
     UptimeHI         = 0x106C,
     UptimeLo         = 0x106D,
     EWT              = 0x106E,
     EWTCount         = 0x106F,
     ThresholdBase    = 0x1070, // to 0x107F
     ChannelMapBase   = 0x1080, // to 0x108F
     // implemented in uC
-    TrimBase         = 0x1090, // to 0x1090
+    BaselineBase     = 0x1090,
+    TrimBase         = 0x10b0, // to 0x1090
     LEDBias          = 0x10a0, // to 0x10a3
     BiasBase         = 0x10a4, // to 0x10a5
     VGABase          = 0x10a6, // to 0x10a7
 
+    // AFE reads
+    AFE0_base        = 0x1100,
+    AFE1_base        = 0x1200,
+
 	// registers that effect all FPGAs
     FlashGateEn     = 0x1300,
     FlashGateOn     = 0x1301, // 6.25ns, default 1
@@ -67,8 +73,22 @@ enum Register : uint16_t
 	CMBENA = 0x9106
 };  // end ROC_Register enum
 
+enum AFERegister : uint16_t
+{
+    // AFE registers, write only (read is a multi step process)
+    Offset_en   = 0x3, // bit 8
+    Offset_ch1  = 0x0D,
+    Offset_ch2  = 0x0F,
+    Offset_ch3  = 0x11,
+    Offset_ch4  = 0x13,
+    Offset_ch5  = 0x1F,
+    Offset_ch6  = 0x1D,
+    Offset_ch7  = 0x1B,
+    Offset_ch8  = 0x19,
+};
+
 uint16_t FPGA[] = {0x000, 0x400, 0x800, 0xC00};
 
-}  // namespace FEB
+}  // namespace FEBII
 
 #endif  // FEBII_REGISTERS_H

otsdaq-mu2e-crv/FEInterfaces/ROCCosmicRayVetoInterface.h

@@ -58,7 +58,10 @@ class ROCCosmicRayVetoInterface : public ROCCoreVInterface
 	void FebConfigure(bool useOtsConfig = true);
 	void ResetRxBuffers();
 	void SetMarkerSync(bool enable=true);
+    int16_t Realign(int sleep_uc = 1000);
+    void ResetPLL(int sleep_us = 1000);
 
+    uint16_t ReadAFE(uint16_t fpga, uint16_t afe_no, uint16_t reg);
 	// CRV FEB specific functions
 	//void FebTakePedestral();
 
@@ -91,13 +94,18 @@ class ROCCosmicRayVetoInterface : public ROCCoreVInterface
 	void                                    GetHistograms           (__ARGS__);
 	void                                    RegDump                 (__ARGS__);
 	void                                    FebIIConfigure          (__ARGS__);
+    void                                    FebIIAlign              (__ARGS__);
 	void                                    FebIISetThreshold       (__ARGS__);
 	void                                    FebIISetBias            (__ARGS__);
 	void                                    FebIISetBiasTrim        (__ARGS__);
 	void                                    FebIISetGateOnSpill     (__ARGS__);
 	void                                    FebIISetGateOffSpill    (__ARGS__);
 	void                                    FebIIGetStatus          (__ARGS__);
 	void                                    FebIISetChannel         (__ARGS__);
+    void                                    FebIISetAFEOffset       (__ARGS__);
+    void                                    FebIIGetBaselines       (__ARGS__);
+    void                                    FebIITrigBaselines      (__ARGS__);
+    void                                    SetInputMask            (__ARGS__);
 	// clang-format on
 };