diff --git a/sis8300bcmApp/Db/sis8300bcm-fiber.template b/sis8300bcmApp/Db/sis8300bcm-fiber.template
new file mode 100644
index 0000000000000000000000000000000000000000..e9eea329ca04c56c8d2b55114e784bac560b833a
--- /dev/null
+++ b/sis8300bcmApp/Db/sis8300bcm-fiber.template
@@ -0,0 +1,29 @@
+#=================================================================#
+# Template file: sis8300bcm-fibr.template
+# Database for the records specific to the FIBER block of the
+# individual BCM channel
+# Juliano Murari
+# July 20, 2022
+
+record(longout, "$(P)$(R)OutDataSelect")
+{
+ field(DTYP, "asynInt32")
+ field(OUT, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))BCM.FIBER.OUT_DATA_SELECT")
+# field(ASG, "critical")
+ info(autosaveFields, "VAL")
+}
+
+record(longin, "$(P)$(R)OutDataSelectR")
+{
+ field(DTYP, "asynInt32")
+ field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))BCM.FIBER.OUT_DATA_SELECT")
+ field(SCAN, "I/O Intr")
+}
+
+record(longin, "$(P)$(R)StatusR")
+{
+ field(DTYP, "asynInt32")
+ field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))BCM.FIBER.STATUS")
+ field(SCAN, "I/O Intr")
+}
+
diff --git a/sis8300bcmApp/src/sis8300bcm.cpp b/sis8300bcmApp/src/sis8300bcm.cpp
index 705aea1b672d31c506dd3e78a85864554d365686..f1afdf674d980a271809a90078b4aae595da7ea7 100644
--- a/sis8300bcmApp/src/sis8300bcm.cpp
+++ b/sis8300bcmApp/src/sis8300bcm.cpp
@@ -315,6 +315,9 @@ sis8300bcm::sis8300bcm(const char *portName, const char *devicePath,
// PROBE block, channel specific
createParam(BCMProbeChannelString, asynParamInt32, &BCMProbeChannel);
createParam(BCMProbeSourceString, asynParamInt32, &BCMProbeSource);
+ // FIBER block, channel specific
+ createParam(BCMFiberOutDataSelectString, asynParamInt32, &BCMFiberOutDataSelect);
+ createParam(BCMFiberStatusString, asynParamInt32, &BCMFiberStatus);
// LUT, channel specific
char buf[255];
for (int i = 0; i < BCM_LUT_SIZE; i++) {
@@ -1115,6 +1118,25 @@ int sis8300bcm::readbackParameters()
setIntegerParam(addr, BCMProbeChannel, uintValue % 10);
}
+ // readback FIBER parameters
+ for (int addr = 0; addr < SIS8300BCM_NUM_FIBER_CHANNELS; addr++) {
+ asynPrintDeviceInfo(pasynUserSelf, "readback FIBER %d parameters", addr);
+
+ ret = sis8300drvbcm_get_fiber_out_data_select(mDeviceHandle, addr, &uintValue);
+ if (ret) {
+ asynPrintError(pasynUserSelf, "sis8300drvbcm_get_fiber_out_data_select returned %d", ret);
+ return ret;
+ }
+ setIntegerParam(addr, BCMFiberOutDataSelect, uintValue);
+ ret = sis8300drvbcm_get_fiber_status(mDeviceHandle, addr, &uintValue);
+ if (ret) {
+ asynPrintError(pasynUserSelf, "sis8300drvbcm_get_fiber_status returned %d", ret);
+ return ret;
+ }
+ setIntegerParam(addr, BCMFiberStatus, uintValue);
+
+ }
+
callParamCallbacks();
return ret;
@@ -1865,6 +1887,11 @@ asynStatus sis8300bcm::writeInt32(asynUser *pasynUser, epicsInt32 value)
if (ret) {
asynPrintError(pasynUserSelf, "sis8300drvbcm_set_channel_trigger_source returned %d", ret);
}
+ } else if (function == BCMFiberOutDataSelect) {
+ ret = sis8300drvbcm_set_fiber_out_data_select(mDeviceHandle, addr, value);
+ if (ret) {
+ asynPrintError(pasynUserSelf, "sis8300drvbcm_set_fiber_out_data_select returned %d", ret);
+ }
} else {
if (function < BCM_FIRST_PARAM) {
status = sis8300::writeInt32(pasynUser, value);
diff --git a/sis8300bcmApp/src/sis8300bcm.h b/sis8300bcmApp/src/sis8300bcm.h
index 57fc74b830d8d9e0d6b0ecb46732121f2a020bf7..5a50abeb8f9e6bd5db6c9a1e20c5f52a440047d6 100644
--- a/sis8300bcmApp/src/sis8300bcm.h
+++ b/sis8300bcmApp/src/sis8300bcm.h
@@ -211,6 +211,9 @@
// PROBE block, channel specific
#define BCMProbeChannelString "BCM.PROBE.CHANNEL"
#define BCMProbeSourceString "BCM.PROBE.SOURCE"
+// FIBER block, channel specific
+#define BCMFiberOutDataSelectString "BCM.FIBER.OUT_DATA_SELECT"
+#define BCMFiberStatusString "BCM.FIBER.STATUS"
// LUT, board specific, 16 locations
#define BCMLutDestinationIDString "BCM.LUT%d.DEST_ID"
#define BCMLutMinTriggerPeriodString "BCM.LUT%d.MIN_TRIGGER_PERIOD"
@@ -422,6 +425,9 @@ protected:
// PROBE block, channel specific
int BCMProbeChannel;
int BCMProbeSource;
+ // FIBER block, channel specific
+ int BCMFiberOutDataSelect;
+ int BCMFiberStatus;
// LUT, board specific
int BCMLutDestinationID[BCM_LUT_SIZE];
int BCMLutMinTriggerPeriod[BCM_LUT_SIZE];
diff --git a/vendor/ess/lib/sis8300bcm_reg.h b/vendor/ess/lib/sis8300bcm_reg.h
index d3f2dc6b1d41424eb552cb14ddb77a96acc99433..6057addcb6aa0b96ddfbf2eeb3e3066588997ec0 100644
--- a/vendor/ess/lib/sis8300bcm_reg.h
+++ b/vendor/ess/lib/sis8300bcm_reg.h
@@ -184,6 +184,12 @@ extern "C" {
*/
#define SIS8300BCM_PROB_X_SOURCE_OFF 0x000
+/*
+ FIBER block registers
+ */
+#define SIS8300BCM_FIBR_X_OUT_DATA_SELECT_OFF 0x000
+#define SIS8300BCM_FIBR_X_STATUS_OFF 0x001
+
#ifdef __cplusplus
}
#endif
diff --git a/vendor/ess/lib/sis8300drvbcm.c b/vendor/ess/lib/sis8300drvbcm.c
index 36cb001a40758626b2cc3140709c1b56a1a0de95..4c438f18cf2f5d503b1594df17dbd2fc20524ef3 100644
--- a/vendor/ess/lib/sis8300drvbcm.c
+++ b/vendor/ess/lib/sis8300drvbcm.c
@@ -2791,3 +2791,47 @@ int sis8300drvbcm_get_channel_beam_above_threshold(sis8300drv_usr *sisuser, unsi
// printf("%s: channel %d, reg 0x%x, value: %d\n", __func__, channel, reg, value);
return ret;
}
+
+// used to control fiber out data select
+int sis8300drvbcm_set_fiber_out_data_select(sis8300drv_usr *sisuser, unsigned int channel, unsigned int selection)
+{
+ unsigned int reg = SIS8300BCM_CHANNEL_BLOCK_BASE + \
+ (SIS8300BCM_CHANNEL_BLOCK_SIZE * channel) + \
+ SIS8300BCM_FIBR_BANK_OFF + \
+ SIS8300BCM_FIBR_X_OUT_DATA_SELECT_OFF;
+ // register has lowest 5 bits defined
+ selection &= 0x1F;
+ int ret = sis8300drv_reg_write(sisuser, reg, selection);
+ return ret;
+}
+
+int sis8300drvbcm_get_fiber_out_data_select(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *selection)
+{
+ unsigned int reg = SIS8300BCM_CHANNEL_BLOCK_BASE + \
+ (SIS8300BCM_CHANNEL_BLOCK_SIZE * channel) + \
+ SIS8300BCM_FIBR_BANK_OFF + \
+ SIS8300BCM_FIBR_X_OUT_DATA_SELECT_OFF;
+ // register has lowest 5 bits defined
+ int ret = sis8300drv_reg_read(sisuser, reg, selection);
+ if (ret) {
+ return ret;
+ }
+ *selection &= 0x1F;
+ return ret;
+}
+
+int sis8300drvbcm_get_fiber_status(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *status)
+{
+ unsigned int reg = SIS8300BCM_CHANNEL_BLOCK_BASE + \
+ (SIS8300BCM_CHANNEL_BLOCK_SIZE * channel) + \
+ SIS8300BCM_FIBR_BANK_OFF + \
+ SIS8300BCM_FIBR_X_STATUS_OFF;
+ // register has lowest 5 bits defined
+ int ret = sis8300drv_reg_read(sisuser, reg, status);
+ if (ret) {
+ return ret;
+ }
+ *status &= 0x1F;
+ return ret;
+}
+
diff --git a/vendor/ess/lib/sis8300drvbcm.h b/vendor/ess/lib/sis8300drvbcm.h
index 48eeafd6d45ca839d115a3ed53ad8fea9db5d0da..33ddbeaa90b33467fcb2f5133e4eda48a122347d 100644
--- a/vendor/ess/lib/sis8300drvbcm.h
+++ b/vendor/ess/lib/sis8300drvbcm.h
@@ -83,6 +83,8 @@ typedef enum {
#define SIS8300BCM_NUM_PROBE_CHANNELS 4
#define SIS8300BCM_NUM_CHANNELS 24
+#define SIS8300BCM_NUM_FIBER_CHANNELS 2
+
void sis8300drvbcm_set_sampling_frequency(sis8300drv_usr *sisuser, double frequency);
void sis8300drvbcm_get_sampling_frequency(sis8300drv_usr *sisuser, double *frequency);
int sis8300drvbcm_set_beam_trigger_source(sis8300drv_usr *sisuser, unsigned int source);
@@ -290,6 +292,9 @@ int sis8300drvbcm_get_differential_alarm_first(sis8300drv_usr *sisuser, unsigned
int sis8300drvbcm_get_differential_alarm_direct(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *alarms);
int sis8300drvbcm_set_enable_calibration_pulse(sis8300drv_usr *sisuser, unsigned int enable_calibration_pulse);
int sis8300drvbcm_get_calibration_sample(sis8300drv_usr *sisuser, unsigned int channel, unsigned int index, double *sample);
+int sis8300drvbcm_set_fiber_out_data_select(sis8300drv_usr *sisuser, unsigned int channel, unsigned int selection);
+int sis8300drvbcm_get_fiber_out_data_select(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *selection);
+int sis8300drvbcm_get_fiber_status(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *status);
#ifdef __cplusplus
}