added uptime field to VehicleMessage

3 files changed, 131 insertions, 15 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 3fc2f805..28afa0b9 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 6fc70703..ed4609db 100644
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.1 at Fri Nov  7 08:56:52 2014. */
+/* Generated by nanopb-0.3.1 at Tue Dec  2 03:06:57 2014. */
 
 #include "openxc.pb.h"
 
@@ -9,13 +9,14 @@
 
 
 
-const pb_field_t openxc_VehicleMessage_fields[7] = {
+const pb_field_t openxc_VehicleMessage_fields[8] = {
     PB_FIELD(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_VehicleMessage, type, type, 0),
     PB_FIELD(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, can_message, type, &openxc_CanMessage_fields),
     PB_FIELD(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, simple_message, can_message, &openxc_SimpleMessage_fields),
     PB_FIELD(  4, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, diagnostic_response, simple_message, &openxc_DiagnosticResponse_fields),
     PB_FIELD(  5, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, control_command, diagnostic_response, &openxc_ControlCommand_fields),
     PB_FIELD(  6, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, command_response, control_command, &openxc_CommandResponse_fields),
+    PB_FIELD(  7, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, uptime, command_response, 0),
     PB_LAST_FIELD
 };
 
@@ -27,13 +28,14 @@ const pb_field_t openxc_CanMessage_fields[5] = {
     PB_LAST_FIELD
 };
 
-const pb_field_t openxc_ControlCommand_fields[7] = {
+const pb_field_t openxc_ControlCommand_fields[8] = {
     PB_FIELD(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_ControlCommand, type, type, 0),
     PB_FIELD(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, diagnostic_request, type, &openxc_DiagnosticControlCommand_fields),
     PB_FIELD(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, passthrough_mode_request, diagnostic_request, &openxc_PassthroughModeControlCommand_fields),
     PB_FIELD(  4, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, acceptance_filter_bypass_command, passthrough_mode_request, &openxc_AcceptanceFilterBypassCommand_fields),
     PB_FIELD(  5, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, payload_format_command, acceptance_filter_bypass_command, &openxc_PayloadFormatCommand_fields),
     PB_FIELD(  6, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, predefined_obd2_requests_command, payload_format_command, &openxc_PredefinedObd2RequestsCommand_fields),
+    PB_FIELD(  7, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, modem_configuration_command, predefined_obd2_requests_command, &openxc_ModemConfigurationCommand_fields),
     PB_LAST_FIELD
 };
 
@@ -65,6 +67,37 @@ const pb_field_t openxc_PredefinedObd2RequestsCommand_fields[2] = {
     PB_LAST_FIELD
 };
 
+const pb_field_t openxc_NetworkOperatorSettings_fields[4] = {
+    PB_FIELD(  1, BOOL    , OPTIONAL, STATIC  , FIRST, openxc_NetworkOperatorSettings, allowDataRoaming, allowDataRoaming, 0),
+    PB_FIELD(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_NetworkOperatorSettings, operatorSelectMode, allowDataRoaming, 0),
+    PB_FIELD(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_NetworkOperatorSettings, networkDescriptor, operatorSelectMode, &openxc_NetworkOperatorSettings_NetworkDescriptor_fields),
+    PB_LAST_FIELD
+};
+
+const pb_field_t openxc_NetworkOperatorSettings_NetworkDescriptor_fields[3] = {
+    PB_FIELD(  1, UINT32  , OPTIONAL, STATIC  , FIRST, openxc_NetworkOperatorSettings_NetworkDescriptor, PLMN, PLMN, 0),
+    PB_FIELD(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_NetworkOperatorSettings_NetworkDescriptor, networkType, PLMN, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t openxc_NetworkDataSettings_fields[2] = {
+    PB_FIELD(  1, STRING  , OPTIONAL, CALLBACK, FIRST, openxc_NetworkDataSettings, APN, APN, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t openxc_ServerConnectSettings_fields[3] = {
+    PB_FIELD(  1, STRING  , OPTIONAL, STATIC  , FIRST, openxc_ServerConnectSettings, host, host, 0),
+    PB_FIELD(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_ServerConnectSettings, port, host, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t openxc_ModemConfigurationCommand_fields[4] = {
+    PB_FIELD(  1, MESSAGE , OPTIONAL, STATIC  , FIRST, openxc_ModemConfigurationCommand, networkOperatorSettings, networkOperatorSettings, &openxc_NetworkOperatorSettings_fields),
+    PB_FIELD(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ModemConfigurationCommand, networkDataSettings, networkOperatorSettings, &openxc_NetworkDataSettings_fields),
+    PB_FIELD(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ModemConfigurationCommand, serverConnectSettings, networkDataSettings, &openxc_ServerConnectSettings_fields),
+    PB_LAST_FIELD
+};
+
 const pb_field_t openxc_CommandResponse_fields[4] = {
     PB_FIELD(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_CommandResponse, type, type, 0),
     PB_FIELD(  2, STRING  , OPTIONAL, STATIC  , OTHER, openxc_CommandResponse, message, type, 0),
@@ -122,7 +155,7 @@ const pb_field_t openxc_SimpleMessage_fields[4] = {
  * numbers or field sizes that are larger than what can fit in 8 or 16 bit
  * field descriptors.
  */
-PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, can_message) < 65536 && pb_membersize(openxc_VehicleMessage, simple_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 65536 && pb_membersize(openxc_VehicleMessage, control_command) < 65536 && pb_membersize(openxc_VehicleMessage, command_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 65536 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 65536 && pb_membersize(openxc_ControlCommand, payload_format_command) < 65536 && pb_membersize(openxc_ControlCommand, predefined_obd2_requests_command) < 65536 && pb_membersize(openxc_DiagnosticControlCommand, request) < 65536 && pb_membersize(openxc_SimpleMessage, value) < 65536 && pb_membersize(openxc_SimpleMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_CanMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_PayloadFormatCommand_openxc_PredefinedObd2RequestsCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_SimpleMessage)
+PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, can_message) < 65536 && pb_membersize(openxc_VehicleMessage, simple_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 65536 && pb_membersize(openxc_VehicleMessage, control_command) < 65536 && pb_membersize(openxc_VehicleMessage, command_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 65536 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 65536 && pb_membersize(openxc_ControlCommand, payload_format_command) < 65536 && pb_membersize(openxc_ControlCommand, predefined_obd2_requests_command) < 65536 && pb_membersize(openxc_ControlCommand, modem_configuration_command) < 65536 && pb_membersize(openxc_DiagnosticControlCommand, request) < 65536 && pb_membersize(openxc_NetworkOperatorSettings, networkDescriptor) < 65536 && pb_membersize(openxc_ModemConfigurationCommand, networkOperatorSettings) < 65536 && pb_membersize(openxc_ModemConfigurationCommand, networkDataSettings) < 65536 && pb_membersize(openxc_ModemConfigurationCommand, serverConnectSettings) < 65536 && pb_membersize(openxc_SimpleMessage, value) < 65536 && pb_membersize(openxc_SimpleMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_CanMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_PayloadFormatCommand_openxc_PredefinedObd2RequestsCommand_openxc_NetworkOperatorSettings_openxc_NetworkOperatorSettings_NetworkDescriptor_openxc_NetworkDataSettings_openxc_ServerConnectSettings_openxc_ModemConfigurationCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_SimpleMessage)
 #endif
 
 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
@@ -133,7 +166,7 @@ PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, can_message) < 65536 && p
  * numbers or field sizes that are larger than what can fit in the default
  * 8 bit descriptors.
  */
-PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, can_message) < 256 && pb_membersize(openxc_VehicleMessage, simple_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 256 && pb_membersize(openxc_VehicleMessage, control_command) < 256 && pb_membersize(openxc_VehicleMessage, command_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 256 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 256 && pb_membersize(openxc_ControlCommand, payload_format_command) < 256 && pb_membersize(openxc_ControlCommand, predefined_obd2_requests_command) < 256 && pb_membersize(openxc_DiagnosticControlCommand, request) < 256 && pb_membersize(openxc_SimpleMessage, value) < 256 && pb_membersize(openxc_SimpleMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_CanMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_PayloadFormatCommand_openxc_PredefinedObd2RequestsCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_SimpleMessage)
+PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, can_message) < 256 && pb_membersize(openxc_VehicleMessage, simple_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 256 && pb_membersize(openxc_VehicleMessage, control_command) < 256 && pb_membersize(openxc_VehicleMessage, command_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 256 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 256 && pb_membersize(openxc_ControlCommand, payload_format_command) < 256 && pb_membersize(openxc_ControlCommand, predefined_obd2_requests_command) < 256 && pb_membersize(openxc_ControlCommand, modem_configuration_command) < 256 && pb_membersize(openxc_DiagnosticControlCommand, request) < 256 && pb_membersize(openxc_NetworkOperatorSettings, networkDescriptor) < 256 && pb_membersize(openxc_ModemConfigurationCommand, networkOperatorSettings) < 256 && pb_membersize(openxc_ModemConfigurationCommand, networkDataSettings) < 256 && pb_membersize(openxc_ModemConfigurationCommand, serverConnectSettings) < 256 && pb_membersize(openxc_SimpleMessage, value) < 256 && pb_membersize(openxc_SimpleMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_CanMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_PayloadFormatCommand_openxc_PredefinedObd2RequestsCommand_openxc_NetworkOperatorSettings_openxc_NetworkOperatorSettings_NetworkDescriptor_openxc_NetworkDataSettings_openxc_ServerConnectSettings_openxc_ModemConfigurationCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_SimpleMessage)
 #endif
 
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index a99a91fc..2975d4d9 100644
--- a/gen/cpp/openxc.pb.h
+++ b/gen/cpp/openxc.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.1 at Fri Nov  7 08:56:52 2014. */
+/* Generated by nanopb-0.3.1 at Tue Dec  2 03:06:57 2014. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -34,7 +34,8 @@ typedef enum _openxc_ControlCommand_Type {
     openxc_ControlCommand_Type_PASSTHROUGH = 4,
     openxc_ControlCommand_Type_ACCEPTANCE_FILTER_BYPASS = 5,
     openxc_ControlCommand_Type_PAYLOAD_FORMAT = 6,
-    openxc_ControlCommand_Type_PREDEFINED_OBD2_REQUESTS = 7
+    openxc_ControlCommand_Type_PREDEFINED_OBD2_REQUESTS = 7,
+    openxc_ControlCommand_Type_MODEM_CONFIGURATION = 8
 } openxc_ControlCommand_Type;
 
 typedef enum _openxc_DiagnosticControlCommand_Action {
@@ -47,6 +48,19 @@ typedef enum _openxc_PayloadFormatCommand_PayloadFormat {
     openxc_PayloadFormatCommand_PayloadFormat_PROTOBUF = 2
 } openxc_PayloadFormatCommand_PayloadFormat;
 
+typedef enum _openxc_NetworkOperatorSettings_OperatorSelectMode {
+    openxc_NetworkOperatorSettings_OperatorSelectMode_AUTOMATIC = 0,
+    openxc_NetworkOperatorSettings_OperatorSelectMode_MANUAL = 1,
+    openxc_NetworkOperatorSettings_OperatorSelectMode_DEREGISTER = 2,
+    openxc_NetworkOperatorSettings_OperatorSelectMode_SET_ONLY = 3,
+    openxc_NetworkOperatorSettings_OperatorSelectMode_MANUAL_AUTOMATIC = 4
+} openxc_NetworkOperatorSettings_OperatorSelectMode;
+
+typedef enum _openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType {
+    openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType_GSM = 0,
+    openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType_UTRAN = 2
+} openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType;
+
 typedef enum _openxc_DiagnosticRequest_DecodedType {
     openxc_DiagnosticRequest_DecodedType_NONE = 1,
     openxc_DiagnosticRequest_DecodedType_OBD2 = 2
@@ -59,6 +73,10 @@ typedef enum _openxc_DynamicField_Type {
 } openxc_DynamicField_Type;
 
 /* Struct definitions */
+typedef struct _openxc_NetworkDataSettings {
+    pb_callback_t APN;
+} openxc_NetworkDataSettings;
+
 typedef struct _openxc_AcceptanceFilterBypassCommand {
     bool has_bus;
     int32_t bus;
@@ -143,6 +161,13 @@ typedef struct _openxc_DynamicField {
     bool boolean_value;
 } openxc_DynamicField;
 
+typedef struct _openxc_NetworkOperatorSettings_NetworkDescriptor {
+    bool has_PLMN;
+    uint32_t PLMN;
+    bool has_networkType;
+    openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType networkType;
+} openxc_NetworkOperatorSettings_NetworkDescriptor;
+
 typedef struct _openxc_PassthroughModeControlCommand {
     bool has_bus;
     int32_t bus;
@@ -160,6 +185,13 @@ typedef struct _openxc_PredefinedObd2RequestsCommand {
     bool enabled;
 } openxc_PredefinedObd2RequestsCommand;
 
+typedef struct _openxc_ServerConnectSettings {
+    bool has_host;
+    char host[128];
+    bool has_port;
+    uint32_t port;
+} openxc_ServerConnectSettings;
+
 typedef struct _openxc_DiagnosticControlCommand {
     bool has_request;
     openxc_DiagnosticRequest request;
@@ -167,6 +199,15 @@ typedef struct _openxc_DiagnosticControlCommand {
     openxc_DiagnosticControlCommand_Action action;
 } openxc_DiagnosticControlCommand;
 
+typedef struct _openxc_NetworkOperatorSettings {
+    bool has_allowDataRoaming;
+    bool allowDataRoaming;
+    bool has_operatorSelectMode;
+    openxc_NetworkOperatorSettings_OperatorSelectMode operatorSelectMode;
+    bool has_networkDescriptor;
+    openxc_NetworkOperatorSettings_NetworkDescriptor networkDescriptor;
+} openxc_NetworkOperatorSettings;
+
 typedef struct _openxc_SimpleMessage {
     bool has_name;
     char name[100];
@@ -176,6 +217,15 @@ typedef struct _openxc_SimpleMessage {
     openxc_DynamicField event;
 } openxc_SimpleMessage;
 
+typedef struct _openxc_ModemConfigurationCommand {
+    bool has_networkOperatorSettings;
+    openxc_NetworkOperatorSettings networkOperatorSettings;
+    bool has_networkDataSettings;
+    openxc_NetworkDataSettings networkDataSettings;
+    bool has_serverConnectSettings;
+    openxc_ServerConnectSettings serverConnectSettings;
+} openxc_ModemConfigurationCommand;
+
 typedef struct _openxc_ControlCommand {
     bool has_type;
     openxc_ControlCommand_Type type;
@@ -189,6 +239,8 @@ typedef struct _openxc_ControlCommand {
     openxc_PayloadFormatCommand payload_format_command;
     bool has_predefined_obd2_requests_command;
     openxc_PredefinedObd2RequestsCommand predefined_obd2_requests_command;
+    bool has_modem_configuration_command;
+    openxc_ModemConfigurationCommand modem_configuration_command;
 } openxc_ControlCommand;
 
 typedef struct _openxc_VehicleMessage {
@@ -204,32 +256,44 @@ typedef struct _openxc_VehicleMessage {
     openxc_ControlCommand control_command;
     bool has_command_response;
     openxc_CommandResponse command_response;
+    bool has_uptime;
+    uint32_t uptime;
 } openxc_VehicleMessage;
 
 /* Default values for struct fields */
 
 /* Initializer values for message structs */
-#define openxc_VehicleMessage_init_default       {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_default, false, openxc_SimpleMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
+#define openxc_VehicleMessage_init_default       {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_default, false, openxc_SimpleMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default, false, 0}
 #define openxc_CanMessage_init_default           {false, 0, false, 0, false, {0, {0}}, false, (openxc_CanMessage_FrameFormat)0}
-#define openxc_ControlCommand_init_default       {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_PayloadFormatCommand_init_default, false, openxc_PredefinedObd2RequestsCommand_init_default}
+#define openxc_ControlCommand_init_default       {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_PayloadFormatCommand_init_default, false, openxc_PredefinedObd2RequestsCommand_init_default, false, openxc_ModemConfigurationCommand_init_default}
 #define openxc_DiagnosticControlCommand_init_default {false, openxc_DiagnosticRequest_init_default, false, (openxc_DiagnosticControlCommand_Action)0}
 #define openxc_PassthroughModeControlCommand_init_default {false, 0, false, 0}
 #define openxc_AcceptanceFilterBypassCommand_init_default {false, 0, false, 0}
 #define openxc_PayloadFormatCommand_init_default {false, (openxc_PayloadFormatCommand_PayloadFormat)0}
 #define openxc_PredefinedObd2RequestsCommand_init_default {false, 0}
+#define openxc_NetworkOperatorSettings_init_default {false, 0, false, (openxc_NetworkOperatorSettings_OperatorSelectMode)0, false, openxc_NetworkOperatorSettings_NetworkDescriptor_init_default}
+#define openxc_NetworkOperatorSettings_NetworkDescriptor_init_default {false, 0, false, (openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType)0}
+#define openxc_NetworkDataSettings_init_default  {{{NULL}, NULL}}
+#define openxc_ServerConnectSettings_init_default {false, "", false, 0}
+#define openxc_ModemConfigurationCommand_init_default {false, openxc_NetworkOperatorSettings_init_default, false, openxc_NetworkDataSettings_init_default, false, openxc_ServerConnectSettings_init_default}
 #define openxc_CommandResponse_init_default      {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
 #define openxc_DiagnosticRequest_init_default    {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
 #define openxc_DiagnosticResponse_init_default   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
 #define openxc_DynamicField_init_default         {false, (openxc_DynamicField_Type)0, false, "", false, 0, false, 0}
 #define openxc_SimpleMessage_init_default        {false, "", false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
-#define openxc_VehicleMessage_init_zero          {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_zero, false, openxc_SimpleMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
+#define openxc_VehicleMessage_init_zero          {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_zero, false, openxc_SimpleMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero, false, 0}
 #define openxc_CanMessage_init_zero              {false, 0, false, 0, false, {0, {0}}, false, (openxc_CanMessage_FrameFormat)0}
-#define openxc_ControlCommand_init_zero          {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero, false, openxc_AcceptanceFilterBypassCommand_init_zero, false, openxc_PayloadFormatCommand_init_zero, false, openxc_PredefinedObd2RequestsCommand_init_zero}
+#define openxc_ControlCommand_init_zero          {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero, false, openxc_AcceptanceFilterBypassCommand_init_zero, false, openxc_PayloadFormatCommand_init_zero, false, openxc_PredefinedObd2RequestsCommand_init_zero, false, openxc_ModemConfigurationCommand_init_zero}
 #define openxc_DiagnosticControlCommand_init_zero {false, openxc_DiagnosticRequest_init_zero, false, (openxc_DiagnosticControlCommand_Action)0}
 #define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, 0}
 #define openxc_AcceptanceFilterBypassCommand_init_zero {false, 0, false, 0}
 #define openxc_PayloadFormatCommand_init_zero    {false, (openxc_PayloadFormatCommand_PayloadFormat)0}
 #define openxc_PredefinedObd2RequestsCommand_init_zero {false, 0}
+#define openxc_NetworkOperatorSettings_init_zero {false, 0, false, (openxc_NetworkOperatorSettings_OperatorSelectMode)0, false, openxc_NetworkOperatorSettings_NetworkDescriptor_init_zero}
+#define openxc_NetworkOperatorSettings_NetworkDescriptor_init_zero {false, 0, false, (openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType)0}
+#define openxc_NetworkDataSettings_init_zero     {{{NULL}, NULL}}
+#define openxc_ServerConnectSettings_init_zero   {false, "", false, 0}
+#define openxc_ModemConfigurationCommand_init_zero {false, openxc_NetworkOperatorSettings_init_zero, false, openxc_NetworkDataSettings_init_zero, false, openxc_ServerConnectSettings_init_zero}
 #define openxc_CommandResponse_init_zero         {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
 #define openxc_DiagnosticRequest_init_zero       {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
 #define openxc_DiagnosticResponse_init_zero      {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
@@ -237,6 +301,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_SimpleMessage_init_zero           {false, "", false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
+#define openxc_NetworkDataSettings_APN_tag       1
 #define openxc_AcceptanceFilterBypassCommand_bus_tag 1
 #define openxc_AcceptanceFilterBypassCommand_bypass_tag 2
 #define openxc_CanMessage_bus_tag                1
@@ -267,37 +332,54 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DynamicField_string_value_tag     2
 #define openxc_DynamicField_numeric_value_tag    3
 #define openxc_DynamicField_boolean_value_tag    4
+#define openxc_NetworkOperatorSettings_NetworkDescriptor_PLMN_tag 1
+#define openxc_NetworkOperatorSettings_NetworkDescriptor_networkType_tag 2
 #define openxc_PassthroughModeControlCommand_bus_tag 1
 #define openxc_PassthroughModeControlCommand_enabled_tag 2
 #define openxc_PayloadFormatCommand_format_tag   1
 #define openxc_PredefinedObd2RequestsCommand_enabled_tag 1
+#define openxc_ServerConnectSettings_host_tag    1
+#define openxc_ServerConnectSettings_port_tag    2
 #define openxc_DiagnosticControlCommand_request_tag 1
 #define openxc_DiagnosticControlCommand_action_tag 2
+#define openxc_NetworkOperatorSettings_allowDataRoaming_tag 1
+#define openxc_NetworkOperatorSettings_operatorSelectMode_tag 2
+#define openxc_NetworkOperatorSettings_networkDescriptor_tag 3
 #define openxc_SimpleMessage_name_tag            1
 #define openxc_SimpleMessage_value_tag           2
 #define openxc_SimpleMessage_event_tag           3
+#define openxc_ModemConfigurationCommand_networkOperatorSettings_tag 1
+#define openxc_ModemConfigurationCommand_networkDataSettings_tag 2
+#define openxc_ModemConfigurationCommand_serverConnectSettings_tag 3
 #define openxc_ControlCommand_type_tag           1
 #define openxc_ControlCommand_diagnostic_request_tag 2
 #define openxc_ControlCommand_passthrough_mode_request_tag 3
 #define openxc_ControlCommand_acceptance_filter_bypass_command_tag 4
 #define openxc_ControlCommand_payload_format_command_tag 5
 #define openxc_ControlCommand_predefined_obd2_requests_command_tag 6
+#define openxc_ControlCommand_modem_configuration_command_tag 7
 #define openxc_VehicleMessage_type_tag           1
 #define openxc_VehicleMessage_can_message_tag    2
 #define openxc_VehicleMessage_simple_message_tag 3
 #define openxc_VehicleMessage_diagnostic_response_tag 4
 #define openxc_VehicleMessage_control_command_tag 5
 #define openxc_VehicleMessage_command_response_tag 6
+#define openxc_VehicleMessage_uptime_tag         7
 
 /* Struct field encoding specification for nanopb */
-extern const pb_field_t openxc_VehicleMessage_fields[7];
+extern const pb_field_t openxc_VehicleMessage_fields[8];
 extern const pb_field_t openxc_CanMessage_fields[5];
-extern const pb_field_t openxc_ControlCommand_fields[7];
+extern const pb_field_t openxc_ControlCommand_fields[8];
 extern const pb_field_t openxc_DiagnosticControlCommand_fields[3];
 extern const pb_field_t openxc_PassthroughModeControlCommand_fields[3];
 extern const pb_field_t openxc_AcceptanceFilterBypassCommand_fields[3];
 extern const pb_field_t openxc_PayloadFormatCommand_fields[2];
 extern const pb_field_t openxc_PredefinedObd2RequestsCommand_fields[2];
+extern const pb_field_t openxc_NetworkOperatorSettings_fields[4];
+extern const pb_field_t openxc_NetworkOperatorSettings_NetworkDescriptor_fields[3];
+extern const pb_field_t openxc_NetworkDataSettings_fields[2];
+extern const pb_field_t openxc_ServerConnectSettings_fields[3];
+extern const pb_field_t openxc_ModemConfigurationCommand_fields[4];
 extern const pb_field_t openxc_CommandResponse_fields[4];
 extern const pb_field_t openxc_DiagnosticRequest_fields[10];
 extern const pb_field_t openxc_DiagnosticResponse_fields[9];
@@ -305,14 +387,15 @@ extern const pb_field_t openxc_DynamicField_fields[5];
 extern const pb_field_t openxc_SimpleMessage_fields[4];
 
 /* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size               716
 #define openxc_CanMessage_size                   33
-#define openxc_ControlCommand_size               126
 #define openxc_DiagnosticControlCommand_size     76
 #define openxc_PassthroughModeControlCommand_size 13
 #define openxc_AcceptanceFilterBypassCommand_size 13
 #define openxc_PayloadFormatCommand_size         6
 #define openxc_PredefinedObd2RequestsCommand_size 2
+#define openxc_NetworkOperatorSettings_size      22
+#define openxc_NetworkOperatorSettings_NetworkDescriptor_size 12
+#define openxc_ServerConnectSettings_size        137
 #define openxc_CommandResponse_size              139
 #define openxc_DiagnosticRequest_size            68
 #define openxc_DiagnosticResponse_size           56