Skip to content
Snippets Groups Projects
Commit 64a02762 authored by System User's avatar System User
Browse files

Correcting on_fault method name, and removing unnecessary _ASL_TRY

parent 887b082e
No related branches found
No related tags found
1 merge request!1[ICATHALES-6] - Device do not start when driver not availible
......@@ -179,7 +179,7 @@ void ContinuousAO::init_device()
//- check memory allocation
if (ao == 0)
{
raise_error("ContinuousAO::init_device\nout of memory error while initializing ADLinkContinuousAO");
on_fault("ContinuousAO::init_device\nout of memory error while initializing ADLinkContinuousAO");
return;
}
......@@ -194,7 +194,7 @@ void ContinuousAO::init_device()
ch7 = new double[bufferDepth];
if(ch0 == 0 || ch1 == 0 || ch2 == 0 || ch3 == 0 || ch4 == 0 || ch5 == 0 ||ch6 == 0 || ch7 == 0)
{
raise_error("ContinuousAO::init_device\nout of memory error while initializing channel's datas");
on_fault("ContinuousAO::init_device\nout of memory error while initializing channel's datas");
return;
}
......@@ -531,29 +531,21 @@ void ContinuousAO::init_device()
DEBUG_STREAM<<"ContinuousAO::init_device : init acq"<<std::endl;
try{
_ASL_TRY(
ao->init(adl::DAQ2502, boardNum),
"init",
"ContinuousAO::init_device"
);
ao->init(adl::DAQ2502, boardNum);
DEBUG_STREAM<<"ContinuousAO::init_device : config acq"<<std::endl;
try{
_ASL_TRY(
ao->configure(config),
"configure",
"ContinuousAO::init_device"
);
ao->configure(config);
}
catch (...)
{
raise_error("ContinuousAO::init_device\nError while configuring driver");
on_fault("ContinuousAO::init_device\nError while configuring driver");
return;
}
}
catch (...)
{
raise_error("ContinuousAO::init_device\nError while initializing the driver");
on_fault("ContinuousAO::init_device\nError while initializing the driver");
return;
}
......@@ -1458,7 +1450,7 @@ void ContinuousAO::save_waveform(double* waveform, string wfm_channel)
);
}
void ContinuousAO::raise_error(std::string p_error_message)
void ContinuousAO::on_fault(std::string p_error_message)
{
m_error_message = p_error_message;
set_state(Tango::FAULT);
......
......@@ -326,7 +326,7 @@ public :
ADLinkContinuousAO* ao;
// asl::ContinuousAOConfig* config;
void set_internal_state(void);
void raise_error(std::string p_error_message);
void on_fault(std::string p_error_message);
// save a channel waveform in the database
void ContinuousAO::save_waveform(double* waveform, string wfm_channel);
double* ch0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment