diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.midl b/Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.midl index 17b0ebdaba5074c29f5a6487b8f45b4d088227f5..63186be88c0658fb1434ec55f7adfd6c82abbde2 100644 --- a/Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.midl +++ b/Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.midl @@ -17,34 +17,11 @@ #include #include #include +#include #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. diff --git a/SystemMake/Makefile b/SystemMake/Makefile index 6a98d6ddbbc071ca90cc2a6b45700db6d95534e7..683311521e93fc26e2e24a6a5d03b0cf6c563291 100644 --- a/SystemMake/Makefile +++ b/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 \ @@ -381,4 +381,4 @@ legacy-clean: @rm -rf $(DOC)/* stat: @./slocc.sh -findopt "( -name *.cpp -o -name *.i -o -name *.h -o -name *.idl -o -name *.xml -o -name *.xsd -o -name *.py -o -name Makefile* ) \ - -not -path *object* -not -path *lib*" .. + -not -path *object* -not -path *lib*" .. \ No newline at end of file