Commit cce30bda authored by Andrea Orlat's avatar Andrea Orlat
Browse files

reviewd configuration for Noto, implementation for NotoReceievers component

parent 173dcd4b

Common/Simulators/Hardware/TCPGenericProtocolSim/src/TCPGenericProtocolSimImpl/TCPServer.py

+17 −12
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ stop_server = Value('i', False) 


class TCPServer:

   

	def __init__(self, cmd, answ, defAnsw):

	def __init__(self, cmd, answ, defAnsw, term, port):

		"""

		Initialize
@@ -55,19 +55,20 @@ class TCPServer: 
		"""



		self.host = socket.gethostbyname(socket.gethostname())

		self.port = 15001

		self.command=cmd

		self.answer=answ

		self.defaultAnswer=defAnsw

		self.simPort=port

		self.terminator=term

		self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

		self.s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)



	def run(self):

		self.s.bind((self.host, self.port))

		self.s.bind((self.host, self.simPort))

		self.s.listen(1)

		

		print "*"*40

		print "TCPServer - Waiting for connections from %s port %d..." % (self.host,self.port)

		print "TCPServer - Waiting for connections from %s port %d..." % (self.host,self.simPort)

		print "Valid commands are: %s" % (self.command)

		print "*"*40

		error=False
@@ -93,15 +94,19 @@ class TCPServer: 
					stop_server.value = True

					connection.close()

					break

				if(data):

				answer=self.defaultAnswer

					if len(data)> 1:

						strcmp=data.strip()

						print "Received: %s" % (strcmp)

				if(data):

					#print "Received: %s" % data

					if self.terminator!=32:

						termPos=data.find(chr(self.terminator))

						if termPos>0:

							strcmp=data[:termPos]

							if strcmp in self.command:

								index=self.command.index(strcmp)

								answer=self.answer[index]

					print "Sending message: %s" % (answer)

						else:

							pass

					#print "Sending message: %s" % (answer)

					connection.send(answer)			

		except KeyboardInterrupt:

			raise

Common/Simulators/Hardware/TCPGenericProtocolSim/src/tcpProt-sim

+6 −4
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ from TCPGenericProtocolSimImpl.TCPServer import TCPServer 


parser = argparse.ArgumentParser(description="Start/Stop the TCP server")

parser.add_argument('action', choices=['start', 'stop'])

parser.add_argument('--cmd', action='append',dest='commands',default=[],help='Add repeated commands')

parser.add_argument('--ans', action='append',dest='answers',default=[],help='Add repeated answers')

parser.add_argument('--def', dest='defVal',default='',help='default answer')

parser.add_argument('--command', action='append',dest='commands',default=[],help='Add repeated commands')

parser.add_argument('--answer', action='append',dest='answers',default=[],help='Add repeated answers')

parser.add_argument('--default', dest='defVal',default='',help='default answer')

parser.add_argument('--port', dest='port',default='15000',help='simulator IP port')

parser.add_argument('--terminator',dest='terminator',default=32,help='protocol terminator, use ascii code')





args = parser.parse_args()
@@ -23,7 +25,7 @@ if __name__ == "__main__": 
	if args.action == 'start':

		signal.signal(signal.SIGINT,handle_signal)     

		signal.signal(signal.SIGUSR1,handle_signal) 

		server = TCPServer(args.commands,args.answers,args.defVal)

		server = TCPServer(args.commands,args.answers,args.defVal,int(args.terminator),int(args.port))

		server.run()

        

	elif args.action == 'stop':

Noto/CDB/alma/ANTENNA/Mount/Mount.xml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,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"

               IPAddress="192.168.51.5"

               IPAddress="192.167.187.231"

               Port="8102"

               ConnectTimeout="6000000"

               ReceiveTimeout="3000000"

Noto/CDB/alma/BACKENDS/Holography/DXC2/DXC2.xml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

     Author: Marco Buttu, mbuttu@oa-cagliari.inaf.it

     Last Modified: Mon Sep 21 11:48:50 CEST 2009

-->

<DigitalXCorrelator

    xmlns="urn:schemas-cosylab-com:DigitalXCorrelator:1.0" 

    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"

    PORT="0"

    OUT_FILE_FP="/home/spoppi/out_file"

    MAX_ATTEMPTS="3"

    BAUDRATE="115200">

</DigitalXCorrelator>

Noto/CDB/alma/BACKENDS/Holography/Holography.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

    - History:

    -   Fri Mar  7  10:00:99  UTC 2008 modified by Sergio Poppi

   -   Thu Aug 19 16:10:36 UTC 2010 modified by jDAL

   -   Thu Sep 09 09:53:50 UTC 2010 modified by jDAL

   -   Thu Sep 09 17:20:54 UTC 2010 modified by jDAL

   -   Tue Sep 21 18:24:43 UTC 2010 modified by jDAL

   -   Tue Sep 21 18:33:56 UTC 2010 modified by jDAL

   -   Wed Sep 22 21:45:12 UTC 2010 modified by jDAL

   -   Wed Sep 22 21:46:18 UTC 2010 modified by jDAL

-->

<Holography xmlns="urn:schemas-cosylab-com:Holography:1.0" 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" SamplingTime="100" LogObservedPositions="1">

	<time />

	<backendName />

	<bandWidth />

	<frequency />

	<sampleRate />

	<attenuation />

	<polarization />

	<bins />

	<inputsNumber />

	<integration />

	<status />

	<busy />

	<feed />

	<systemTemperature />

	<sectionsNumber />

</Holography>