Fixed a bug where setting the state of P digital pins, actually tried…

… to set the value of N digital pins. Added a startup parameter to set the trigger polling interval. This way we can free the CPU while waiting for a trigger.
AustralianSynchrotron · May 22, 2019 · 1e8aa6d · 1e8aa6d
1 parent 488d2eb
commit 1e8aa6d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/RedPitayaSup/src/drvRedPitaya.cpp b/RedPitayaSup/src/drvRedPitaya.cpp
@@ -65,7 +65,7 @@
 //
 #define ARRAY_LENGTH(xx)   ((int) (sizeof (xx) /sizeof (xx [0])))
 
-#define REDPITAYA_DRIVER_VERSION   "2.1"
+#define REDPITAYA_DRIVER_VERSION   "2.2"
 
 #define MAX_NUMBER_OF_ADDRESSES    8      // 0 to 8
 
@@ -260,7 +260,7 @@ void dataAcquisition(void *drvPvt) {
 
 //------------------------------------------------------------------------------
 //
-RedPitayaDriver::RedPitayaDriver(const char* port_name) :
+RedPitayaDriver::RedPitayaDriver(const char* port_name, const double pollingInterval) :
       asynPortDriver(port_name,              //
                      MAX_NUMBER_OF_ADDRESSES,//
                      NUMBER_QUALIFIERS,      //
@@ -291,6 +291,13 @@ RedPitayaDriver::RedPitayaDriver(const char* port_name) :
 
    snprintf(this->full_name, sizeof(this->full_name), "%s", port_name);
 
+   if (pollingInterval < 0.0) {
+      ERROR("Trigger polling interval needs to be a positive number\n", 0);
+      return;
+   }
+
+   triggerPollingInterval = pollingInterval;
+
    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    // Set up asyn parameters.
    //
@@ -400,6 +407,7 @@ void RedPitayaDriver::dataAcquisition() {
       rp_AcqGetTriggerSrc(&currentTriggerSource);
       while (currentTriggerSource != 0 && this->acquiring &&
             inTriggerSource == currentTriggerSource) {
+         epicsThreadSleep(triggerPollingInterval);
          rp_AcqGetTriggerSrc(&currentTriggerSource);
       }
 
@@ -554,10 +562,10 @@ asynStatus RedPitayaDriver::writeInt32(asynUser* pasynUser, epicsInt32 value) {
       rpStatus = rp_DpinSetDirection(rp_dpin_t(N_PIN_OFFSET + addr), rp_pinDirection_t(value));
       break;
    case PDigPinState:
-      rpStatus = rp_DpinSetState(rp_dpin_t(N_PIN_OFFSET + addr), rp_pinState_t(value));
+      rpStatus = rp_DpinSetState(rp_dpin_t(P_PIN_OFFSET + addr), rp_pinState_t(value));
       break;
    case NDigPinState:
-      rpStatus = rp_DpinSetState(rp_dpin_t(P_PIN_OFFSET + addr), rp_pinState_t(value));
+      rpStatus = rp_DpinSetState(rp_dpin_t(N_PIN_OFFSET + addr), rp_pinState_t(value));
       break;
    case LedState:
       rpStatus = rp_DpinSetState(rp_dpin_t(addr), rp_pinState_t(value));
@@ -1241,8 +1249,9 @@ asynStatus RedPitayaDriver::readFloat32Array(asynUser *pasynUser, epicsFloat32 *
 
 // Define argument kinds
 //
-static const iocshArg verbosity_arg = { "Verbosity (0 .. 4)", iocshArgInt };
-static const iocshArg port_name_arg = { "ASYN port name", iocshArgString };
+static const iocshArg verbosity_arg =        { "Verbosity (0 .. 4)", iocshArgInt             };
+static const iocshArg port_name_arg =        { "ASYN port name", iocshArgString              };
+static const iocshArg polling_interval_arg = { "Trigger polling interval", iocshArgDouble    };
 
 //------------------------------------------------------------------------------
 //
@@ -1256,12 +1265,12 @@ static void Call_RedPitaya_Initialise(const iocshArgBuf* args) {
 
 //------------------------------------------------------------------------------
 //
-static const iocshArg * const RedPitaya_Configure_Args[1] = { &port_name_arg, };
+static const iocshArg * const RedPitaya_Configure_Args[2] = { &port_name_arg, &polling_interval_arg};
 
-static const iocshFuncDef RedPitaya_Configure_Func_Def = { "RedPitaya_Configure", 1, RedPitaya_Configure_Args };
+static const iocshFuncDef RedPitaya_Configure_Func_Def = { "RedPitaya_Configure", 2, RedPitaya_Configure_Args };
 
 static void Call_RedPitaya_Configure(const iocshArgBuf* args) {
-   new RedPitayaDriver(args[0].sval);
+   new RedPitayaDriver(args[0].sval, args[1].dval);
 }
 
 //------------------------------------------------------------------------------

diff --git a/RedPitayaSup/src/drvRedPitaya.h b/RedPitayaSup/src/drvRedPitaya.h
@@ -46,7 +46,7 @@
 
 class epicsShareFunc RedPitayaDriver : public asynPortDriver {
 public:
-   explicit RedPitayaDriver (const char* port_name);
+   explicit RedPitayaDriver (const char* port_name, const double pollingInterval = 0.01);
    ~RedPitayaDriver ();
 
    /**
@@ -58,10 +58,10 @@ class epicsShareFunc RedPitayaDriver : public asynPortDriver {
      // General info
      //
      DriverVersion = 0,       // EPICS driver version
-     NDigPinDir,              // Direction of N digital pins
 
      // Digital pins and LEDs
      //
+     NDigPinDir,              // Direction of N digital pins
      PDigPinDir,              // Direction of P digital pins
      NDigPinState,            // State of N digital pins
      PDigPinState,            // State of P digital pins
@@ -154,9 +154,9 @@ class epicsShareFunc RedPitayaDriver : public asynPortDriver {
    bool acquiring;                      // Is acquiring data
    double acquisitionSleep;             // Continuous data acquisition rate
    epicsInt32 ssChannelSelected;        // Selected channels to be triggered as a single shot
-   //int inTriggerSource;                 // Trigger source set in the EPICS database
    int out1TriggerSource;               // Trigger source for output 1
    int out2TriggerSource;               // Trigger source for output 2
+   double triggerPollingInterval;       // Interval at which we poll for new trigger status
 
 };
 

diff --git a/iocBoot/iocRedPitayaTest/st.cmd b/iocBoot/iocRedPitayaTest/st.cmd
@@ -12,7 +12,9 @@ dbLoadDatabase("dbd/RedPitayaTest.dbd",0,0)
 RedPitayaTest_registerRecordDeviceDriver(pdbbase) 
 
 RedPitaya_Initialise (4)
-RedPitaya_Configure ("RP")
+
+# RedPitaya_Configure (portName, triggerPollingInterval in seconds)
+RedPitaya_Configure ("RP", 0.1)
 
 ## Load record instances
 dbLoadTemplate("db/redpitaya.substitutions")