Skip to content
Snippets Groups Projects

Refactoring of ContinuousAO code : Communalisation of copy/pasted portions of code

2 files
+ 8
16
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 7
15
@@ -200,7 +200,7 @@ namespace ContinuousAO
//- check memory allocation
if (m_ao == nullptr)
{
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;
}
@@ -211,7 +211,7 @@ namespace ContinuousAO
m_channel[i] = new double[bufferDepth];
if(m_channel[i] == nullptr)
{
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;
}
}
@@ -303,29 +303,21 @@ namespace ContinuousAO
DEBUG_STREAM<<"ContinuousAO::init_device : init acq"<<std::endl;
try{
_ASL_TRY(
m_ao->init(adl::DAQ2502, boardNum),
"init",
"ContinuousAO::init_device"
);
m_ao->init(adl::DAQ2502, boardNum);
DEBUG_STREAM<<"ContinuousAO::init_device : config acq"<<std::endl;
try{
_ASL_TRY(
m_ao->configure(config),
"configure",
"ContinuousAO::init_device"
);
m_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;
}
@@ -1184,7 +1176,7 @@ namespace ContinuousAO
);
}
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);
Loading