Commit 5232bd05 authored by acq's avatar acq

New driver for V1725

parent 333ff79c
......@@ -34,7 +34,7 @@ typedef struct {
CAEN_DGTZ_DPP_AcqMode_t DPPAcqMode; // Acquisition mode (Oscilloscope, List, Mixed)
CAEN_DGTZ_DPP_SaveParam_t SaveMode; // Save mode (Energy, Time, Energy&Time, None)
int32 RecordLength; // Nb of samples in oscilloscope mode
int32 cfdTrap; // Enable CFD plot or trpaezoid
int32 cfdTrap; // Enable CFD plot or trapezoid
CAEN_DGTZ_IOLevel_t IOLevel; // I/O level (NIM, TTL)
CAEN_DGTZ_TriggerMode_t TriggerMode; // Trigger mode (disable, extout, acq_only, acq_extout)
int32 ChannelMask; // Channel enable mask
......
......@@ -113,7 +113,7 @@ public:
DynamicProperty<std::string> channelActiveStr;
DynamicProperty<int32> dynamicRange; // dynamic range 0=2V 1=0.5V - range 0:1
DynamicProperty<std::string> dynamicRangeStr;
DynamicProperty<int32> dcOffset;
DynamicProperty<int32> dcOffset; // range 0 - 100 of full scale
DynamicProperty<int32> preTrigger; // range 0:1023 (nSamples = pre_trig x 2)
DynamicProperty<int32> pulsePolarity; // invert input - range 0:1
DynamicProperty<std::string> pulsePolarityStr;
......
......@@ -71,6 +71,11 @@ public:
* \brief Set CFD mode parameters
*/
virtual void setCfdParam() = 0;
/*!
* \brief Set bit in register
*/
//virtual void RegisterSetBits(uint16_t addr, int32 startBit, int32 endBit, int32 val) = 0;
};
}
......
......@@ -86,4 +86,11 @@ void PerfectCAENCfdDriver::setCfdParam() {
}
/*!
* \brief Set bit in register
*/
void PerfectCAENCfdDriver::registerSetBits(uint16_t addr, int32 startBit, int32 endBit, int32 val) {
}
}
......@@ -78,6 +78,11 @@ public:
* \brief Set CFD mode parameters
*/
virtual void setCfdParam();
/*!
* \brief Set bit in register
*/
virtual void registerSetBits(uint16_t addr, int32 startBit, int32 endBit, int32 val);
};
}
......
This diff is collapsed.
......@@ -88,14 +88,25 @@ public:
*/
virtual void setCfdParam();
/*!
* \brief Set bit in register
*/
virtual void registerSetBits(uint16_t addr, int32 startBit, int32 endBit, int32 val);
private:
void open();
void close();
int32 LockTempCalibration_x730(uint32_t ch);
int32 ReadSPIRegister(uint32_t ch, uint32_t address, uint32_t *value);
int32 WriteSPIRegister(uint32_t ch, uint32_t address, uint32_t value);
int32 m_boardHandle;
int32 m_boardInit;
CAEN_DGTZ_ErrorCode ret;
// CAEN_DGTZ_ErrorCode ret;
int32 ret;
CAEN_DGTZ_BoardInfo_t boardInfo;
DigitizerParams_t boardParams;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment