Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new interface #44

Open
wants to merge 11 commits into
base: development
Choose a base branch
from
Open

new interface #44

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
82d6a6a
Add observer settings
rolfvdhulst Mar 29, 2021
f412209
More changes to settings
rolfvdhulst Apr 21, 2021
55033bc
Fix naming and messages
rolfvdhulst Apr 21, 2021
04550a8
Reverse name to handshake again
rolfvdhulst Apr 21, 2021
5dacebe
add field to indicate button mutability
rolfvdhulst Apr 22, 2021
5fb3cb4
Merge branch 'feature/interface-removal' into feature/interface
rolfvdhulst Apr 22, 2021
a7209ae
change name for clarity
rolfvdhulst Apr 23, 2021
ec9ed52
Add description field
rolfvdhulst Apr 25, 2021
3b98e5d
Merge branch 'development' into feature/interface
daw1012345 Aug 4, 2021
b054101
Experiments with proto messages to do with interface
daw1012345 Aug 15, 2021
fed9128
* Add basic interface rendeding capability
daw1012345 Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions proto/Handshake.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ package proto;

import "UiOptions.proto";

// A message which contains either a list of declarations or a list of values for a single module.
message Handshake {
daw1012345 marked this conversation as resolved.
Show resolved Hide resolved
string name = 1;
repeated UiOption options = 2;
}

message HandshakeAccumulation {
repeated Handshake handshakes = 1;
string module_name = 1;
UiOptionDeclarations declarations = 2;
rolfvdhulst marked this conversation as resolved.
Show resolved Hide resolved
UiValues values = 3;
}
9 changes: 1 addition & 8 deletions proto/State.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,8 @@ message State {
repeated SSL_Referee processed_referee_packets = 11;
}

message SystemState{
State state = 1;
UiSettings ui_settings = 2;
}

message HandshakeState {
State state = 1;
}
message ModuleState {
SystemState system_state = 1;
State system_state = 1;
repeated Handshake handshakes = 2;
}
14 changes: 8 additions & 6 deletions proto/UiOptions.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ message TextField {
string text = 1;
}

message UiOption {
message UiOptionDeclaration {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, the one thing I'm unsure about is how we'll toggle the mutability of a field. Should this be a boolean here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one, I'll add it. Worst case we don't end up using/needing it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also forgot to mention field descriptions we discussed - it appears those are missing as well.

string name = 1;
oneof ui_elements {
Slider slider = 2;
Expand All @@ -40,17 +40,19 @@ message UiOption {
TextField textfield = 6;
}
}

message PossibleUiValue {
oneof ui_value {
message UiOptionDeclarations{
repeated UiOptionDeclaration options = 1;
}
message UiValue {
oneof value {
float float_value = 1;
bool bool_value = 2;
int64 integer_value = 3;
string text_value = 4;
}
}

message UiSettings {
message UiValues {
// maps UiOption::name to the value it currently contains.
map<string, PossibleUiValue> ui_values = 1;
map<string, UiValue> ui_values = 1;
}