Skip to content
Snippets Groups Projects
Commit 7e827dd1 authored by Sonia Minolli's avatar Sonia Minolli
Browse files

Integration tests III (with delays) - tested ok

parent c73c5271
No related branches found
No related tags found
No related merge requests found
......@@ -166,7 +166,6 @@ void HardwareInterface::open_com()
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
m_state = Tango::STANDBY;
m_status = "Device is up and ready";
......@@ -439,7 +438,6 @@ void HardwareInterface::set_grating_label(yat::uint16 gratNb, std::string gratLa
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
}
//=============================================================================
......@@ -553,22 +551,6 @@ void HardwareInterface::set_grating_nb_i(yat::uint16 gratNb)
_CPTC("HardwareInterface::set_grating_nb_i"));
}
/* soso A TESTER : pas de check, wait d'abord...
// check hardware error
std::string l_err_msg;
if (check_error(l_err_msg))
{
THROW_DEVFAILED(
_CPTC("DEVICE_ERROR"),
l_err_msg.c_str(),
_CPTC("HardwareInterface::set_grating_nb_i"));
}
// wait a little to let hardware execute the previous command
//usleep(m_read_delay * 1000); // in s
Sleep(m_read_delay); // in ms
*/
// set MOVING state
m_state = Tango::MOVING;
m_status = "Grating change in progress...";
......@@ -704,7 +686,6 @@ void HardwareInterface::set_filter_label(yat::uint16 filterNb, std::string filte
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
}
//=============================================================================
......@@ -817,22 +798,6 @@ void HardwareInterface::set_filter_nb_i(yat::uint16 filterNb)
_CPTC("HardwareInterface::set_filter_nb_i"));
}
/* soso A TESTER : pas de check, wait d'abord...
// check hardware error
std::string l_err_msg;
if (check_error(l_err_msg))
{
THROW_DEVFAILED(
_CPTC("DEVICE_ERROR"),
l_err_msg.c_str(),
_CPTC("HardwareInterface::set_filter_nb_i"));
}
// wait a little to let hardware execute the previous command
//usleep(m_read_delay * 1000); // in s
Sleep(m_read_delay); // in ms
*/
// set MOVING state
m_state = Tango::MOVING;
m_status = "Filter change in progress...";
......@@ -895,7 +860,6 @@ void HardwareInterface::set_unit(std::string unit)
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
}
//=============================================================================
......@@ -949,22 +913,6 @@ void HardwareInterface::set_wavelength_i(double wave)
_CPTC("HardwareInterface::set_wavelength_i"));
}
/* soso A TESTER : pas de check, wait d'abord...
// check hardware error
std::string l_err_msg;
if (check_error(l_err_msg))
{
THROW_DEVFAILED(
_CPTC("DEVICE_ERROR"),
l_err_msg.c_str(),
_CPTC("HardwareInterface::set_wavelength_i"));
}
// wait a little to let hardware execute the previous command
//usleep(m_read_delay * 1000); // in s
Sleep(m_read_delay); // in ms
*/
// set MOVING state
m_state = Tango::MOVING;
m_status = "Wave length change in progress...";
......@@ -1180,7 +1128,6 @@ void HardwareInterface::set_shutter_state_i(E_shutter_state_t p_cmd)
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
}
//=============================================================================
......@@ -1232,21 +1179,8 @@ void HardwareInterface::abort_i()
if (m_timer_started)
m_timer_started = false;
/* soso A TESTER : pas de check, fait par le periodic job suivant...
// check hardware error
std::string l_err_msg;
if (check_error(l_err_msg))
{
THROW_DEVFAILED(
_CPTC("DEVICE_ERROR"),
l_err_msg.c_str(),
_CPTC("HardwareInterface::abort_i"));
}
*/
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
}
//=============================================================================
......@@ -1274,7 +1208,6 @@ bool HardwareInterface::check_error(std::string& err_msg)
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
//- read hardware state
DEBUG_STREAM << "Send state request on monochromator: " << kGET_STB << std::endl;
......@@ -1317,7 +1250,6 @@ bool HardwareInterface::check_error(std::string& err_msg)
// wait a little to let hardware execute the previous command
usleep(m_read_delay * 1000); // in s
//Sleep(m_read_delay); // in ms
//- state in error, read associated error message
l_str = kGET_ERROR;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment