Merge remote-tracking branch 'origin/16-new-names' into next

[apps/agl-service-can-low-level.git] / openxc.proto

diff --git a/openxc.proto b/openxc.proto
index aa7f734..3c0a51d 100644 (file)
--- a/openxc.proto
+++ b/openxc.proto
@@ -16,26 +16,73 @@ message VehicleMessage {
 }
 
 message RawMessage {
+    enum FrameFormat {
+        STANDARD = 1;
+        EXTENDED = 2;
+    }
     optional int32 bus = 1;
     optional uint32 message_id = 2;
     optional bytes data = 3;
+    optional FrameFormat frame_format = 4;
 }
 
 message ControlCommand {
-    enum Type { VERSION = 1; DEVICE_ID = 2; DIAGNOSTIC = 3; }
+    enum Type {
+        VERSION = 1;
+        DEVICE_ID = 2;
+        DIAGNOSTIC = 3;
+        PASSTHROUGH = 4;
+        ACCEPTANCE_FILTER_BYPASS = 5;
+        PAYLOAD_FORMAT = 6;
+        PREDEFINED_OBD2_REQUESTS = 7;
+    }
 
     optional Type type = 1;
-    optional DiagnosticRequest diagnostic_request = 2;
+    optional DiagnosticControlCommand diagnostic_request = 2;
+    optional PassthroughModeControlCommand passthrough_mode_request = 3;
+    optional AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
+    optional PayloadFormatCommand payload_format_command = 5;
+    optional PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
+}
+
+message DiagnosticControlCommand {
+    enum Action { ADD = 1; CANCEL = 2; }
+
+    optional DiagnosticRequest request = 1;
+    optional Action action = 2;
+}
+
+message PassthroughModeControlCommand {
+    optional int32 bus = 1;
+    optional bool enabled = 2;
+}
+
+message AcceptanceFilterBypassCommand {
+    optional int32 bus = 1;
+    optional bool bypass = 2;
+}
+
+message PayloadFormatCommand {
+    enum PayloadFormat {
+        JSON = 1;
+        PROTOBUF = 2;
+    }
+
+    optional PayloadFormat format = 1;
+}
+
+message PredefinedObd2RequestsCommand {
+    optional bool enabled = 1;
 }
 
 message CommandResponse {
     optional ControlCommand.Type type = 1;
     optional string message = 2;
+    optional bool status = 3;
 }
 
 message DiagnosticRequest {
     enum DecodedType { NONE = 1; OBD2 = 2; }
-    enum Action { CREATE = 1; UPDATE = 2; DELETE = 3; }
 
     optional int32 bus = 1;
     optional uint32 message_id = 2;
@@ -48,7 +95,6 @@ message DiagnosticRequest {
     optional double frequency = 7;
     optional string name = 8;
     optional DecodedType decoded_type = 9;
-    optional Action action = 10;
 }
 
 message DiagnosticResponse {