Merge branch 'main' of https://github.com/jannast/t2iapi into manip_r…

…equire_next_calib_indication

# Conflicts:
#	CHANGELOG.md
#	src/t2iapi/device/service.proto

.github/license-check/header-MIT-draeger-java-and-proto.txt

@@ -0,0 +1,6 @@
+/\*
+This Source Code Form is subject to the terms of the MIT License.
+Copyright \(c\) (?:([0-9]{4}-[0-9]{4})|([0-9]{4}))(?:, (?:([0-9]{4}-[0-9]{4})|([0-9]{4})))* Draegerwerk AG & Co. KGaA.
+
+SPDX-License-Identifier: MIT
+\*/

.github/license-check/header-MIT-draeger-python.txt

@@ -1,4 +1,4 @@
 # This Source Code Form is subject to the terms of the MIT License.
 #
-# Copyright (c) %year% Draegerwerk AG & Co. KGaA.
-# SPDX-License-Identifier: MIT
+# Copyright \(c\) (?:([0-9]{4}-[0-9]{4})|([0-9]{4}))(?:, (?:([0-9]{4}-[0-9]{4})|([0-9]{4})))* Draegerwerk AG & Co. KGaA.
+# SPDX-License-Identifier: MIT

.github/license-check/license-config

@@ -0,0 +1,23 @@
+[DraegerLicenseMITJava]
+file_name_pattern: tests/java/src/**/*.java
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-java-and-proto.txt
+header_regex_file_encoding: utf-8
+
+[DraegerLicenseMITProto]
+file_name_pattern: src/**/*.proto
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-java-and-proto.txt
+header_regex_file_encoding: utf-8
+
+[DraegerLicenseMITPythonTests]
+file_name_pattern: tests/python/**/*.py
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-python.txt
+header_regex_file_encoding: utf-8
+
+[DraegerLicenseMITPythonSetup]
+file_name_pattern: python/**/*.py
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-python.txt
+header_regex_file_encoding: utf-8

.github/workflows/license-check.yml

@@ -10,8 +10,8 @@ jobs:
     steps:
       # Run `git checkout`
       - uses: actions/checkout@v4
-      - uses: viperproject/check-license-header@v1
+      - uses: maximilianpilz/file-header-check@v1
         with:
-          path: .
-          config: .github/license-check/license-config.json
-          strict: false # <boolean indicating whether files not covered by the configuration should be reported as errors>
+          config: '.github/license-check/license-config'
+          config-encoding: 'utf-8'
+          log-level: 'DEBUG'

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- manipulation PhysicallyDisconnectRemovableSubsystemAfterSettingActivationStateOnOrStndBy
+- manipulation GetComponentHwVersion for devices
 - manipulation RequestIndicationOfNextCalibrationTimeRequired for devices
 - manipulation IndicateTimeOfNextCalibrationToUser for devices
 - manipulation GetAvailableDeviceMetaData for device

src/t2iapi/combined/service.proto

@@ -1,6 +1,6 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2023 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2023, 2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
@@ -11,6 +11,7 @@ package t2iapi.combined;
 
 import "t2iapi/combined/combined_requests.proto";
 import "t2iapi/context/context_responses.proto";
+import "t2iapi/basic_requests.proto";
 import "t2iapi/basic_responses.proto";
 
 option java_package = "com.draeger.medical.t2iapi.combined";
@@ -73,4 +74,23 @@ service CombinedService {
   rpc SetSystemContextActivationStateAndContextAssociation (
   t2iapi.combined.SetSystemContextActivationStateAndContextAssociationRequest)
         returns (BasicResponse);
+
+  /*
+  Request to set the pm:AbstractDeviceComponentState/@ActivationState corresponding to the specified handle to
+  a value in { "On", "StndBy" } and
+  physically disconnect the removable subsystem being represented by the
+  corresponding pm:AbstractDeviceComponentDescriptor all while persisting the aforementioned ActivationState except when
+  it is necessary to change it due to the physical disconnection by means other than this manipulation.
+
+  The ActivationState as requested shall be persisted in all cases except (indirectly)
+  as a result of the physical disconnection.
+  Reasons other than the physical disconnection constitute a RESULT_NOT_SUPPORTED or RESULT_FAIL.
+  In case the ActivationState is not going to be persisted it shall not be a direct result of this manipulation, i.e.
+  this manipulation shall not directly change the ActivationState in a way not described here.
+
+  In case the pm:AbstractDeviceComponentDescriptor with the specified handle does not represent a removable subsystem
+  it shall return RESULT_NOT_SUPPORTED.
+  */
+  rpc PhysicallyDisconnectRemovableSubsystemAfterSettingActivationStateOnOrStndBy (BasicHandleRequest)
+        returns (BasicResponse);
 }

src/t2iapi/device/device_responses.proto

@@ -46,3 +46,11 @@ message GetComponentSwVersionResponse {
     BasicResponse status = 1;    // status of the rpc
     string software_version = 2; // Software version of the requested device component
 }
+
+/*
+Response containing the hardware version of the requested pm:AbstractDeviceComponentDescriptor handle when supported.
+ */
+message GetComponentHwVersionResponse {
+    BasicResponse status = 1;    // status of the rpc
+    string hardware_version = 2; // Hardware version of the requested device component
+}

src/t2iapi/device/service.proto

@@ -151,6 +151,13 @@ service DeviceService {
     rpc GetComponentSwVersion (BasicHandleRequest)
         returns (t2iapi.device.GetComponentSwVersionResponse);
 
+    /*
+    Get the hardware version of the requested pm:AbstractDeviceComponentDescriptor handle if it is representing
+    a component with a hardware version.
+     */
+    rpc GetComponentHwVersion (BasicHandleRequest)
+        returns (t2iapi.device.GetComponentHwVersionResponse);
+
     /*
     Request for the given pm:AbstractDeviceComponentDescriptor handle, if it can be required by a particular standard
     or RISK MANAGEMENT process to indicate the time of the next calibration to the USER.