Merge branch 'messagepackadditions' of https://github.com/openxc/openxc-message-forma...

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

diff --git a/openxc.proto b/openxc.proto
index 6bf1567..6d41325 100644 (file)
--- 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 uint64 timestamp = 7;
 }
 
 message CanMessage {
@@ -35,6 +36,9 @@ message ControlCommand {
         ACCEPTANCE_FILTER_BYPASS = 5;
         PAYLOAD_FORMAT = 6;
         PREDEFINED_OBD2_REQUESTS = 7;
+               MODEM_CONFIGURATION = 8;
+               RTC_CONFIGURATION = 9;
+               SD_MOUNT_STATUS = 10;
     }
 
     optional Type type = 1;
@@ -43,6 +47,8 @@ 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;
+       optional RTCConfigurationCommand rtc_configuration_command = 8;
 }
 
 message DiagnosticControlCommand {
@@ -66,6 +72,7 @@ message PayloadFormatCommand {
     enum PayloadFormat {
         JSON = 1;
         PROTOBUF = 2;
+               MESSAGEPACK = 3;
     }
 
     optional PayloadFormat format = 1;
@@ -75,6 +82,46 @@ 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 RTCConfigurationCommand {
+       optional uint32 unix_time = 1;
+}
+
 message CommandResponse {
     optional ControlCommand.Type type = 1;
     optional string message = 2;
@@ -124,6 +171,3 @@ message SimpleMessage {
     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