Skip to content
Snippets Groups Projects
Commit 28363704 authored by Marco Filho's avatar Marco Filho
Browse files

Solve compilation errors.

Mostly just change names of files or classes.
parent fa45ac89
2 merge requests!7Major refactor,!6Take API out of EPICS module
...@@ -10,7 +10,7 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid ...@@ -10,7 +10,7 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
number_hybrids(hybrids) number_hybrids(hybrids)
{ {
pVmmTblAPI = FrontEndFactory::createAndRegister<VmmTblAPI>( pVmmAPI = FrontEndFactory::createAndRegister<VMMAPI>(
rmm->getRMMAPI(), rmm->getRMMAPI(),
ring, ring,
node, node,
...@@ -22,11 +22,11 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid ...@@ -22,11 +22,11 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
rmm->updateTopologyPvs(ring, node, "vmmTbl"); rmm->updateTopologyPvs(ring, node, "vmmTbl");
if (rmm->getRMMAPI()->checkRings() == rmmSuccess) { if (rmm->getRMMAPI()->checkRings() == rmmSuccess) {
for (int hyb = 0; hyb < number_hybrids; hyb++) { for (int hyb = 0; hyb < number_hybrids; hyb++) {
pVmmTblAPI->enableHybrid(hyb, true); pVmmAPI->enableHybrid(hyb, true);
setStringParam(vmmHybFwVersion_[hyb], pVmmTblAPI->readFwVersion(hyb).c_str()); setStringParam(vmmHybFwVersion_[hyb], pVmmAPI->readFwVersion(hyb).c_str());
setStringParam(vmmHybId_[hyb], pVmmTblAPI->readIDChip(hyb).c_str()); setStringParam(vmmHybId_[hyb], pVmmAPI->readIDChip(hyb).c_str());
setStringParam(vmmHybGeoPos_[hyb], pVmmTblAPI->readGeoPos(hyb).c_str()); setStringParam(vmmHybGeoPos_[hyb], pVmmAPI->readGeoPos(hyb).c_str());
setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmTblAPI->checkLinkStatus(hyb))); setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmAPI->checkLinkStatus(hyb)));
} }
} }
} }
...@@ -91,9 +91,9 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) { ...@@ -91,9 +91,9 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
for (int vmm = 0; vmm <= 1; vmm++) { for (int vmm = 0; vmm <= 1; vmm++) {
getIntegerParam(vmmSelectMonitorVMM0_ + vmm, &adc_sensor); getIntegerParam(vmmSelectMonitorVMM0_ + vmm, &adc_sensor);
std::cout << "adc_sensor" << adc_sensor << std::endl; std::cout << "adc_sensor" << adc_sensor << std::endl;
pVmmTblAPI->getHybrid(0).getVMM(vmm).setRegister("sm5_sm0", adc_sensor + 64); pVmmAPI->getHybrid(0).getVMM(vmm).setRegister("sm5_sm0", adc_sensor + 64);
pVmmTblAPI->configVMM(0, vmm); pVmmAPI->configVMM(0, vmm);
int adc_read = pVmmTblAPI->readADC(0, vmm); int adc_read = pVmmAPI->readADC(0, vmm);
std::cout << "adc_read" << adc_read << std::endl; std::cout << "adc_read" << adc_read << std::endl;
...@@ -109,11 +109,11 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) { ...@@ -109,11 +109,11 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
else if (function == vmmAcquire_) { else if (function == vmmAcquire_) {
if (value) pVmmTblAPI->acquire(true); if (value) pVmmAPI->acquire(true);
else pVmmTblAPI->acquire(false); else pVmmAPI->acquire(false);
for (int hyb = 0; hyb < number_hybrids; hyb++) for (int hyb = 0; hyb < number_hybrids; hyb++)
setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmTblAPI->checkLinkStatus(hyb))); setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmAPI->checkLinkStatus(hyb)));
} }
return status; return status;
...@@ -146,7 +146,7 @@ asynStatus VMMTbl::writeInt8Array(asynUser *pasynUser, epicsInt8 *value, size_t ...@@ -146,7 +146,7 @@ asynStatus VMMTbl::writeInt8Array(asynUser *pasynUser, epicsInt8 *value, size_t
for (epicsInt8 i = 0; i < ncopy; ++i) { for (epicsInt8 i = 0; i < ncopy; ++i) {
int8Array.push_back(static_cast<int>(value[i]) >= 1 ? 1 : 0); int8Array.push_back(static_cast<int>(value[i]) >= 1 ? 1 : 0);
pVmmTblAPI->getHybrid(pair.hyb).getVMM(pair.vmm).setRegister(pair.rg.c_str(), pVmmAPI->getHybrid(pair.hyb).getVMM(pair.vmm).setRegister(pair.rg.c_str(),
static_cast<int>(value[i]), static_cast<int>(value[i]),
i); i);
} }
......
#pragma once #pragma once
#include "rmm.h" #include "rmm.h"
#include "VmmTblAPI.h" #include "VMMAPI.h"
/* Struct to hold Hyb, VMM pair values */ /* Struct to hold Hyb, VMM pair values */
struct Reg { struct Reg {
...@@ -45,6 +45,6 @@ protected: ...@@ -45,6 +45,6 @@ protected:
private: private:
static constexpr const char *driverName = "VMMTbl"; static constexpr const char *driverName = "VMMTbl";
std::shared_ptr<VmmTblAPI> pVmmTblAPI; std::shared_ptr<VMMAPI> pVmmAPI;
int number_hybrids; int number_hybrids;
}; };
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment