Merge pull request #649 from discos/fix-issue-644

Fix issue 644

Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.midl

@@ -17,35 +17,12 @@
 #include <ASErrors.idl>
 #include <ManagmentDefinitions.idl>
 #include <ActiveSurfaceBoss.idl>
+#include <ActiveSurfaceCommon.idl>
 
 #pragma prefix "alma"
 
 module ActiveSurface {
 	
-    enum TASOneWayAction {
-        AS_STOP,
-        AS_SETUP,
-        AS_STOW,
-        AS_REFPOS,
-        AS_UP,
-        AS_DOWN,
-        AS_BOTTOM,
-        AS_TOP,
-        AS_UPDATE,
-        AS_CORRECTION,
-        AS_MOVE,
-	AS_PROFILE
-    };
-    ACS_ENUM(TASOneWayAction);
-
-    enum TASProfile {
-        AS_SHAPED,
-	AS_SHAPED_FIXED,
-        AS_PARABOLIC,
-	AS_PARABOLIC_FIXED
-    };
-    ACS_ENUM(TASProfile);
-	
 	/**
 	 * This component is the supervisor of the Noto Active Surface subsystem.
      * It will be used to control the entire active surface, i. e. during an

SystemMake/Makefile

@@ -66,7 +66,7 @@ MED_CLIENTS:=MedicinaMountTextClient
 MED_MISC:=MedScripts
 
 NT_DOC:=NTDox
-NT_ERRORS:=NotoActiveSurfaceErrors
+NT_ERRORS:= #ActiveSurfaceErrors NotoActiveSurfaceErrors
 NT_INTERFACES:=NotoAntennaInterface NotoReceiversInterface NotoWeatherStationInterface NotoActiveSurfaceInterface \
 NT_LIBRARIES:=
 NT_SERVERS:= NotoReceivers NotoMount NotoWeatherStation NotoActiveSurface NotoMinorServo NotoPyLocalOscillator NotoPyIfDistributor
@@ -146,7 +146,7 @@ else
 ifeq ($(STATION),Noto)
 	#Add all modules included in the Noto system in this sequence
 	#Doc, (Errors, Interfacies, Libraries, Servers, Clients, Misc)
-	MODULES:= ClientErrors ComponentErrors AntennaErrors ParserErrors BackendsErrors ManagementErrors ReceiversErrors MetrologyErrors MinorServoErrors \
+	MODULES:= ActiveSurfaceErrors ClientErrors ComponentErrors AntennaErrors ParserErrors BackendsErrors ManagementErrors ReceiversErrors MetrologyErrors MinorServoErrors \
 		ManagmentInterface AntennaInterface ReceiversInterface BackendsInterface MinorServoInterface WeatherStationInterface ActiveSurfaceInterface \
 		NotoAntennaInterface \
 		SlaLibrary IRALibrary TextWindowLibrary ParserLibrary PyTestingLibrary \