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

Fix issue 550 (#554) 

* Fix issue #550: a) fixed acscommendcenter procedure for the system boot up. b) changed the target IP for TotalPower backend

* fix issue #550: c) Dimed configuration. d) seupup procedures to include dmed e) Kband receiver configuration f) Local Oscillator configuration g) system makefile

* fix issue #550: f) Medicina pointing model now up to date. g) receivers configuration updated to reflect present status

* fix issue #550: matching commetn in PR
parent 7d6257ec
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 101 additions and 77 deletions
Common/Libraries/DiscosVersion/include/DiscosVersion.h
+ 2
− 0
View file @ 4da6a1a7
......@@ -30,6 +30,7 @@
#define _CURRENT_VERSION_MAJOR 1
#define _CURRENT_VERSION_MINOR 0
#define _CURRENT_VERSION_REVISION 6
#define _CURRENT_PRODUCT "DISCOS"
......@@ -39,6 +40,7 @@ class CurrentVersion {
public:
static WORD major;
static WORD minor;
static WORD revision;
static IRA::CString station;
static IRA::CString product;
static IRA::CString getVersion();
......
Common/Libraries/DiscosVersion/src/DiscosVersion.cpp
+ 3
− 1
View file @ 4da6a1a7
......@@ -6,7 +6,8 @@ using namespace DiscosVersion;
IRA::CString CurrentVersion::getVersion()
{
IRA::CString value;
value.Format("%s-%d.%d.%s",(const char *)CurrentVersion::product,CurrentVersion::major,CurrentVersion::minor,(const char *)CurrentVersion::station);
value.Format("%s-%d.%d.%d.%s",(const char *)CurrentVersion::product,CurrentVersion::major,
CurrentVersion::minor,CurrentVersion::revision,(const char *)CurrentVersion::station);
return value;
}
......@@ -14,6 +15,7 @@ IRA::CString CurrentVersion::product = IRA::CString(_CURRENT_PRODUCT);
IRA::CString CurrentVersion::station = IRA::CString(_STATION);
WORD CurrentVersion::minor = _CURRENT_VERSION_MINOR;
WORD CurrentVersion::major = _CURRENT_VERSION_MAJOR;
WORD CurrentVersion::revision = _CURRENT_VERSION_REVISION;
Common/Servers/ReceiversBoss/include/RecvBossCore.h
+ 2
− 2
View file @ 4da6a1a7
......@@ -416,8 +416,8 @@ private:
#ifdef COMPILE_TARGET_MED
void setup(const char * code) throw(ComponentErrors::SocketErrorExImpl,ComponentErrors::ValidationErrorExImpl);
bool sendToRecvControl(const void *buffer,unsigned size);
bool sendToFS(const void *buffer,unsigned size);
bool sendToRecvControl(const void *buffer,int size);
bool sendToFS(const void *buffer,int size);
#elif COMPILE_TARGET_NT
void setup(const char * code) throw(ComponentErrors::SocketErrorExImpl,ComponentErrors::ValidationErrorExImpl);
......
Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i
+ 21
− 11
View file @ 4da6a1a7
//#define RB_DEBUG
#define RECV_ADDRESS "192.167.189.2"
#define RECV_ADDRESS "192.168.51.2"
#define RECV_PORT 2096
#define FS_ADDRESS "192.167.189.62"
#define FS_ADDRESS "192.168.51.14"
#define FS_PORT 5002
#define SXKL_ADDRESS "192.167.189.2"
#define SXKL_ADDRESS "192.168.51.2"
#define SXKL_PORT 9876
......@@ -109,7 +109,7 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon
}
else if (m_currentRecvCode=="XXP") {
// turn the marca on through the FS
IRA::CString fsBuffer("sxkl=*,on\n");
IRA::CString fsBuffer("calon\n");
if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOn()");
m_status=Management::MNG_FAILURE;
......@@ -173,7 +173,7 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo
}
else if (m_currentRecvCode=="XXP") {
// turn the marca on through thr FS
IRA::CString fsBuffer("sxkl=*,off\n");
IRA::CString fsBuffer("caloff\n");
if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOff()");
m_status=Management::MNG_FAILURE;
......@@ -334,6 +334,13 @@ void CRecvBossCore::setup(const char * code) throw (ComponentErrors::SocketError
m_currentRecvError=true;
throw impl;
}
// now set the subreflector configuration through the FS
IRA::CString fsBuffer("scu=kkc\n");
if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::setup()");
m_status=Management::MNG_FAILURE;
throw impl;
}
changeBossStatus(Management::MNG_OK);
m_currentRecvCode="KKC";
......@@ -1322,29 +1329,32 @@ void CRecvBossCore::publishData() throw (ComponentErrors::NotificationChannelErr
}
}
bool CRecvBossCore::sendToRecvControl(const void *buffer,unsigned size)
bool CRecvBossCore::sendToRecvControl(const void *buffer,int size)
{
IRA::CSocket sock;
IRA::CError err;
char readout[128];
IRA::CString recvIpAddr(RECV_ADDRESS);
DWORD recvPort=RECV_PORT;
int count;
try {
if (sock.Create(err,IRA::CSocket::STREAM)!=IRA::CSocket::SUCCESS) {
return false;
}
if (sock.setSockMode(err,IRA::CSocket::NONBLOCKING)==IRA::CSocket::FAIL) {
/*if (sock.setSockMode(err,IRA::CSocket::NONBLOCKING)==IRA::CSocket::FAIL) {
return false;
}
}*/
if (sock.Connect(err,recvIpAddr,recvPort)==IRA::CSocket::FAIL) {
return false;
}
if (sock.Send(err,buffer,size)!=(int)size) {
return false;
}
if (sock.Receive(err,(void *)readout,128)==IRA::CSocket::FAIL) {
count=sock.Receive(err,(void *)readout,128);
if (count==IRA::CSocket::FAIL) {
return false;
}
readout[count]=0;
if (strcmp(readout,"ACK\n")!=0) {
return false;
}
......@@ -1356,7 +1366,7 @@ bool CRecvBossCore::sendToRecvControl(const void *buffer,unsigned size)
return true;
}
bool CRecvBossCore::sendToFS(const void *buffer,unsigned size)
bool CRecvBossCore::sendToFS(const void *buffer,int size)
{
IRA::CSocket sock;
IRA::CError err;
......
Medicina/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml
+ 1
− 1
View file @ 4da6a1a7
......@@ -18,7 +18,7 @@
RepetitionCacheTime="2000000"
RepetitionExpireTime="5000000"
DataPort="6001"
DataIPAddress="192.168.51.104"
DataIPAddress="192.168.51.100"
DataLatency="3000000"
SenderSleepTime="300000"
SenderResponseTime="1000000"
......
Medicina/Configuration/CDB/alma/DataBlock/DMed/DMed.xml
+ 21
− 22
View file @ 4da6a1a7
......@@ -7,61 +7,60 @@
IP="192.168.51.28"
PORT="5003">
<Configuration name="sole">
<Configuration name="default">
<Board number="6">
<Attenuator ID="0" Value="10.0"/>
<Attenuator ID="0" Value="0.0"/>
<Attenuator ID="1" Value="7.0"/>
<Attenuator ID="2" Value="0.0"/>
<Attenuator ID="3" Value="10.0"/>
</Board>
<Board number="8">
<Attenuator ID="0" Value="26.0"/>
<Attenuator ID="1" Value="10.0"/>
<Attenuator ID="2" Value="29.0"/>
<Attenuator ID="0" Value="0.0"/>
<Attenuator ID="1" Value="8.0"/>
<Attenuator ID="2" Value="0.0"/>
<Attenuator ID="3" Value="10.0"/>
</Board>
<Board number="9">
<Attenuator ID="0" Value="15.0"/>
<Attenuator ID="0" Value="13.0"/>
<Attenuator ID="1" Value="10.0"/>
<Attenuator ID="2" Value="13.0"/>
<Attenuator ID="2" Value="16.0"/>
<Attenuator ID="3" Value="10.0"/>
</Board>
<Board number="10">
<Attenuator ID="0" Value="23.0"/>
<Attenuator ID="0" Value="16.0"/>
<Attenuator ID="1" Value="10.0"/>
<Attenuator ID="2" Value="22.0"/>
<Attenuator ID="2" Value="14.0"/>
<Attenuator ID="3" Value="10.0"/>
</Board>
</Configuration>
<Configuration name="KKC">
<Configuration name="sun">
<Board number="6">
<Attenuator ID="0" Value="10.0"/>
<Attenuator ID="1" Value="10.0"/>
<Attenuator ID="2" Value="10.0"/>
<Attenuator ID="0" Value="0.0"/>
<Attenuator ID="1" Value="7.0"/>
<Attenuator ID="2" Value="0.0"/>
<Attenuator ID="3" Value="10.0"/>
</Board>
<Board number="8">
<Attenuator ID="0" Value="10.0"/>
<Attenuator ID="1" Value="10.0"/>
<Attenuator ID="2" Value="10.0"/>
<Attenuator ID="0" Value="0.0"/>
<Attenuator ID="1" Value="8.0"/>
<Attenuator ID="2" Value="0.0"/>
<Attenuator ID="3" Value="10.0"/>
</Board>
<Board number="9">
<Attenuator ID="0" Value="10.0"/>
<Attenuator ID="0" Value="15.0"/>
<Attenuator ID="1" Value="10.0"/>
<Attenuator ID="2" Value="10.0"/>
<Attenuator ID="3" Value="10.0"/>
<Attenuator ID="2" Value="13.0"/>
<Attenuator ID="3" Value="15.0"/>
</Board>
<Board number="10">
<Attenuator ID="0" Value="10.0"/>
<Attenuator ID="0" Value="23.0"/>
<Attenuator ID="1" Value="10.0"/>
<Attenuator ID="2" Value="10.0"/>
<Attenuator ID="2" Value="26.0"/>
<Attenuator ID="3" Value="10.0"/>
</Board>
</Configuration>
</DMedConfiguration>
\ No newline at end of file
Medicina/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml
+ 17
− 17
View file @ 4da6a1a7
......@@ -51,7 +51,7 @@
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> 0.0115609653 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0054083583 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0004475396 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.104534819 </coefficientVal06>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.120534819 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> -0.0848363936 </coefficientVal07>
<coefficientNum08> 1 </coefficientNum08> <coefficientVal08> 0.0015757678 </coefficientVal08>
<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0 </coefficientVal09>
......@@ -80,15 +80,15 @@
<Receiver>
<receiverCode>KKC</receiverCode>
<phi>90.0</phi>
<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> 0.1480138302 </coefficientVal00>
<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> 0.1510259807 </coefficientVal00>
<coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0 </coefficientVal01>
<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> 0.2130497247 </coefficientVal02>
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0194589850 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0056039123 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0000484679 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0850518122 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.0324320570 </coefficientVal07>
<coefficientNum08> 1 </coefficientNum08> <coefficientVal08> 0.0265751500 </coefficientVal08>
<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> 0.2146179527 </coefficientVal02>
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0199117530 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0069123046 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0001305724 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1411607116 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.0013927888 </coefficientVal07>
<coefficientNum08> 1 </coefficientNum08> <coefficientVal08> 0.0038510617 </coefficientVal08>
<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0 </coefficientVal09>
<coefficientNum10> 0 </coefficientNum10> <coefficientVal10> 0 </coefficientVal10>
<coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0 </coefficientVal11>
......@@ -124,7 +124,7 @@ Model XXP conf, id: 25
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0220953003 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0062009227 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0022671977 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1425688490 </coefficientVal06>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1650 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> -0.1203563809 </coefficientVal07>
<coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0 </coefficientVal08>
<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0 </coefficientVal09>
......@@ -153,14 +153,14 @@ Model XXP conf, id: 25
<Receiver>
<receiverCode>CHC</receiverCode>
<phi>90.0</phi>
<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -0.1115463972 </coefficientVal00>
<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -0.0961716101 </coefficientVal00>
<coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0 </coefficientVal01>
<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0019724572 </coefficientVal02>
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> 0.0094164684 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0060918964 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0016364682 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0940798447 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> -0.0872315466 </coefficientVal07>
<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> 0.0067673814 </coefficientVal02>
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> 0.0238296818 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0069099185 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0010922987 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1375056628 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> -0.0890021995 </coefficientVal07>
<coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0 </coefficientVal08>
<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0 </coefficientVal09>
<coefficientNum10> 0 </coefficientNum10> <coefficientVal10> 0 </coefficientVal10>
......
Medicina/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+ 6
− 0
View file @ 4da6a1a7
......@@ -9,6 +9,7 @@
receiversSetup=CCC
chooseBackend=TotalPower
initialize=CCC
dmed=default
setSection=0,*,730.0,*,*,*,*
setSection=1,*,730.0,*,*,*,*
device=0
......@@ -23,6 +24,7 @@
receiversSetup=CHC
chooseBackend=TotalPower
initialize=CHC
dmed=default
setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,*
setAttenuation=0,8
......@@ -39,6 +41,7 @@
receiversSetup=KKC
chooseBackend=TotalPower
initialize=KKC
dmed=default
device=0
setAttenuation=0,9
setAttenuation=1,9
......@@ -55,6 +58,7 @@
receiversSetup=XXP
chooseBackend=TotalPower
initialize=XXP
dmed=default
setSection=0,*,730.0,*,*,*,*
setSection=1,*,730.0,*,*,*,*
device=0
......@@ -70,6 +74,7 @@
receiversMode=NARROWBANDWIDTH
chooseBackend=TotalPower
initialize=CCCL
dmed=default
setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,*
setAttenuation=0,8
......@@ -87,6 +92,7 @@
receiversMode=NARROWBANDWIDTH
chooseBackend=TotalPower
initialize=CHCL
dmed=default
setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,*
setAttenuation=0,8
......
Medicina/Configuration/CDB/alma/RECEIVERS/KBandDualFReceiver/KBandDualFReceiver.xml
+ 3
− 7
View file @ 4da6a1a7
<?xml version='1.0' encoding='ISO-8859-1'?>
<!--
* Authors Info
* ===========
* Name: Marco Buttu
* E-mail: mbuttu@oa-cagliari.inaf.it
* Personal Web: http://www.pypeople.com/
-->
<!-- *DewarPort="10000" -->
<!-- LNAPort="10001" -->
......@@ -17,9 +13,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
actionThreadStackSize="2048"
monitoringThreadStackSize="4096"
DewarIPAddress="192.167.189.2"
DewarIPAddress="192.168.51.2"
DewarPort="10000"
LNAIPAddress="192.167.189.2"
LNAIPAddress="192.168.51.2"
LNAPort="10001"
WatchDogResponseTime="10000000"
WatchDogSleepTime="10000000"
......
Medicina/Configuration/CDB/alma/RECEIVERS/LO/LO.xml
+ 1
− 1
View file @ 4da6a1a7
......@@ -2,7 +2,7 @@
xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
IP="192.167.189.2" PORT="2096">
IP="192.168.51.2" PORT="2096">
<frequency units="MHz"/>
......
Medicina/Misc/MedScripts/app-defaults/discosStartup.xml
+ 22
− 13
View file @ 4da6a1a7
......@@ -26,7 +26,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>WeatherStationContainer</name>
......@@ -35,7 +35,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>MountContainer</name>
......@@ -44,7 +44,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>AntennaContainer</name>
......@@ -53,7 +53,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>ReceiversContainer</name>
......@@ -62,7 +62,16 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>LocalOscillatorContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>KBandContainer</name>
......@@ -71,7 +80,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>TotalPowerContainer</name>
......@@ -80,7 +89,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>ManagementContainer</name>
......@@ -89,7 +98,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>FitsZillaContainer</name>
......@@ -98,7 +107,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>CalibrationToolContainer</name>
......@@ -107,7 +116,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>PointContainer</name>
......@@ -116,7 +125,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>ExternalClientsContainer</name>
......@@ -125,7 +134,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>XContainer</name>
......@@ -134,7 +143,7 @@
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount></remoteAccount>
<remoteAccount>discos</remoteAccount>
</container>
</containers>
</AcsCommandCenterProject>
Medicina/Misc/MedScripts/src/discosConsole
+ 1
− 1
View file @ 4da6a1a7
......@@ -83,7 +83,7 @@ if [ "$CL_STOP" ] ; then
killall -s SIGUSR1 -u $USER -q _tui_ReceiversBossTextClient
killall -s SIGUSR1 -u $USER -q _tui_SchedulerTextClient
#close the operator input
pkill -SIGINT -f -n -u $USER _tui_SysTerm
pkill -SIGINT -u $USER -f _tui_SysTerm
#close the logging display client
pkill -SIGUSR1 -f -n -u $USER _gui_customLoggingClient
exit
......
SystemMake/Makefile
+ 1
− 1
View file @ 4da6a1a7
......@@ -120,7 +120,7 @@ ifeq ($(STATION),Medicina)
SlaLibrary IRALibrary TextWindowLibrary ParserLibrary ComponentProxy ModbusChannel XarcosLibrary \
PyTestingLibrary \
AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \
TotalPower NoiseGenerator MedicinaMount MedWeatherStation CustomLogger XBackend MedicinaMinorServo\
TotalPower NoiseGenerator MedicinaMount MedicinaPyLocalOscillator MedicinaPyDMed CustomLogger XBackend MedicinaMinorServo\
AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal CaltoolClient SchedulerTextClient MinorServoBossTextClient\
MedicinaMountTextClient CustomLoggingClient\
Plotter KStars Scripts MedScripts
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment