X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=openxc.proto;h=bb54c77014932d3feedbc72bb602baa1b53514fe;hb=77718cfc70f76b687154756344e1a52b6f734ec9;hp=3becaa5c9f244a5cbd2f90bb99770c7d212a2540;hpb=9e84f7713ab25ddb69e6f46cf34285a09ee9e28b;p=apps%2Fagl-service-can-low-level.git

diff --git a/openxc.proto b/openxc.proto
index 3becaa5c..bb54c770 100644
--- a/openxc.proto
+++ b/openxc.proto
@@ -13,6 +13,7 @@ message VehicleMessage {
     optional DiagnosticResponse diagnostic_response = 4;
     optional ControlCommand control_command = 5;
     optional CommandResponse command_response = 6;
+	optional uint32 uptime = 7;
 }
 
 message CanMessage {
@@ -21,7 +22,7 @@ message CanMessage {
         EXTENDED = 2;
     }
     optional int32 bus = 1;
-    optional uint32 message_id = 2;
+    optional uint32 id = 2;
     optional bytes data = 3;
     optional FrameFormat frame_format = 4;
 }
@@ -35,6 +36,7 @@ message ControlCommand {
         ACCEPTANCE_FILTER_BYPASS = 5;
         PAYLOAD_FORMAT = 6;
         PREDEFINED_OBD2_REQUESTS = 7;
+		MODEM_CONFIGURATION = 8;
     }
 
     optional Type type = 1;
@@ -43,6 +45,7 @@ message ControlCommand {
     optional AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
     optional PayloadFormatCommand payload_format_command = 5;
     optional PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
+	optional ModemConfigurationCommand modem_configuration_command = 7;
 }
 
 message DiagnosticControlCommand {
@@ -75,6 +78,42 @@ message PredefinedObd2RequestsCommand {
     optional bool enabled = 1;
 }
 
+message NetworkOperatorSettings {
+	enum OperatorSelectMode {
+		AUTOMATIC = 0;
+		MANUAL = 1;
+		DEREGISTER = 2;
+		SET_ONLY = 3;
+		MANUAL_AUTOMATIC = 4;
+	}
+	message NetworkDescriptor {
+		enum NetworkType {
+			GSM = 0;
+			UTRAN = 2;
+		}
+		optional uint32 PLMN = 1;
+		optional NetworkType networkType = 2;
+	}
+	optional bool allowDataRoaming = 1;
+	optional OperatorSelectMode operatorSelectMode = 2;
+	optional NetworkDescriptor networkDescriptor = 3;
+}
+
+message NetworkDataSettings {
+	optional string APN = 1;
+}
+
+message ServerConnectSettings {
+	optional string host = 1;
+	optional uint32 port = 2;
+}
+
+message ModemConfigurationCommand {
+	optional NetworkOperatorSettings networkOperatorSettings = 1;
+	optional NetworkDataSettings networkDataSettings = 2;
+	optional ServerConnectSettings serverConnectSettings = 3;
+}
+
 message CommandResponse {
     optional ControlCommand.Type type = 1;
     optional string message = 2;
@@ -120,14 +159,7 @@ message DynamicField {
 }
 
 message SimpleMessage {
-    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;
+    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