Merge pull request #9 from dret/master

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

diff --git a/openxc.proto b/openxc.proto
index 1917b0b..6b79c36 100644 (file)
--- a/openxc.proto
+++ b/openxc.proto
@@ -1,35 +1,37 @@
 package openxc;
 
+option java_package = "com.openxc";
+option java_outer_classname = "BinaryMessages";
+
 message VehicleMessage {
-    enum Type { RAW = 1; STRING = 2; NUM = 3; BOOL = 4; }
+    enum Type { RAW = 1; TRANSLATED = 2; }
 
     optional Type type = 1;
-
     optional RawMessage raw_message = 2;
-    optional TranslatedStringMessage string_message = 3;
-    optional TranslatedNumericMessage numerical_message = 4;
-    optional TranslatedBooleanMessage boolean_message = 5;
+    optional TranslatedMessage translated_message = 3;
 }
 
 message RawMessage {
-    optional uint32 message_id = 1;
-    optional double data = 2;
+    optional int32 bus = 1;
+    optional uint32 message_id = 2;
+    optional uint64 data = 3;
 }
 
-message TranslatedStringMessage {
-    optional string name = 1;
-    optional string value = 2;
-}
+message TranslatedMessage {
+    enum Type { STRING = 1; NUM = 2; BOOL = 3;
+        EVENTED_STRING = 4; EVENTED_NUM = 5; EVENTED_BOOL = 6;}
 
-message TranslatedNumericMessage {
-    optional string name = 1;
-    optional double value = 2;
-}
+    optional Type type = 1;
+    optional string name = 2;
+
+    optional string string_value = 3;
+    optional double numeric_value = 4;
+    optional bool boolean_value = 5;
 
-message TranslatedBooleanMessage {
-    optional string name = 1;
-    optional bool value = 2;
+    optional string string_event = 6;
+    optional double numeric_event = 7;
+    optional bool boolean_event = 8;
 }
 
-// TODO we should also consider having an enum type, h aving each specific
+// TODO we should also consider having an enum type, having each specific
 // message defined as a protobuf