From 9796f3db2380a5f4a6a0e6581870d809662b58b4 Mon Sep 17 00:00:00 2001
From: Andrea Orlati <aorlati@users.noreply.github.com>
Date: Tue, 24 May 2022 16:45:42 +0200
Subject: [PATCH] fix issue #716: the noise diode is now fired by calmux also
for CHC and CC receivers in Medicina. Also some small fixes (#717)
to disable, for the moment, subreflector control.
---
Common/Servers/ReceiversBoss/include/RecvBossCore.h | 2 +-
Common/Servers/ReceiversBoss/src/Makefile | 4 +++-
Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i | 12 ++++++------
.../MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml | 2 +-
.../MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml | 2 +-
.../MANAGEMENT/CalibrationTool/CalibrationTool.xml | 2 +-
.../StationProcedures/StationProcedures.xml | 7 -------
Medicina/Misc/MedScripts/src/discosConsole | 4 ++--
8 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/Common/Servers/ReceiversBoss/include/RecvBossCore.h b/Common/Servers/ReceiversBoss/include/RecvBossCore.h
index cd613ff69..7a374a862 100644
--- a/Common/Servers/ReceiversBoss/include/RecvBossCore.h
+++ b/Common/Servers/ReceiversBoss/include/RecvBossCore.h
@@ -351,7 +351,7 @@ private:
ACS::Time m_feedsEpoch;
ACS::Time m_IFsEpoch;
ACS::Time m_modeEpoch;
- Backends::CalMux_proxy m_xalMux_proxy;
+ Backends::CalMux_proxy m_calMux_proxy;
#elif COMPILE_TARGET_NT
diff --git a/Common/Servers/ReceiversBoss/src/Makefile b/Common/Servers/ReceiversBoss/src/Makefile
index bd7e2ebea..b91b23df2 100644
--- a/Common/Servers/ReceiversBoss/src/Makefile
+++ b/Common/Servers/ReceiversBoss/src/Makefile
@@ -59,7 +59,9 @@ ifeq ($(STATION),Noto)
bulkDataCallback bulkDataSenderStubs DiscosVersion
else
ReceiversBossImpl_LIBS = IRALibrary ComponentErrors CommonReceiverInterfaceStubs ReceiversBossStubs ReceiversDefinitionsStubs AntennaDefinitionsStubs GenericReceiverStubs \
- DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc DiscosVersion
+ DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc DiscosVersion \
+ CalDiodeControllerStubs CalMuxStubs
+
endif
#
diff --git a/Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i b/Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i
index 773bc67cb..87375a69c 100644
--- a/Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i
+++ b/Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i
@@ -101,15 +101,15 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon
throw impl;
}
}
- else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")){
+/* else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")){
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") {
+ }*/
+ else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {
m_calMux_proxy->calOn();
// turn the marca on through the FS
/*IRA::CString fsBuffer("calon\n");
@@ -166,15 +166,15 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo
throw impl;
}
}
- else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {
+ /*else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {
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") {
+ }*/
+ else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {
// turn the marca on through thr FS
/*IRA::CString fsBuffer("caloff\n");
if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
diff --git a/Medicina/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml b/Medicina/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml
index 465837987..1b341ec13 100644
--- a/Medicina/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml
+++ b/Medicina/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml
@@ -15,5 +15,5 @@
Container="PyCalmuxContainer"
ImplLang="py"
KeepAliveTime="-1"
- Default="false"
+ Default="true"
/>
diff --git a/Medicina/Configuration/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml b/Medicina/Configuration/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml
index 465837987..1b341ec13 100644
--- a/Medicina/Configuration/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml
@@ -15,5 +15,5 @@
Container="PyCalmuxContainer"
ImplLang="py"
KeepAliveTime="-1"
- Default="false"
+ Default="true"
/>
diff --git a/Medicina/Configuration/CDB/alma/MANAGEMENT/CalibrationTool/CalibrationTool.xml b/Medicina/Configuration/CDB/alma/MANAGEMENT/CalibrationTool/CalibrationTool.xml
index da13864d7..468e979ea 100644
--- a/Medicina/Configuration/CDB/alma/MANAGEMENT/CalibrationTool/CalibrationTool.xml
+++ b/Medicina/Configuration/CDB/alma/MANAGEMENT/CalibrationTool/CalibrationTool.xml
@@ -15,7 +15,7 @@
RepetitionExpireTime="10000000"
TrackingFlagDutyCycle="100000"
AntennaBossInterface="IDL:alma/Antenna/AntennaBoss:1.0"
- MinorServoBossInterface="IDL:alma/MinorServo/MinorServoBoss:1.0"
+ MinorServoBossInterface=""
SchedulerInterface="IDL:alma/Management/Scheduler:1.0"
ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0"
GenerateFile="1"
diff --git a/Medicina/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/Medicina/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
index c449277cc..6d7556e25 100644
--- a/Medicina/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+++ b/Medicina/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
@@ -7,7 +7,6 @@
<body>
antennaSetup=CCC
receiversSetup=CCC
- servoSetup=CCC
chooseBackend=TotalPower
initialize=CCC
dmed=default
@@ -24,7 +23,6 @@
<body>
antennaSetup=CHC
receiversSetup=CHC
- servoSetup=CHC
chooseBackend=TotalPower
initialize=CHC
dmed=default
@@ -43,7 +41,6 @@
<body>
antennaSetup=KKC
receiversSetup=KKC
- servoSetup=KKC
chooseBackend=TotalPower
initialize=KKC
dmed=default
@@ -62,7 +59,6 @@
<body>
antennaSetup=XXP
receiversSetup=XXP
- servoSetup=XXP
chooseBackend=TotalPower
initialize=XXP
dmed=default
@@ -79,7 +75,6 @@
<body>
antennaSetup=CCC
receiversSetup=CCC
- servoSetup=CCC
receiversMode=NARROWBANDWIDTH
chooseBackend=TotalPower
initialize=CCCL
@@ -99,7 +94,6 @@
<body>
antennaSetup=CHC
receiversSetup=CHC
- servoSetup=CHC
receiversMode=NARROWBANDWIDTH
chooseBackend=TotalPower
initialize=CHCL
@@ -121,7 +115,6 @@
receiversPark
waitOnSource
antennaPark
- servoPark
</body>
</Procedure>
diff --git a/Medicina/Misc/MedScripts/src/discosConsole b/Medicina/Misc/MedScripts/src/discosConsole
index ae9fd6e74..f43c5547a 100644
--- a/Medicina/Misc/MedScripts/src/discosConsole
+++ b/Medicina/Misc/MedScripts/src/discosConsole
@@ -82,7 +82,7 @@ if [ "$CL_STOP" ] ; then
killall -s SIGUSR1 -u $USER -q _tui_GenericBackendTextClient
killall -s SIGUSR1 -u $USER -q _tui_ReceiversBossTextClient
killall -s SIGUSR1 -u $USER -q _tui_SchedulerTextClient
- killall -s SIGUSR1 -u $USER -q _tui_MinorServoBossTextClient
+ #killall -s SIGUSR1 -u $USER -q _tui_MinorServoBossTextClient
#close the operator input
pkill -SIGUSR1 -u $USER -f _tui_SysTerm
@@ -109,6 +109,6 @@ receiversBossTui
sleep 0.5s
loggingDisplay
sleep 0.5s
-minorservoBossTui
+#minorservoBossTui
#
# ___oOo___
--
GitLab