From 7cdb1df148c6b16d2d45445a603fc1cef064abd0 Mon Sep 17 00:00:00 2001
From: jannast <104557199+jannast@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:29:17 +0100
Subject: [PATCH] add new device response for indicate next cal time (#99)

Rework device manipulation IndicateTimeOfNextCalibrationToUser with new
response IndicateTimeOfNextCalibrationToUserResponse.

# Checklist

The following aspects have been respected by the author of this pull
request, confirmed by both pull request assignee **and** reviewer:

* Changelog update (necessity checked and entry added or not added
respectively)
  * [x] Pull Request Assignee
  * [x] Reviewer
* README update (necessity checked and entry added or not added
respectively)
  * [x] Pull Request Assignee
  * [x] Reviewer
---
 src/t2iapi/biceps/mdibversiongroup.proto | 24 ++++++++++++++++++++++++
 src/t2iapi/device/device_responses.proto | 12 +++++++++++-
 src/t2iapi/device/service.proto          |  4 ++--
 src/t2iapi/device/types.proto            |  2 +-
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 src/t2iapi/biceps/mdibversiongroup.proto

diff --git a/src/t2iapi/biceps/mdibversiongroup.proto b/src/t2iapi/biceps/mdibversiongroup.proto
new file mode 100644
index 0000000..2f0fbca
--- /dev/null
+++ b/src/t2iapi/biceps/mdibversiongroup.proto
@@ -0,0 +1,24 @@
+/*
+This Source Code Form is subject to the terms of the MIT License.
+Copyright (c) 2024 Draegerwerk AG & Co. KGaA.
+
+SPDX-License-Identifier: MIT
+*/
+
+syntax = "proto3";
+
+package t2iapi.biceps;
+
+option java_package = "com.draeger.medical.t2iapi.biceps";
+option java_outer_classname = "MdibVersionGroupProto";
+
+import "google/protobuf/wrappers.proto";
+
+/*
+Represents the attributeGroup MdibVersionGroup (defined in IEEE Std 11073-10207-2017).
+*/
+message MdibVersionGroup {
+    google.protobuf.UInt64Value mdib_version = 1;    // optional MdibVersion when finishing the rpc
+    string sequence_id = 2;     // SequenceId when finishing the rpc
+    google.protobuf.UInt64Value instance_id = 3;     // optional InstanceId when finishing the rpc
+}
\ No newline at end of file
diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto
index 68fb686..d8862fb 100644
--- a/src/t2iapi/device/device_responses.proto
+++ b/src/t2iapi/device/device_responses.proto
@@ -1,6 +1,6 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022, 2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
@@ -11,6 +11,7 @@ package t2iapi.device;
 
 import "t2iapi/basic_responses.proto";
 import "t2iapi/biceps/metadata.proto";
+import "t2iapi/biceps/mdibversiongroup.proto";
 
 option java_package = "com.draeger.medical.t2iapi.device";
 option java_outer_classname = "DeviceResponses";
@@ -73,3 +74,12 @@ message InsertContainmentTreeEntryForSequenceIdResponse{
     string handle = 2;          // descriptor handle which is representing the requested BICEPS CONTAINMENT TREE ENTRY
                                 // in the device's current MDIB
 }
+
+/*
+Response containing the BasicResponse and the MdibVersionGroup for the requested
+pm:AbstractDeviceComponentDescriptor handle to indicate the time of the next calibration to the USER.
+ */
+message IndicateTimeOfNextCalibrationToUserResponse{
+    BasicResponse status = 1;   // status of the rpc
+    t2iapi.biceps.MdibVersionGroup mdib_version_group = 2;     // MdibVersion attributes when finishing the rpc
+}
\ No newline at end of file
diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto
index 708707f..205319b 100644
--- a/src/t2iapi/device/service.proto
+++ b/src/t2iapi/device/service.proto
@@ -1,6 +1,6 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022, 2023, 2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
@@ -181,7 +181,7 @@ service DeviceService {
     Indicate the time of the next calibration to the USER for the given pm:AbstractDeviceComponentDescriptor handle.
      */
     rpc IndicateTimeOfNextCalibrationToUser (BasicHandleRequest)
-        returns (BasicResponse);
+        returns (t2iapi.device.IndicateTimeOfNextCalibrationToUserResponse);
 
     /*
     Make available the BICEPS CONTAINMENT TREE ENTRY (as defined in IEEE Std 11073-10700-2022) that was previously
diff --git a/src/t2iapi/device/types.proto b/src/t2iapi/device/types.proto
index cc97329..90979af 100644
--- a/src/t2iapi/device/types.proto
+++ b/src/t2iapi/device/types.proto
@@ -1,6 +1,6 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022, 2023, 2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */