Merge branch 'master' of https://github.com/discos/discos into fix-issue-901 (d386c6c7) · Commits · INAF / DISCOS

.github/workflows/download-vm.yml

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		name: Download the DISCOS VM

		on:
		workflow_dispatch:
		repository_dispatch:
		types: [update-vm]

		concurrency:
		group: download
		cancel-in-progress: false

		jobs:
		download-vm:
		name: Download the latest virtual machine
		runs-on: ubuntu-latest
		env:
		REPOSITORY_TOKEN: "${{ secrets.DEPENDENCIES_TOKEN }}"
		GH_TOKEN: "${{ secrets.GH_WORKFLOWS_TOKEN }}"
		GOOGLE_DRIVE_TOKEN: "${{ secrets.GOOGLE_DRIVE_TOKEN }}"
		PROVISIONED_VM_GDRIVE_ID: "${{ secrets.PROVISIONED_VM_GDRIVE_ID }}"
		PROVISIONED_ARCHIVE_GDRIVE_ID: "${{ secrets.PROVISIONED_ARCHIVE_GDRIVE_ID }}"
		steps:
		- name: Clone the deployment repository
		uses: actions/checkout@v4
		with:
		repository: 'discos/deployment'
		- name: Set up Python
		uses: actions/setup-python@v5
		with:
		python-version: '3'
		check-latest: true
		- name: Download the provisioned virtual machine from Google Drive
		run: \|
		pip install -r .github/utils/gdrive_requirements.txt
		python .github/utils/download_from_gdrive.py
		gh secret set GOOGLE_DRIVE_TOKEN --org discos --visibility selected --repos discos,deployment < token.json
		- name: Save the downloaded VM to cache
		uses: actions/cache/save@v4
		with:
		key: discos-manager-vm
		path: \|
		/home/runner/discos_manager.ova
		/home/runner/vagrant.tar.gz

Common/Interfaces/ReceiversInterface/idl/GenericDerotator.idl

+13 −38

Original line number	Diff line number	Diff line
		@@ -43,10 +43,7 @@ module Receivers {
		* <h3>Methods</h3>:
		* <ul>
		* <li>setup(): allow the derotator to be ready to move</li>
		* <li>powerOff(): switch the power amplifier off </li>
		* <li>setPosition(): set the derotator position</li>
		* <li>setSpeed(): set the derotator speed, in rpm</li>
		* <li>getSpeed(): get the derotator speed, in rpm</li>
		* <li>getActPosition(): return the actPosition value</li>
		* <li>getCmdPosition(): return the cmdPosition value</li>
		* <li>getPositionFromHistory(t): return the the derotator position at
		@@ -61,7 +58,8 @@ module Receivers {
		* <li>isSlewing(): return true when the derotator is moving</li>
		* </ul>
		*/
		interface GenericDerotator : ACS::CharacteristicComponent {
		interface GenericDerotator
		{

		/**
		* This property returns the sensor encoder position in the user
		@@ -125,14 +123,6 @@ module Receivers {
		);


		/** Switch the power amplifier off
		*
		* @throw CORBA::SystemException
		* @throw ComponentErrors::ComponentErrorsEx
		*/
		void powerOff() raises (ComponentErrors::ComponentErrorsEx);


		/**
		* @return the actPosition property value
		*
		@@ -147,6 +137,17 @@ module Receivers {
		);


		/**
		* This method loads a position that has to be tracked by the derotator
		* @param point_time an ACS::Time object indicating the time associated with the coordinates to be tracked.
		* Only the start time is sent to the derotator and the points after are always spaced by the same amount of time from one another.
		* It is still necessary to fill this field in order to associate a time to the coordinates inside the component.
		* @param position the position to track at the given time
		* @param restart flag that says the given point is the first of a new trajectory
		*/
		void loadTrackingPoint(in ACS::Time point_time, in double position, in boolean restart) raises (DerotatorErrors::DerotatorErrorsEx);


		/**
		* @return the cmdPosition property value
		*
		@@ -178,32 +179,6 @@ module Receivers {
		double getPositionFromHistory(in ACS::Time t) raises (ComponentErrors::ComponentErrorsEx);


		/**
		* Set the derotator speed
		*
		* @arg speed speed in rpm
		* @throw ComponentErrors::ComponentErrorsEx,
		* @throw DerotatorErrors::DerotatorErrorsEx
		*/
		void setSpeed(in unsigned long speed) raises (
		ComponentErrors::ComponentErrorsEx,
		DerotatorErrors::DerotatorErrorsEx
		);


		/**
		* Get the derotator speed
		*
		* @return the derotator speed in rpm
		* @throw ComponentErrors::ComponentErrorsEx,
		* @throw DerotatorErrors::DerotatorErrorsEx
		*/
		unsigned long getSpeed() raises (
		ComponentErrors::ComponentErrorsEx,
		DerotatorErrors::DerotatorErrorsEx
		);


		/**
		* Return the maximum position value allowed.
		* @throw CORBA::SystemException

Common/Servers/PyDewarPositioner/config/CDB/schemas/DewarPositioner.xsd

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		<!--xs:attribute name="actionThreadStackSize" type="xs:unsignedLong" use="optional" default="1024" />
		<xs:attribute name="monitoringThreadStackSize" type="xs:unsignedLong" use="optional" default="2048" /-->
		<xs:attribute name="UpdatingTime" type="xs:double" use="required" />
		<xs:attribute name="TrackingLeadTime" type="xs:double" use="required" />
		<xs:attribute name="RewindingSleepTime" type="xs:double" use="required" />
		<xs:attribute name="RewindingTimeout" type="xs:double" use="required" />
		<xs:attribute name="DefaultConfiguration" type="xs:string" use="required" />

Common/Servers/PyDewarPositioner/src/DewarPositioner/DewarPositionerImpl.py

+88 −88

File changed.

Preview size limit exceeded, changes collapsed.

Common/Servers/PyDewarPositioner/src/DewarPositioner/cdbconf.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ class CDBConf(object):

		componentAttributes = (
		'UpdatingTime',
		'TrackingLeadTime',
		'RewindingSleepTime',
		'RewindingTimeout',
		'DefaultConfiguration',