Commit 84f81016 authored by Andrea Orlati's avatar Andrea Orlati
Browse files

Merge branch 'centos_7_compatibility' of github.com:discos/discos into fix-issue-885

parents 40f41152 fc2c1f1b

Common/Clients/SystemTerminal/src/nuraghe_commands.py

+6 −0
Original line number Diff line number Diff line
@@ -463,6 +463,12 @@ def integration(): 
    sets the integration time

    """



def backendPark():

    """

    backendPark

    deprogram all the boards

    """



def log():

    """

    log=logfilename

Common/Interfaces/BackendsInterface/idl/GenericBackend.idl

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ module Backends { 


		ACS::doubleSeq getRms() raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



		void endSchedule() raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);

		

		/**

		 * Call this method in order to read the total power from each input when the input are connected directly to the 50 Ohm. 

		 * This method must be available also if the backend in the <i>busy</i> status.

Common/Interfaces/BackendsInterface/idl/Sardara.idl

+2 −2
Original line number Diff line number Diff line
@@ -128,9 +128,9 @@ module Backends { 


		void initialize(in string configuration) raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



		void getConfiguration(out string configuration);

		string getConfiguration();



		void getCommProtVersion(out string version);

		string getCommProtVersion();

	};

	

};

Common/Interfaces/BackendsInterface/idl/Skarab.idl

+2 −2
Original line number Diff line number Diff line
@@ -128,9 +128,9 @@ module Backends { 


		void initialize(in string configuration) raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



		void getConfiguration(out string configuration);

		string getConfiguration();



		void getCommProtVersion(out string version);

		string getCommProtVersion();

	};

	

};

Common/Libraries/ComponentProxy/include/ActiveSurfaceProxy.h

+4 −0
Original line number Diff line number Diff line
@@ -2,12 +2,16 @@ 
#define ACTIVESURFACEPROXY_H



#include <ActiveSurfaceBossC.h>

#include <lanC.h>

#include <usdC.h>



#include "ComponentProxy.h"



namespace ActiveSurface

{

    PROXY_COMPONENT(ActiveSurfaceBoss);

    PROXY_COMPONENT(lan);

    PROXY_COMPONENT(USD);

};



#endif