Commit 67a89127 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by aorlati
Browse files

Fix #188, fixed the cause of multiple cdbChecker warnings. (#191)

parent d885b80d

Common/Interfaces/BackendsInterface/config/CDB/schemas/GenericBackend.xsd

+7 −3
Original line number Diff line number Diff line
@@ -19,11 +19,15 @@ 
	<xs:import namespace="urn:schemas-cosylab-com:BACI:1.0" schemaLocation="BACI.xsd"/>

	

    <xs:complexType name="GenericBackendType">

     <xs:complexContent>

      <xs:extension base="baci:CharacteristicComponent">   

		<xs:sequence>

		</xs:sequence>

		<!-- this allows to specifiy the number of flows, the protocols, host and port number  -->

		<xs:attribute name="sender_protocols" type="xs:string" use="optional" 

            default="TCP=${HOST}:14000"/>

      </xs:extension>

     </xs:complexContent>   

	</xs:complexType>

	

</xs:schema>

Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillator.xsd

+6 −4
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ 
  <xs:import namespace="urn:schemas-cosylab-com:BACI:1.0" schemaLocation="BACI.xsd"/>



  <xs:complexType name="LocalOscillatorType">

   <xs:complexContent>

    <xs:extension base="baci:CharacteristicComponent">

      <xs:sequence>



	    <xs:element name="frequency" type="baci:ROdouble" />

	    <xs:element name="amplitude" type="baci:ROdouble" />

	    <xs:element name="isLocked" type="baci:ROdouble" />
@@ -19,7 +20,8 @@ 
	  <xs:attribute name="PrimaryAddress" type="xs:unsignedInt" use="required"/>

      <xs:attribute name="SecondaryAddress" type="xs:unsignedInt" use="required"/>

	  <xs:attribute name="Timeout" type="xs:unsignedInt" use="required"/>

    

    </xs:extension>

   </xs:complexContent>

  </xs:complexType>



  <xs:element name="LocalOscillator" type="LocalOscillatorType"/>

Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillatorEthernet.xsd

+11 −8
Original line number Diff line number Diff line
@@ -9,14 +9,17 @@ 
  <xs:import namespace="urn:schemas-cosylab-com:BACI:1.0" schemaLocation="BACI.xsd"/>



  <xs:complexType name="LocalOscillatorEthType">

    <xs:complexContent>

      <xs:extension base="baci:CharacteristicComponent">

        <xs:sequence>



	      <xs:element name="frequency" type="baci:ROdouble" />

	      <xs:element name="amplitude" type="baci:ROdouble" />

	      <xs:element name="isLocked" type="baci:ROdouble" />

        </xs:sequence>

        <xs:attribute name="IP" type="xs:string" use="required"/>

        <xs:attribute name="PORT" type="xs:unsignedInt" use="required"/>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:element name="LocalOscillatorEthernet" type="LocalOscillatorEthType"/>

Common/Servers/AntennaBoss/config/CDB/schemas/AntennaBoss.xsd

+74 −70
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
	<xs:import namespace="urn:schemas-cosylab-com:Managment:1.0" schemaLocation="Managment.xsd"/>

	

    <xs:complexType name="AntennaBossType">

        <xs:complexContent>

            <xs:extension base="baci:CharacteristicComponent">

		        <xs:sequence>

			        <xs:element name="target" type="baci:ROstring"/>

			        <xs:element name="targetRightAscension" type="baci:ROdouble"/>
@@ -91,6 +93,8 @@ 
        		<xs:attribute name="Satellite" type="xs:string" use="required"/>

        		<xs:attribute name="SolarSystemBody" type="xs:string" use="required"/>

                <xs:attribute name="Otf" type="xs:string" use="required"/>

            </xs:extension>

        </xs:complexContent>

	</xs:complexType>



	<xs:element name="AntennaBoss" type="AntennaBossType"/>

Common/Servers/CalibrationTool/config/CDB/schemas/CalibrationTool.xsd

+51 −48
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
  <xs:import namespace="urn:schemas-cosylab-com:Managment:1.0" schemaLocation="Managment.xsd"/>

  

  <xs:complexType name="CalibrationToolType">

   <xs:complexContent>

    <xs:extension base="baci:CharacteristicComponent">

     <xs:sequence>

	  <xs:element name="status" type="mng:SystemStatusType" />

	  <xs:element name="fileName" type="baci:ROstring"/>
@@ -67,7 +69,8 @@ 
     <!-- This value represent the tolerance (percentage) applied when checking for the expected fwhm,  -->

     <!-- 100 means the measured fwhm is considered valid if between the double and the half value of the expected one  -->

     <xs:attribute name="FwhmTolerance" type="xs:double" use="required" />

    

    </xs:extension>

   </xs:complexContent> 

  </xs:complexType>

 <xs:element name="CalibrationTool" type="CalibrationToolType"/>

</xs:schema>