Skip to content
Snippets Groups Projects
Unverified Commit a41fc32e authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

fix issue #699: calmux extended to control also noise diode for Kband recv. (#732)

parent 0239a966
Branches
Tags
No related merge requests found
...@@ -69,7 +69,7 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon ...@@ -69,7 +69,7 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon
{ {
//IRA::CError err; //IRA::CError err;
baci::ThreadSyncGuard guard(&m_mutex); baci::ThreadSyncGuard guard(&m_mutex);
if (m_currentRecvCode=="KKC") { /*if (m_currentRecvCode=="KKC") {
loadReceiver(); // ComponentErrors::CouldntGetComponentExImpl loadReceiver(); // ComponentErrors::CouldntGetComponentExImpl
try { try {
m_currentRecv->calOn(); m_currentRecv->calOn();
...@@ -101,15 +101,7 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon ...@@ -101,15 +101,7 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon
throw impl; throw impl;
} }
} }
/* else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")){ else */if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC")) {
char buffer [14] = {'s','e','t',' ','m','a','r','c','a','c',' ','o','n','\n' };
if (!sendToRecvControl((const void *)buffer,14)) {
_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOn()");
m_status=Management::MNG_FAILURE;
throw impl;
}
}*/
else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {
m_calMux_proxy->calOn(); m_calMux_proxy->calOn();
// turn the marca on through the FS // turn the marca on through the FS
/*IRA::CString fsBuffer("calon\n"); /*IRA::CString fsBuffer("calon\n");
...@@ -134,7 +126,7 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo ...@@ -134,7 +126,7 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo
{ {
//IRA::CError err; //IRA::CError err;
baci::ThreadSyncGuard guard(&m_mutex); baci::ThreadSyncGuard guard(&m_mutex);
if (m_currentRecvCode=="KKC") { /*if (m_currentRecvCode=="KKC") {
loadReceiver(); // ComponentErrors::CouldntGetComponentExImpl loadReceiver(); // ComponentErrors::CouldntGetComponentExImpl
try { try {
m_currentRecv->calOff(); m_currentRecv->calOff();
...@@ -166,15 +158,7 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo ...@@ -166,15 +158,7 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo
throw impl; throw impl;
} }
} }
/*else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) { else*/ if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC")) {
char buffer [15] = {'s','e','t',' ','m','a','r','c','a','c',' ','o','f','f','\n' };
if (!sendToRecvControl((const void *)buffer,15)) {
_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOff()");
m_status=Management::MNG_FAILURE;
throw impl;
}
}*/
else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {
// turn the marca on through thr FS // turn the marca on through thr FS
/*IRA::CString fsBuffer("caloff\n"); /*IRA::CString fsBuffer("caloff\n");
if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) { if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment