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

Style: run pre-commit

parent 1b65dd49
No related branches found
No related tags found
1 merge request!8Add polling to ADC value
...@@ -17,7 +17,6 @@ VMMTbl::VMMTbl(RMM *rmm, const char *FENPortName, int ring, int node, int hybrid ...@@ -17,7 +17,6 @@ VMMTbl::VMMTbl(RMM *rmm, const char *FENPortName, int ring, int node, int hybrid
setStringParam(IOCMessage, "Finished starting IOC."); setStringParam(IOCMessage, "Finished starting IOC.");
callParamCallbacks(); callParamCallbacks();
} }
asynStatus VMMTbl::readInt32(asynUser *pasynUser, epicsInt32 *value) { asynStatus VMMTbl::readInt32(asynUser *pasynUser, epicsInt32 *value) {
...@@ -135,8 +134,8 @@ asynStatus VMMTbl::readInt32(asynUser *pasynUser, epicsInt32 *value) { ...@@ -135,8 +134,8 @@ asynStatus VMMTbl::readInt32(asynUser *pasynUser, epicsInt32 *value) {
endOfReadInt32: endOfReadInt32:
if (param_index < 0) { if (param_index < 0) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to find parameter %s, index: %d.\n", driverName, __FUNCTION__, asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to find parameter %s, index: %d.\n", driverName,
paramName, function); __FUNCTION__, paramName, function);
std::string message = "Failed to find parameter: " + std::to_string(*paramName); std::string message = "Failed to find parameter: " + std::to_string(*paramName);
setStringParam(IOCMessage, message.c_str()); setStringParam(IOCMessage, message.c_str());
*value = 0; *value = 0;
...@@ -269,8 +268,8 @@ asynStatus VMMTbl::readOctet(asynUser *pasynUser, char *value, size_t nChars, si ...@@ -269,8 +268,8 @@ asynStatus VMMTbl::readOctet(asynUser *pasynUser, char *value, size_t nChars, si
endOfReadOctet: endOfReadOctet:
if (param_index < 0) { if (param_index < 0) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to find parameter %s, index: %d.\n", driverName, __FUNCTION__, asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to find parameter %s, index: %d.\n", driverName,
paramName, function); __FUNCTION__, paramName, function);
std::string message = "Failed to find parameter: " + std::to_string(*paramName); std::string message = "Failed to find parameter: " + std::to_string(*paramName);
setStringParam(IOCMessage, message.c_str()); setStringParam(IOCMessage, message.c_str());
value[0] = '\0'; value[0] = '\0';
...@@ -278,8 +277,8 @@ endOfReadOctet: ...@@ -278,8 +277,8 @@ endOfReadOctet:
return asynError; return asynError;
} }
if (result != vmmSuccess) { if (result != vmmSuccess) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to adequately read parameter: %s, index: %d.\n", driverName, asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to adequately read parameter: %s, index: %d.\n",
__FUNCTION__, paramName, function); driverName, __FUNCTION__, paramName, function);
std::string message = "Failed to read parameter: " + std::to_string(*paramName); std::string message = "Failed to read parameter: " + std::to_string(*paramName);
setStringParam(IOCMessage, message.c_str()); setStringParam(IOCMessage, message.c_str());
status = asynError; status = asynError;
...@@ -445,7 +444,7 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) { ...@@ -445,7 +444,7 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
} }
if (function == vmmAcquire_) { if (function == vmmAcquire_) {
setStringParam(IOCMessage, std::string( "Set acquire to " + std::to_string(value) ).c_str()); setStringParam(IOCMessage, std::string("Set acquire to " + std::to_string(value)).c_str());
vmm_stat = this->pVmmAPI->isAcquiring(is_acquiring); vmm_stat = this->pVmmAPI->isAcquiring(is_acquiring);
if (is_acquiring == (bool)value) { if (is_acquiring == (bool)value) {
setStringParam(IOCMessage, "Error: Set to acquire/stop but already acquiring/stopped."); setStringParam(IOCMessage, "Error: Set to acquire/stop but already acquiring/stopped.");
...@@ -460,50 +459,60 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) { ...@@ -460,50 +459,60 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
// Search for parameter in all parameter vectors. If found, execute correct function for specific hybrid. // Search for parameter in all parameter vectors. If found, execute correct function for specific hybrid.
param_index = VecUtils::getIndex(vmmHybSkew_, function); param_index = VecUtils::getIndex(vmmHybSkew_, function);
if (param_index >= 0) { if (param_index >= 0) {
setStringParam(IOCMessage, std::string( "Set skew from hybrid " + std::to_string(param_index) + " to " + std::to_string(value) ).c_str()); setStringParam(
IOCMessage,
std::string("Set skew from hybrid " + std::to_string(param_index) + " to " + std::to_string(value)).c_str());
vmm_stat = this->pVmmAPI->setSkew(param_index, value); vmm_stat = this->pVmmAPI->setSkew(param_index, value);
goto endOfWriteInt32; goto endOfWriteInt32;
} }
param_index = VecUtils::getIndex(vmmHybEnable_, function); param_index = VecUtils::getIndex(vmmHybEnable_, function);
if (param_index >= 0) { if (param_index >= 0) {
setStringParam(IOCMessage, std::string( "Setting enable/disable for hybrid " + std::to_string(param_index) + " to " + std::to_string(value) ).c_str()); setStringParam(IOCMessage, std::string("Setting enable/disable for hybrid " + std::to_string(param_index) + " to " +
std::to_string(value))
.c_str());
vmm_stat = this->pVmmAPI->enableHybrid(param_index, (bool)value); vmm_stat = this->pVmmAPI->enableHybrid(param_index, (bool)value);
goto endOfWriteInt32; goto endOfWriteInt32;
} }
param_index = VecUtils::getIndex(vmmHybWidth_, function); param_index = VecUtils::getIndex(vmmHybWidth_, function);
if (param_index >= 0) { if (param_index >= 0) {
setStringParam(IOCMessage, std::string( "Set width from hybrid " + std::to_string(param_index) + " to " + std::to_string(value) ).c_str()); setStringParam(
IOCMessage,
std::string("Set width from hybrid " + std::to_string(param_index) + " to " + std::to_string(value)).c_str());
vmm_stat = this->pVmmAPI->setWidth(param_index, value); vmm_stat = this->pVmmAPI->setWidth(param_index, value);
goto endOfWriteInt32; goto endOfWriteInt32;
} }
param_index = VecUtils::getIndex(vmmHybPolarity_, function); param_index = VecUtils::getIndex(vmmHybPolarity_, function);
if (param_index >= 0) { if (param_index >= 0) {
setStringParam(IOCMessage, std::string( "Set polarity from hybrid " + std::to_string(param_index) + " to " + std::to_string(value) ).c_str()); setStringParam(IOCMessage, std::string("Set polarity from hybrid " + std::to_string(param_index) + " to " +
std::to_string(value))
.c_str());
vmm_stat = this->pVmmAPI->setHybPolarity(param_index, value); vmm_stat = this->pVmmAPI->setHybPolarity(param_index, value);
goto endOfWriteInt32; goto endOfWriteInt32;
} }
param_index = VecUtils::getIndex(vmmADCIDX_, function, hyb_index, vmm_index); param_index = VecUtils::getIndex(vmmADCIDX_, function, hyb_index, vmm_index);
if (param_index == 0) { if (param_index == 0) {
setStringParam(IOCMessage, std::string( "Set ADC index of hybrid " + std::to_string(hyb_index) + ", vmm " + std::to_string(vmm_index) + " to " + std::to_string(value) ).c_str()); setStringParam(IOCMessage, std::string("Set ADC index of hybrid " + std::to_string(hyb_index) + ", vmm " +
std::to_string(vmm_index) + " to " + std::to_string(value))
.c_str());
vmm_stat = this->pVmmAPI->setADCIdx(hyb_index, vmm_index, value); vmm_stat = this->pVmmAPI->setADCIdx(hyb_index, vmm_index, value);
goto endOfWriteInt32; goto endOfWriteInt32;
} }
endOfWriteInt32: endOfWriteInt32:
if (param_index < 0) { if (param_index < 0) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to find parameter %s, index: %d.\n", driverName, __FUNCTION__, asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to find parameter %s, index: %d.\n", driverName,
paramName, function); __FUNCTION__, paramName, function);
std::string message = "Failed to find parameter: " + std::to_string(*paramName); std::string message = "Failed to find parameter: " + std::to_string(*paramName);
setStringParam(IOCMessage, message.c_str()); setStringParam(IOCMessage, message.c_str());
status = asynError; status = asynError;
} }
if (vmm_stat != vmmSuccess) { if (vmm_stat != vmmSuccess) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to write to parameter %s, index: %d.\n", driverName, __FUNCTION__, asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to write to parameter %s, index: %d.\n", driverName,
paramName, function); __FUNCTION__, paramName, function);
std::string message = "Failed to write to parameter: " + std::to_string(*paramName); std::string message = "Failed to write to parameter: " + std::to_string(*paramName);
setStringParam(IOCMessage, message.c_str()); setStringParam(IOCMessage, message.c_str());
status = asynError; status = asynError;
...@@ -597,10 +606,10 @@ endOfReadInt8Array: ...@@ -597,10 +606,10 @@ endOfReadInt8Array:
setStringParam(IOCMessage, message.c_str()); setStringParam(IOCMessage, message.c_str());
*nIn = 0; *nIn = 0;
return asynError; return asynError;
} }
*nIn = nElements; *nIn = nElements;
status |= (int)doCallbacksInt8Array(value, nElements, function, 0); status |= (int)doCallbacksInt8Array(value, nElements, function, 0);
if (status) { if (status) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to get paramter %s, index %d.\n", driverName, asynPrint(pasynUserSelf, ASYN_TRACE_ERROR, "%s:%s: Failed to get paramter %s, index %d.\n", driverName,
......
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