X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=openxc.proto;h=c7f759139bc606ab0a89bc3036020aa03dbaf8ff;hb=31c5f5de1980a68159b116090cee0072c47365da;hp=27ea931f15f104138a10fa9d34a111ece0ac4162;hpb=3e91f2023d1161432605aff4af6616a589e63b5c;p=apps%2Fagl-service-can-low-level.git

diff --git a/openxc.proto b/openxc.proto
index 27ea931f..c7f75913 100644
--- a/openxc.proto
+++ b/openxc.proto
@@ -4,13 +4,15 @@ option java_package = "com.openxc";
 option java_outer_classname = "BinaryMessages";
 
 message VehicleMessage {
-    enum Type { RAW = 1; TRANSLATED = 2; DIAGNOSTIC = 3; CONTROL_COMMAND = 4; }
+    enum Type { RAW = 1; TRANSLATED = 2; DIAGNOSTIC = 3; CONTROL_COMMAND = 4;
+            COMMAND_RESPONSE = 5; }
 
     optional Type type = 1;
     optional RawMessage raw_message = 2;
     optional TranslatedMessage translated_message = 3;
     optional DiagnosticResponse diagnostic_response = 4;
     optional ControlCommand control_command = 5;
+    optional CommandResponse command_response = 6;
 }
 
 message RawMessage {
@@ -20,13 +22,46 @@ message RawMessage {
 }
 
 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;
+    }
 
     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;
+}
+
+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 CommandResponse {
+    optional ControlCommand.Type type = 1;
+    optional string message = 2;
+    optional bool status = 3;
 }
 
 message DiagnosticRequest {
+    enum DecodedType { NONE = 1; OBD2 = 2; }
+
     optional int32 bus = 1;
     optional uint32 message_id = 2;
     optional uint32 mode = 3;
@@ -34,10 +69,10 @@ message DiagnosticRequest {
     // TODO we are capping this at 8 bytes for now - need to change when we
     // support multi-frame responses
     optional bytes payload = 5;
-    optional bool parse_payload = 6;
-    optional double factor = 7;
-    optional double offset = 8;
-    optional double frequency = 9;
+    optional bool multiple_responses = 6;
+    optional double frequency = 7;
+    optional string name = 8;
+    optional DecodedType decoded_type = 9;
 }
 
 message DiagnosticResponse {