From: Christopher Peplin <chris.peplin@rhubarbtech.com>
Date: Sat, 15 Nov 2014 17:01:01 +0000 (-0500)
Subject: Merge branch 'next'
X-Git-Tag: 5.0.2~275^2~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=411ee67efc933c9fc013849c7d2af03a56fd78f6;p=apps%2Fagl-service-can-low-level.git

Merge branch 'next'
---

411ee67efc933c9fc013849c7d2af03a56fd78f6
diff --cc openxc.proto
index 43f31993,6bf15674..586ead20
--- a/openxc.proto
+++ b/openxc.proto
@@@ -71,12 -119,11 +119,8 @@@ message DynamicField 
      optional bool boolean_value = 4;
  }
  
- message TranslatedMessage {
-     enum Type { STRING = 1; NUM = 2; BOOL = 3;
-         EVENTED_STRING = 4; EVENTED_NUM = 5; EVENTED_BOOL = 6;}
- 
-     optional Type type = 1;
-     optional string name = 2;
-     optional DynamicField value = 3;
-     optional DynamicField event = 4;
+ message SimpleMessage {
+     optional string name = 1;
+     optional DynamicField value = 2;
+     optional DynamicField event = 3;
  }
 -
 -// TODO we should also consider having an enum type, having each specific
 -// message defined as a protobuf