Skip to content

Commit

Permalink
Merge branch 'implement-get-supported-mds-languages-set-mds-language'…
Browse files Browse the repository at this point in the history
… of https://github.com/antipovi-draeger/t2iapi into implement-get-supported-mds-languages-set-mds-language
  • Loading branch information
antipovi-draeger committed Sep 4, 2024
2 parents c1bcb2f + 759d8ab commit 2e419bf
Show file tree
Hide file tree
Showing 11 changed files with 90 additions and 45 deletions.
6 changes: 6 additions & 0 deletions .github/license-check/header-MIT-draeger-java-and-proto.txt
Original file line number Diff line number Diff line change
@@ -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
\*/
6 changes: 0 additions & 6 deletions .github/license-check/header-MIT-draeger-java.txt

This file was deleted.

6 changes: 0 additions & 6 deletions .github/license-check/header-MIT-draeger-proto.txt

This file was deleted.

4 changes: 2 additions & 2 deletions .github/license-check/header-MIT-draeger-python.txt
Original file line number Diff line number Diff line change
@@ -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
23 changes: 23 additions & 0 deletions .github/license-check/license-config
Original file line number Diff line number Diff line change
@@ -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
25 changes: 0 additions & 25 deletions .github/license-check/license-config.json

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/license-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- manipulation PhysicallyDisconnectRemovableSubsystemAfterSettingActivationStateOnOrStndBy
- manipulation GetComponentHwVersion for devices
- manipulation GetAvailableDeviceMetaData for device
- manipulation AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState for contexts
- manipulation GetComponentSwVersion for devices
- manipulation ProvideInformationAboutLastCalibration for devices
- manipulation ProvideInformationAboutNextCalibration for devices
- manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
Expand Down
22 changes: 21 additions & 1 deletion src/t2iapi/combined/service.proto
Original file line number Diff line number Diff line change
@@ -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
*/
Expand All @@ -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";
Expand Down Expand Up @@ -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);
}
18 changes: 17 additions & 1 deletion src/t2iapi/device/device_responses.proto
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,20 @@ Response containing the available device metadata.
message AvailableDeviceMetaDataResponse {
BasicResponse status = 1;
t2iapi.biceps.MetaDataMsg meta_data = 2; // available device metadata
}
}

/*
Response containing the software version of the requested pm:AbstractDeviceComponentDescriptor handle when supported.
*/
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
}
14 changes: 14 additions & 0 deletions src/t2iapi/device/service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,18 @@ service DeviceService {
user's opinion, must be present for this device.
*/
rpc GetAvailableDeviceMetaData(BasicHandleRequest) returns (AvailableDeviceMetaDataResponse);

/*
Get the software version of the requested pm:AbstractDeviceComponentDescriptor handle if it is representing
a component with a software version.
*/
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);
}

0 comments on commit 2e419bf

Please sign in to comment.