From 78b04ef542413d26bd74234c581291494854579b Mon Sep 17 00:00:00 2001 From: Kai Jan Kriegel Date: Mon, 7 Dec 2020 02:27:14 +0100 Subject: [PATCH 1/4] Added Machine properties --- api.capnp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/api.capnp b/api.capnp index 54ce797..3b8e73d 100644 --- a/api.capnp +++ b/api.capnp @@ -84,11 +84,22 @@ struct Machine { responsible @3 :User; # This field may be NULL if nobody is using the machine } + + struct PropertyMap { + properties @0 :List(Property) + struct Property { + key @0 :Text; + value @1 :Text; + } + } read @0 :Read; interface Read $CSharp.name("ReadInterface") { info @0 () -> ( minfo :MInfo, dummy :UInt8 = 0 ); # Check the state of a machine. + + getProperties @1 () -> (properties :PropertyMap, dummy :UInt8 = 0 ) + # Read Machine Properties } write @1 :Write; @@ -106,6 +117,12 @@ struct Machine { reserve @1 () -> ( ret :GiveBack ); # Try to reserve a machine. returns a NULL-ptr if the user does not have the required # permissions to reserve this machine + + setProperties @1 (properties :PropertyMap) -> () + # Write all Machine Properties + + setProperty @1 (property :Property) -> () + # Write ONE Machine Property identified by it's key } From b3a1bda3873f0d2c6500b915c7274d29c54ed1c1 Mon Sep 17 00:00:00 2001 From: Kai Jan Kriegel Date: Mon, 7 Dec 2020 02:58:43 +0100 Subject: [PATCH 2/4] fixed field numbers --- api.capnp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api.capnp b/api.capnp index 3b8e73d..68cd41b 100644 --- a/api.capnp +++ b/api.capnp @@ -118,10 +118,10 @@ struct Machine { # Try to reserve a machine. returns a NULL-ptr if the user does not have the required # permissions to reserve this machine - setProperties @1 (properties :PropertyMap) -> () + setProperties @2 (properties :PropertyMap) -> () # Write all Machine Properties - setProperty @1 (property :Property) -> () + setProperty @3 (property :Property) -> () # Write ONE Machine Property identified by it's key } From dbf6dda328bedd938170512c0482be41d2a68c92 Mon Sep 17 00:00:00 2001 From: Kai Jan Kriegel Date: Mon, 7 Dec 2020 03:02:31 +0100 Subject: [PATCH 3/4] added a method to send raw data to machines --- api.capnp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api.capnp b/api.capnp index 68cd41b..bf680a8 100644 --- a/api.capnp +++ b/api.capnp @@ -123,6 +123,9 @@ struct Machine { setProperty @3 (property :Property) -> () # Write ONE Machine Property identified by it's key + + sendRawData @4 (data :Data) -> () + # send a blob of arbitrary data to the machine } From 10d231af2804da15898f40e267d83119ef159f7b Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Mon, 7 Dec 2020 03:55:58 +0000 Subject: [PATCH 4/4] SEMICOLONS! --- api.capnp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api.capnp b/api.capnp index bf680a8..c5e5bf1 100644 --- a/api.capnp +++ b/api.capnp @@ -86,7 +86,7 @@ struct Machine { } struct PropertyMap { - properties @0 :List(Property) + properties @0 :List(Property); struct Property { key @0 :Text; value @1 :Text; @@ -98,7 +98,7 @@ struct Machine { info @0 () -> ( minfo :MInfo, dummy :UInt8 = 0 ); # Check the state of a machine. - getProperties @1 () -> (properties :PropertyMap, dummy :UInt8 = 0 ) + getProperties @1 () -> (properties :PropertyMap, dummy :UInt8 = 0 ); # Read Machine Properties } @@ -118,13 +118,13 @@ struct Machine { # Try to reserve a machine. returns a NULL-ptr if the user does not have the required # permissions to reserve this machine - setProperties @2 (properties :PropertyMap) -> () + setProperties @2 (properties :PropertyMap) -> (); # Write all Machine Properties - setProperty @3 (property :Property) -> () + setProperty @3 (property :PropertyMap.Property) -> (); # Write ONE Machine Property identified by it's key - sendRawData @4 (data :Data) -> () + sendRawData @4 (data :Data) -> (); # send a blob of arbitrary data to the machine }