diff --git a/vmmTblApp/Db/vmm.template b/vmmTblApp/Db/vmm.template index de3a4529cc2256975be81fd719eaf20cd79772b6..f1d62272902de6ed74f44f7203451eebd5720a1e 100644 --- a/vmmTblApp/Db/vmm.template +++ b/vmmTblApp/Db/vmm.template @@ -34,7 +34,7 @@ record(acalcout, "$(P)$(R)$(HYB)$(VMM)$(C)#All$(CH)-S") { field(OUT, "$(P)$(R)$(HYB)$(VMM)$(C)$(CH)-S PP") } -# 0-63 are for reading straight from these channels DACs. +# 0-63 are for reading straight from these channels ADCs. # 64, 65, 66 and 67 are respectively for reading # Pulser, Threshold, Bandgap and Temperature respectively. @@ -54,10 +54,10 @@ record(ai, "$(P)$(R)$(HYB)$(VMM)$(C)AnalogMon-R"){ field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))HYB_$(HYB)_$(VMM)_ANALOGMON") } -record(ai, "$(P)$(R)$(HYB)$(VMM)$(C)DACVal-R"){ - field(DESC, "Read DAC value") +record(ai, "$(P)$(R)$(HYB)$(VMM)$(C)ADCVal-R"){ + field(DESC, "Read ADC value") field(DTYP, "asynInt32") field(PINI, "YES") field(SCAN, "I/O Intr") - field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))HYB_$(HYB)_$(VMM)_DACVAL") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))HYB_$(HYB)_$(VMM)_ADCVAL") } \ No newline at end of file diff --git a/vmmTblApp/src/vmm_tbl.cpp b/vmmTblApp/src/vmm_tbl.cpp index 1805c9189cbe6b6bb9e4fe695e2696cd2433e831..f63be800a954fa7cbb2baff8b9574beb7b2f3e6c 100644 --- a/vmmTblApp/src/vmm_tbl.cpp +++ b/vmmTblApp/src/vmm_tbl.cpp @@ -72,14 +72,14 @@ asynStatus VMMTbl::readInt32(asynUser *pasynUser, epicsInt32 *value) { goto endOfReadInt32; } - param_index = VecUtils::getIndex(vmmDACIDX_, function, hyb_index, vmm_index); + param_index = VecUtils::getIndex(vmmADCIDX_, function, hyb_index, vmm_index); if (param_index == 0) { - this->pVmmAPI->getDACIdx(hyb_index, vmm_index, tmp_val); + this->pVmmAPI->getADCIdx(hyb_index, vmm_index, tmp_val); *value = tmp_val; goto endOfReadInt32; } - param_index = VecUtils::getIndex(vmmDACVAL_, function, hyb_index, vmm_index); + param_index = VecUtils::getIndex(vmmADCVAL_, function, hyb_index, vmm_index); if (param_index == 0) { this->pVmmAPI->readADC(hyb_index, vmm_index, tmp_val); *value = tmp_val; @@ -195,7 +195,7 @@ asynStatus VMMTbl::createEpicsParams() { createParamAndStoreInVector("HYB_" + std::to_string(hyb) + key, typ, vec); } - std::vector<int> SC, SL, ST, STH, SM, SD, SMX, DACIDX, DACVAL; + std::vector<int> SC, SL, ST, STH, SM, SD, SMX, ADCIDX, ADCVAL; for (int vmm=0; vmm < VMMS_PER_HYBRID; vmm++) { @@ -230,11 +230,11 @@ asynStatus VMMTbl::createEpicsParams() { param_name.str(""); param_name << "HYB_" << hyb <<"_" << vmm << "_ANALOGMON"; - createParamAndStoreInVector(param_name.str(), asynParamInt32, &DACIDX); + createParamAndStoreInVector(param_name.str(), asynParamInt32, &ADCIDX); param_name.str(""); - param_name << "HYB_" << hyb <<"_" << vmm << "_DACVAL"; - createParamAndStoreInVector(param_name.str(), asynParamInt32, &DACVAL); + param_name << "HYB_" << hyb <<"_" << vmm << "_ADCVAL"; + createParamAndStoreInVector(param_name.str(), asynParamInt32, &ADCVAL); } @@ -245,8 +245,8 @@ asynStatus VMMTbl::createEpicsParams() { this->vmmSM_.push_back(SM); this->vmmSD_.push_back(SD); this->vmmSMX_.push_back(SMX); - this->vmmDACIDX_.push_back(DACIDX); - this->vmmDACVAL_.push_back(DACVAL); + this->vmmADCIDX_.push_back(ADCIDX); + this->vmmADCVAL_.push_back(ADCVAL); } @@ -295,9 +295,9 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) { goto endOfWriteInt32; } - param_index = VecUtils::getIndex(vmmDACIDX_, function, hyb_index, vmm_index); + param_index = VecUtils::getIndex(vmmADCIDX_, function, hyb_index, vmm_index); if (param_index == 0) { - vmm_stat = this->pVmmAPI->setDACIdx(hyb_index, vmm_index, value); + vmm_stat = this->pVmmAPI->setADCIdx(hyb_index, vmm_index, value); if (vmm_stat != vmmSuccess) status = asynError; goto endOfWriteInt32; } diff --git a/vmmTblApp/src/vmm_tbl.h b/vmmTblApp/src/vmm_tbl.h index ece1351e3dddd10f51ffbfbad96c41307067d88a..307eccd68e5216f21fadeb325f8fc7be1966f7f5 100644 --- a/vmmTblApp/src/vmm_tbl.h +++ b/vmmTblApp/src/vmm_tbl.h @@ -49,8 +49,8 @@ protected: std::vector<std::vector<int>> vmmSM_; std::vector<std::vector<int>> vmmSD_; std::vector<std::vector<int>> vmmSMX_; - std::vector<std::vector<int>> vmmDACIDX_; - std::vector<std::vector<int>> vmmDACVAL_; + std::vector<std::vector<int>> vmmADCIDX_; + std::vector<std::vector<int>> vmmADCVAL_; private: static constexpr const char *driverName = "VMMTbl";