Rename Screen to Gui & Add Input Injeciton (#11)

* Add SendInputEventRequest

* Merge Screen and Input into Gui

5 files changed, 43 insertions, 20 deletions

diff --git a/flipper.proto b/flipper.proto
index 9e1905b..e9d9a62 100644
--- a/flipper.proto
+++ b/flipper.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 import "storage.proto";
 import "status.proto";
 import "application.proto";
-import "screen.proto";
+import "gui.proto";
 
 package PB;
 option java_package = "com.flipperdevices.protobuf";
@@ -66,9 +66,10 @@ message Main {
         .PB_App.StartRequest app_start_request = 16;
         .PB_App.LockStatusRequest app_lock_status_request = 17;
         .PB_App.LockStatusResponse app_lock_status_response = 18;
-        .PB_Screen.StartStreamRequest screen_start_stream_request = 20;
-        .PB_Screen.StopStreamRequest screen_stop_stream_request = 21;
-        .PB_Screen.StreamFrame screen_stream_frame = 22;
+        .PB_Gui.StartScreenStreamRequest gui_start_screen_stream_request = 20;
+        .PB_Gui.StopScreenStreamRequest gui_stop_screen_stream_request = 21;
+        .PB_Gui.ScreenStreamFrame gui_screen_stream_frame = 22;
+        .PB_Gui.SendInputEventRequest gui_send_input_event_request = 23;
     }
 }
 
diff --git a/gui.options b/gui.options
new file mode 100644
index 0000000..5bf1f1a
--- /dev/null
+++ b/gui.options
@@ -0,0 +1,2 @@
+PB_Gui.ScreenStreamFrame.data                  type:FT_POINTER
+PB_Gui.ScreenStreamFrame.data                  max_size:1024
\ No newline at end of file
diff --git a/gui.proto b/gui.proto
new file mode 100644
index 0000000..c9de902
--- /dev/null
+++ b/gui.proto
@@ -0,0 +1,36 @@
+syntax = "proto3";
+
+package PB_Gui;
+option java_package = "com.flipperdevices.protobuf.screen";
+
+enum InputKey {
+    UP = 0;
+    DOWN = 1;
+    RIGHT = 2;
+    LEFT = 3;
+    OK = 4;
+    BACK = 5;
+};
+
+enum InputType {
+    PRESS = 0; /**< Press event, emitted after debounce */
+    RELEASE = 1; /**< Release event, emitted after debounce */
+    SHORT = 2; /**< Short event, emitted after InputTypeRelease done withing INPUT_LONG_PRESS interval */
+    LONG = 3; /**< Long event, emmited after INPUT_LONG_PRESS interval, asynchronouse to InputTypeRelease  */
+    REPEAT = 4; /**< Repeat event, emmited with INPUT_REPEATE_PRESS period after InputTypeLong event */
+}
+
+message StartScreenStreamRequest {
+}
+
+message StopScreenStreamRequest {
+}
+
+message ScreenStreamFrame {
+    bytes data = 1;
+}
+
+message SendInputEventRequest {
+    InputKey key = 1;
+    InputType type = 2;
+}
\ No newline at end of file
diff --git a/screen.options b/screen.options
deleted file mode 100644
index a9956fa..0000000
--- a/screen.options
+++ /dev/null
@@ -1,2 +0,0 @@
-PB_Screen.StreamFrame.data                  type:FT_POINTER
-PB_Screen.StreamFrame.data                  max_size:1024
\ No newline at end of file
diff --git a/screen.proto b/screen.proto
deleted file mode 100644
index 13f6ccf..0000000
--- a/screen.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-package PB_Screen;
-option java_package = "com.flipperdevices.protobuf.screen";
-
-message StartStreamRequest {
-}
-
-message StopStreamRequest {
-}
-
-message StreamFrame {
-    bytes data = 1;
-}
\ No newline at end of file