Merge branch 'main' into last-calibration-manipulation

Draegerwerk · Jun 20, 2024 · 21f0ab9 · 21f0ab9
2 parents ad7f561 + b861dfe
commit 21f0ab9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - manipulation ProvideInformationAboutLastCalibration for devices
+- manipulation ProvideInformationAboutNextCalibration for devices
 - manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
 
 ## [4.1.0] - 2024-02-22

diff --git a/src/t2iapi/device/device_requests.proto b/src/t2iapi/device/device_requests.proto
@@ -68,10 +68,20 @@ message TriggerDescriptorUpdateRequest{
 
 /*
 Request to provide information about the pm:CalibrationInfo/@ComponentCalibrationState for the given descriptor handle.
- */
+*/
 message ProvideInformationAboutLastCalibrationRequest {
     string handle = 1;  // handle of the pm:AbstractDeviceComponentDescriptor for which
                         // the last calibration information shall be provided
     CalibrationState calibration_state = 2;     // @ComponentCalibrationState value to set as the last calibration
                                                 // information
-}
+}
+
+/*
+Request to provide information about the pm:NextCalibration/@ComponentCalibrationState for the given descriptor handle.
+*/
+message ProvideInformationAboutNextCalibrationRequest {
+    string handle = 1;  // handle of the pm:AbstractDeviceComponentDescriptor for which
+                        // the next calibration information shall be provided
+    CalibrationState calibration_state = 2;     // ComponentCalibrationState value to set as the next calibration
+                                                // information
+}
diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto
@@ -121,11 +121,18 @@ service DeviceService {
     not able to maintain the static state, it shall return RESULT_NOT_SUPPORTED.
      */
     rpc SetBatteryUsage (t2iapi.device.SetBatteryUsageRequest) returns (BasicResponse);
-	
-	 /*
+
+	   /*
     Provide information about the pm:CalibrationInfo for the given pm:AbstractDeviceComponentDescriptor.
     If the device is not able to provide the information, it shall return RESULT_NOT_SUPPORTED.
      */
     rpc ProvideInformationAboutLastCalibration (t2iapi.device.ProvideInformationAboutLastCalibrationRequest)
         returns (BasicResponse);
+
+     /*
+    Provide information about the pm:NextCalibration for the given pm:AbstractDeviceComponentDescriptor.
+    If the device is not able to provide the information, it shall return RESULT_NOT_SUPPORTED.
+     */
+    rpc ProvideInformationAboutNextCalibration (t2iapi.device.ProvideInformationAboutNextCalibrationRequest)
+        returns (BasicResponse);
 }
diff --git a/src/t2iapi/device/types.proto b/src/t2iapi/device/types.proto
@@ -78,4 +78,4 @@ enum CalibrationState{
     CALIBRATION_STATE_RUNNING = 2;
     CALIBRATION_STATE_CALIBRATED = 3;
     CALIBRATION_STATE_OTHER = 4;
-}
+}