Merge branch 'messagepackadditions' of https://github.com/openxc/openxc-message-format into HEAD

7 files changed, 6707 insertions, 2915 deletions

diff --git a/README.md b/README.md
index 2daec602..0597fc42 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,13 @@ method (any protobuf library should support this).
 The binary format is best if you need to maximize the amount of data that can be
 sent from the VI, trading off flexibility for efficiency.
 
+## Message Pack
+MessagePack is an efficient binary serialization format. It lets you exchange data
+among multiple languages like JSON. But it's faster and smaller. Small integers are 
+encoded into a single byte, and typical short strings require only one extra byte
+in addition to the strings themselves
+For protocol specification visit https://github.com/msgpack/msgpack/blob/master/spec.md
+
 ## Trace File Format
 
 An OpenXC vehicle trace file is a plaintext file that contains JSON objects,
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 28afa0b9..20543fe9 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 ed4609db..c15a218d 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 Tue Dec  2 03:06:57 2014. */
+/* Generated by nanopb-0.3.1 at Wed Dec  9 21:31:24 2015. */
 
 #include "openxc.pb.h"
 
@@ -16,7 +16,7 @@ const pb_field_t openxc_VehicleMessage_fields[8] = {
     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_FIELD(  7, UINT64  , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, timestamp, command_response, 0),
     PB_LAST_FIELD
 };
 
@@ -28,7 +28,7 @@ const pb_field_t openxc_CanMessage_fields[5] = {
     PB_LAST_FIELD
 };
 
-const pb_field_t openxc_ControlCommand_fields[8] = {
+const pb_field_t openxc_ControlCommand_fields[9] = {
     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),
@@ -36,6 +36,7 @@ const pb_field_t openxc_ControlCommand_fields[8] = {
     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_FIELD(  8, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, rtc_configuration_command, modem_configuration_command, &openxc_RTCConfigurationCommand_fields),
     PB_LAST_FIELD
 };
 
@@ -98,6 +99,11 @@ const pb_field_t openxc_ModemConfigurationCommand_fields[4] = {
     PB_LAST_FIELD
 };
 
+const pb_field_t openxc_RTCConfigurationCommand_fields[2] = {
+    PB_FIELD(  1, UINT32  , OPTIONAL, STATIC  , FIRST, openxc_RTCConfigurationCommand, unix_time, unix_time, 0),
+    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),
@@ -155,7 +161,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_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)
+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_ControlCommand, rtc_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_RTCConfigurationCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_SimpleMessage)
 #endif
 
 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
@@ -166,7 +172,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_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)
+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_ControlCommand, rtc_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_RTCConfigurationCommand_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 2975d4d9..17bb77d4 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 Tue Dec  2 03:06:57 2014. */
+/* Generated by nanopb-0.3.1 at Wed Dec  9 21:31:24 2015. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -35,7 +35,9 @@ typedef enum _openxc_ControlCommand_Type {
     openxc_ControlCommand_Type_ACCEPTANCE_FILTER_BYPASS = 5,
     openxc_ControlCommand_Type_PAYLOAD_FORMAT = 6,
     openxc_ControlCommand_Type_PREDEFINED_OBD2_REQUESTS = 7,
-    openxc_ControlCommand_Type_MODEM_CONFIGURATION = 8
+    openxc_ControlCommand_Type_MODEM_CONFIGURATION = 8,
+    openxc_ControlCommand_Type_RTC_CONFIGURATION = 9,
+    openxc_ControlCommand_Type_SD_MOUNT_STATUS = 10
 } openxc_ControlCommand_Type;
 
 typedef enum _openxc_DiagnosticControlCommand_Action {
@@ -45,7 +47,8 @@ typedef enum _openxc_DiagnosticControlCommand_Action {
 
 typedef enum _openxc_PayloadFormatCommand_PayloadFormat {
     openxc_PayloadFormatCommand_PayloadFormat_JSON = 1,
-    openxc_PayloadFormatCommand_PayloadFormat_PROTOBUF = 2
+    openxc_PayloadFormatCommand_PayloadFormat_PROTOBUF = 2,
+    openxc_PayloadFormatCommand_PayloadFormat_MESSAGEPACK = 3
 } openxc_PayloadFormatCommand_PayloadFormat;
 
 typedef enum _openxc_NetworkOperatorSettings_OperatorSelectMode {
@@ -185,6 +188,11 @@ typedef struct _openxc_PredefinedObd2RequestsCommand {
     bool enabled;
 } openxc_PredefinedObd2RequestsCommand;
 
+typedef struct _openxc_RTCConfigurationCommand {
+    bool has_unix_time;
+    uint32_t unix_time;
+} openxc_RTCConfigurationCommand;
+
 typedef struct _openxc_ServerConnectSettings {
     bool has_host;
     char host[128];
@@ -241,6 +249,8 @@ typedef struct _openxc_ControlCommand {
     openxc_PredefinedObd2RequestsCommand predefined_obd2_requests_command;
     bool has_modem_configuration_command;
     openxc_ModemConfigurationCommand modem_configuration_command;
+    bool has_rtc_configuration_command;
+    openxc_RTCConfigurationCommand rtc_configuration_command;
 } openxc_ControlCommand;
 
 typedef struct _openxc_VehicleMessage {
@@ -256,8 +266,8 @@ typedef struct _openxc_VehicleMessage {
     openxc_ControlCommand control_command;
     bool has_command_response;
     openxc_CommandResponse command_response;
-    bool has_uptime;
-    uint32_t uptime;
+    bool has_timestamp;
+    uint64_t timestamp;
 } openxc_VehicleMessage;
 
 /* Default values for struct fields */
@@ -265,7 +275,7 @@ typedef struct _openxc_VehicleMessage {
 /* 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, 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, false, openxc_ModemConfigurationCommand_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, false, openxc_RTCConfigurationCommand_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}
@@ -276,6 +286,7 @@ typedef struct _openxc_VehicleMessage {
 #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_RTCConfigurationCommand_init_default {false, 0}
 #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}
@@ -283,7 +294,7 @@ typedef struct _openxc_VehicleMessage {
 #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, 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, false, openxc_ModemConfigurationCommand_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, false, openxc_RTCConfigurationCommand_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}
@@ -294,6 +305,7 @@ typedef struct _openxc_VehicleMessage {
 #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_RTCConfigurationCommand_init_zero {false, 0}
 #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}
@@ -338,6 +350,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_PassthroughModeControlCommand_enabled_tag 2
 #define openxc_PayloadFormatCommand_format_tag   1
 #define openxc_PredefinedObd2RequestsCommand_enabled_tag 1
+#define openxc_RTCConfigurationCommand_unix_time_tag 1
 #define openxc_ServerConnectSettings_host_tag    1
 #define openxc_ServerConnectSettings_port_tag    2
 #define openxc_DiagnosticControlCommand_request_tag 1
@@ -358,18 +371,19 @@ typedef struct _openxc_VehicleMessage {
 #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_ControlCommand_rtc_configuration_command_tag 8
 #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
+#define openxc_VehicleMessage_timestamp_tag      7
 
 /* Struct field encoding specification for nanopb */
 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[8];
+extern const pb_field_t openxc_ControlCommand_fields[9];
 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];
@@ -380,6 +394,7 @@ extern const pb_field_t openxc_NetworkOperatorSettings_NetworkDescriptor_fields[
 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_RTCConfigurationCommand_fields[2];
 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];
@@ -396,6 +411,7 @@ extern const pb_field_t openxc_SimpleMessage_fields[4];
 #define openxc_NetworkOperatorSettings_size      22
 #define openxc_NetworkOperatorSettings_NetworkDescriptor_size 12
 #define openxc_ServerConnectSettings_size        137
+#define openxc_RTCConfigurationCommand_size      6
 #define openxc_CommandResponse_size              139
 #define openxc_DiagnosticRequest_size            68
 #define openxc_DiagnosticResponse_size           56
diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index ef02ba8f..bd84bd14 100644
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -10,86 +10,319 @@ public final class BinaryMessages {
   }
   public interface VehicleMessageOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional .openxc.VehicleMessage.Type type = 1;
+    /**
+     * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+     */
     boolean hasType();
+    /**
+     * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+     */
     com.openxc.BinaryMessages.VehicleMessage.Type getType();
-    
+
     // optional .openxc.CanMessage can_message = 2;
+    /**
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
+     */
     boolean hasCanMessage();
+    /**
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
+     */
     com.openxc.BinaryMessages.CanMessage getCanMessage();
+    /**
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
+     */
     com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder();
-    
+
     // optional .openxc.SimpleMessage simple_message = 3;
+    /**
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+     */
     boolean hasSimpleMessage();
+    /**
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+     */
     com.openxc.BinaryMessages.SimpleMessage getSimpleMessage();
+    /**
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+     */
     com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder();
-    
+
     // optional .openxc.DiagnosticResponse diagnostic_response = 4;
+    /**
+     * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+     */
     boolean hasDiagnosticResponse();
+    /**
+     * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse();
+    /**
+     * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder();
-    
+
     // optional .openxc.ControlCommand control_command = 5;
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
     boolean hasControlCommand();
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
     com.openxc.BinaryMessages.ControlCommand getControlCommand();
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
     com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder();
-    
+
     // optional .openxc.CommandResponse command_response = 6;
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
     boolean hasCommandResponse();
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
     com.openxc.BinaryMessages.CommandResponse getCommandResponse();
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
     com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder();
-    
-    // optional uint32 uptime = 7;
-    boolean hasUptime();
-    int getUptime();
+
+    // optional uint64 timestamp = 7;
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    boolean hasTimestamp();
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    long getTimestamp();
   }
+  /**
+   * Protobuf type {@code openxc.VehicleMessage}
+   */
   public static final class VehicleMessage extends
       com.google.protobuf.GeneratedMessage
       implements VehicleMessageOrBuilder {
     // Use VehicleMessage.newBuilder() to construct.
-    private VehicleMessage(Builder builder) {
+    private VehicleMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private VehicleMessage(boolean noInit) {}
-    
+    private VehicleMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final VehicleMessage defaultInstance;
     public static VehicleMessage getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public VehicleMessage getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private VehicleMessage(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.VehicleMessage.Type value = com.openxc.BinaryMessages.VehicleMessage.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
+              break;
+            }
+            case 18: {
+              com.openxc.BinaryMessages.CanMessage.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000002) == 0x00000002)) {
+                subBuilder = canMessage_.toBuilder();
+              }
+              canMessage_ = input.readMessage(com.openxc.BinaryMessages.CanMessage.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(canMessage_);
+                canMessage_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000002;
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.SimpleMessage.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = simpleMessage_.toBuilder();
+              }
+              simpleMessage_ = input.readMessage(com.openxc.BinaryMessages.SimpleMessage.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(simpleMessage_);
+                simpleMessage_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              break;
+            }
+            case 34: {
+              com.openxc.BinaryMessages.DiagnosticResponse.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000008) == 0x00000008)) {
+                subBuilder = diagnosticResponse_.toBuilder();
+              }
+              diagnosticResponse_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticResponse.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(diagnosticResponse_);
+                diagnosticResponse_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000008;
+              break;
+            }
+            case 42: {
+              com.openxc.BinaryMessages.ControlCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000010) == 0x00000010)) {
+                subBuilder = controlCommand_.toBuilder();
+              }
+              controlCommand_ = input.readMessage(com.openxc.BinaryMessages.ControlCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(controlCommand_);
+                controlCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000010;
+              break;
+            }
+            case 50: {
+              com.openxc.BinaryMessages.CommandResponse.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000020) == 0x00000020)) {
+                subBuilder = commandResponse_.toBuilder();
+              }
+              commandResponse_ = input.readMessage(com.openxc.BinaryMessages.CommandResponse.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(commandResponse_);
+                commandResponse_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000020;
+              break;
+            }
+            case 56: {
+              bitField0_ |= 0x00000040;
+              timestamp_ = input.readUInt64();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.VehicleMessage.class, com.openxc.BinaryMessages.VehicleMessage.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<VehicleMessage> PARSER =
+        new com.google.protobuf.AbstractParser<VehicleMessage>() {
+      public VehicleMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new VehicleMessage(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<VehicleMessage> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.VehicleMessage.Type}
+     */
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>CAN = 1;</code>
+       */
       CAN(0, 1),
+      /**
+       * <code>SIMPLE = 2;</code>
+       */
       SIMPLE(1, 2),
+      /**
+       * <code>DIAGNOSTIC = 3;</code>
+       */
       DIAGNOSTIC(2, 3),
+      /**
+       * <code>CONTROL_COMMAND = 4;</code>
+       */
       CONTROL_COMMAND(3, 4),
+      /**
+       * <code>COMMAND_RESPONSE = 5;</code>
+       */
       COMMAND_RESPONSE(4, 5),
       ;
-      
+
+      /**
+       * <code>CAN = 1;</code>
+       */
       public static final int CAN_VALUE = 1;
+      /**
+       * <code>SIMPLE = 2;</code>
+       */
       public static final int SIMPLE_VALUE = 2;
+      /**
+       * <code>DIAGNOSTIC = 3;</code>
+       */
       public static final int DIAGNOSTIC_VALUE = 3;
+      /**
+       * <code>CONTROL_COMMAND = 4;</code>
+       */
       public static final int CONTROL_COMMAND_VALUE = 4;
+      /**
+       * <code>COMMAND_RESPONSE = 5;</code>
+       */
       public static final int COMMAND_RESPONSE_VALUE = 5;
-      
-      
+
+
       public final int getNumber() { return value; }
-      
+
       public static Type valueOf(int value) {
         switch (value) {
           case 1: return CAN;
@@ -100,7 +333,7 @@ public final class BinaryMessages {
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<Type>
           internalGetValueMap() {
         return internalValueMap;
@@ -112,7 +345,7 @@ public final class BinaryMessages {
                 return Type.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -125,11 +358,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.VehicleMessage.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final Type[] VALUES = {
-        CAN, SIMPLE, DIAGNOSTIC, CONTROL_COMMAND, COMMAND_RESPONSE, 
-      };
-      
+
+      private static final Type[] VALUES = values();
+
       public static Type valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -138,104 +369,161 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private Type(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.VehicleMessage.Type)
     }
-    
+
     private int bitField0_;
     // optional .openxc.VehicleMessage.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private com.openxc.BinaryMessages.VehicleMessage.Type type_;
+    /**
+     * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+     */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+     */
     public com.openxc.BinaryMessages.VehicleMessage.Type getType() {
       return type_;
     }
-    
+
     // optional .openxc.CanMessage can_message = 2;
     public static final int CAN_MESSAGE_FIELD_NUMBER = 2;
     private com.openxc.BinaryMessages.CanMessage canMessage_;
+    /**
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
+     */
     public boolean hasCanMessage() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
+     */
     public com.openxc.BinaryMessages.CanMessage getCanMessage() {
       return canMessage_;
     }
+    /**
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
+     */
     public com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder() {
       return canMessage_;
     }
-    
+
     // optional .openxc.SimpleMessage simple_message = 3;
     public static final int SIMPLE_MESSAGE_FIELD_NUMBER = 3;
     private com.openxc.BinaryMessages.SimpleMessage simpleMessage_;
+    /**
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+     */
     public boolean hasSimpleMessage() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+     */
     public com.openxc.BinaryMessages.SimpleMessage getSimpleMessage() {
       return simpleMessage_;
     }
+    /**
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+     */
     public com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder() {
       return simpleMessage_;
     }
-    
+
     // optional .openxc.DiagnosticResponse diagnostic_response = 4;
     public static final int DIAGNOSTIC_RESPONSE_FIELD_NUMBER = 4;
     private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_;
+    /**
+     * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+     */
     public boolean hasDiagnosticResponse() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
+    /**
+     * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() {
       return diagnosticResponse_;
     }
+    /**
+     * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() {
       return diagnosticResponse_;
     }
-    
+
     // optional .openxc.ControlCommand control_command = 5;
     public static final int CONTROL_COMMAND_FIELD_NUMBER = 5;
     private com.openxc.BinaryMessages.ControlCommand controlCommand_;
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
     public boolean hasControlCommand() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
     public com.openxc.BinaryMessages.ControlCommand getControlCommand() {
       return controlCommand_;
     }
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
     public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() {
       return controlCommand_;
     }
-    
+
     // optional .openxc.CommandResponse command_response = 6;
     public static final int COMMAND_RESPONSE_FIELD_NUMBER = 6;
     private com.openxc.BinaryMessages.CommandResponse commandResponse_;
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
     public boolean hasCommandResponse() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
     public com.openxc.BinaryMessages.CommandResponse getCommandResponse() {
       return commandResponse_;
     }
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
     public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() {
       return commandResponse_;
     }
-    
-    // optional uint32 uptime = 7;
-    public static final int UPTIME_FIELD_NUMBER = 7;
-    private int uptime_;
-    public boolean hasUptime() {
+
+    // optional uint64 timestamp = 7;
+    public static final int TIMESTAMP_FIELD_NUMBER = 7;
+    private long timestamp_;
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
-    public int getUptime() {
-      return uptime_;
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    public long getTimestamp() {
+      return timestamp_;
     }
-    
+
     private void initFields() {
       type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
       canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
@@ -243,17 +531,17 @@ public final class BinaryMessages {
       diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
       controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
       commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
-      uptime_ = 0;
+      timestamp_ = 0L;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -276,16 +564,16 @@ public final class BinaryMessages {
         output.writeMessage(6, commandResponse_);
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        output.writeUInt32(7, uptime_);
+        output.writeUInt64(7, timestamp_);
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -313,100 +601,89 @@ public final class BinaryMessages {
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, uptime_);
+          .computeUInt64Size(7, timestamp_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.VehicleMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.VehicleMessage}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.VehicleMessageOrBuilder {
@@ -414,18 +691,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.VehicleMessage.class, com.openxc.BinaryMessages.VehicleMessage.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.VehicleMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -441,7 +721,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
@@ -476,24 +756,24 @@ public final class BinaryMessages {
           commandResponseBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000020);
-        uptime_ = 0;
+        timestamp_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.VehicleMessage.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.VehicleMessage getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.VehicleMessage.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.VehicleMessage build() {
         com.openxc.BinaryMessages.VehicleMessage result = buildPartial();
         if (!result.isInitialized()) {
@@ -501,17 +781,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.VehicleMessage buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.VehicleMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.VehicleMessage buildPartial() {
         com.openxc.BinaryMessages.VehicleMessage result = new com.openxc.BinaryMessages.VehicleMessage(this);
         int from_bitField0_ = bitField0_;
@@ -563,12 +833,12 @@ public final class BinaryMessages {
         if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
           to_bitField0_ |= 0x00000040;
         }
-        result.uptime_ = uptime_;
+        result.timestamp_ = timestamp_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.VehicleMessage) {
           return mergeFrom((com.openxc.BinaryMessages.VehicleMessage)other);
@@ -577,7 +847,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.VehicleMessage other) {
         if (other == com.openxc.BinaryMessages.VehicleMessage.getDefaultInstance()) return this;
         if (other.hasType()) {
@@ -598,115 +868,53 @@ public final class BinaryMessages {
         if (other.hasCommandResponse()) {
           mergeCommandResponse(other.getCommandResponse());
         }
-        if (other.hasUptime()) {
-          setUptime(other.getUptime());
+        if (other.hasTimestamp()) {
+          setTimestamp(other.getTimestamp());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.VehicleMessage.Type value = com.openxc.BinaryMessages.VehicleMessage.Type.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = value;
-              }
-              break;
-            }
-            case 18: {
-              com.openxc.BinaryMessages.CanMessage.Builder subBuilder = com.openxc.BinaryMessages.CanMessage.newBuilder();
-              if (hasCanMessage()) {
-                subBuilder.mergeFrom(getCanMessage());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setCanMessage(subBuilder.buildPartial());
-              break;
-            }
-            case 26: {
-              com.openxc.BinaryMessages.SimpleMessage.Builder subBuilder = com.openxc.BinaryMessages.SimpleMessage.newBuilder();
-              if (hasSimpleMessage()) {
-                subBuilder.mergeFrom(getSimpleMessage());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setSimpleMessage(subBuilder.buildPartial());
-              break;
-            }
-            case 34: {
-              com.openxc.BinaryMessages.DiagnosticResponse.Builder subBuilder = com.openxc.BinaryMessages.DiagnosticResponse.newBuilder();
-              if (hasDiagnosticResponse()) {
-                subBuilder.mergeFrom(getDiagnosticResponse());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setDiagnosticResponse(subBuilder.buildPartial());
-              break;
-            }
-            case 42: {
-              com.openxc.BinaryMessages.ControlCommand.Builder subBuilder = com.openxc.BinaryMessages.ControlCommand.newBuilder();
-              if (hasControlCommand()) {
-                subBuilder.mergeFrom(getControlCommand());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setControlCommand(subBuilder.buildPartial());
-              break;
-            }
-            case 50: {
-              com.openxc.BinaryMessages.CommandResponse.Builder subBuilder = com.openxc.BinaryMessages.CommandResponse.newBuilder();
-              if (hasCommandResponse()) {
-                subBuilder.mergeFrom(getCommandResponse());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setCommandResponse(subBuilder.buildPartial());
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              uptime_ = input.readUInt32();
-              break;
-            }
+        com.openxc.BinaryMessages.VehicleMessage parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.VehicleMessage) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional .openxc.VehicleMessage.Type type = 1;
       private com.openxc.BinaryMessages.VehicleMessage.Type type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
+      /**
+       * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+       */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+       */
       public com.openxc.BinaryMessages.VehicleMessage.Type getType() {
         return type_;
       }
+      /**
+       * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+       */
       public Builder setType(com.openxc.BinaryMessages.VehicleMessage.Type value) {
         if (value == null) {
           throw new NullPointerException();
@@ -716,20 +924,29 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
+       */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
         type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
         onChanged();
         return this;
       }
-      
+
       // optional .openxc.CanMessage can_message = 2;
       private com.openxc.BinaryMessages.CanMessage canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.CanMessage, com.openxc.BinaryMessages.CanMessage.Builder, com.openxc.BinaryMessages.CanMessageOrBuilder> canMessageBuilder_;
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public boolean hasCanMessage() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public com.openxc.BinaryMessages.CanMessage getCanMessage() {
         if (canMessageBuilder_ == null) {
           return canMessage_;
@@ -737,6 +954,9 @@ public final class BinaryMessages {
           return canMessageBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public Builder setCanMessage(com.openxc.BinaryMessages.CanMessage value) {
         if (canMessageBuilder_ == null) {
           if (value == null) {
@@ -750,6 +970,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public Builder setCanMessage(
           com.openxc.BinaryMessages.CanMessage.Builder builderForValue) {
         if (canMessageBuilder_ == null) {
@@ -761,6 +984,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public Builder mergeCanMessage(com.openxc.BinaryMessages.CanMessage value) {
         if (canMessageBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
@@ -777,6 +1003,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public Builder clearCanMessage() {
         if (canMessageBuilder_ == null) {
           canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
@@ -787,11 +1016,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public com.openxc.BinaryMessages.CanMessage.Builder getCanMessageBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getCanMessageFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       public com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder() {
         if (canMessageBuilder_ != null) {
           return canMessageBuilder_.getMessageOrBuilder();
@@ -799,6 +1034,9 @@ public final class BinaryMessages {
           return canMessage_;
         }
       }
+      /**
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.CanMessage, com.openxc.BinaryMessages.CanMessage.Builder, com.openxc.BinaryMessages.CanMessageOrBuilder> 
           getCanMessageFieldBuilder() {
@@ -812,14 +1050,20 @@ public final class BinaryMessages {
         }
         return canMessageBuilder_;
       }
-      
+
       // optional .openxc.SimpleMessage simple_message = 3;
       private com.openxc.BinaryMessages.SimpleMessage simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.SimpleMessage, com.openxc.BinaryMessages.SimpleMessage.Builder, com.openxc.BinaryMessages.SimpleMessageOrBuilder> simpleMessageBuilder_;
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public boolean hasSimpleMessage() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public com.openxc.BinaryMessages.SimpleMessage getSimpleMessage() {
         if (simpleMessageBuilder_ == null) {
           return simpleMessage_;
@@ -827,6 +1071,9 @@ public final class BinaryMessages {
           return simpleMessageBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public Builder setSimpleMessage(com.openxc.BinaryMessages.SimpleMessage value) {
         if (simpleMessageBuilder_ == null) {
           if (value == null) {
@@ -840,6 +1087,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public Builder setSimpleMessage(
           com.openxc.BinaryMessages.SimpleMessage.Builder builderForValue) {
         if (simpleMessageBuilder_ == null) {
@@ -851,6 +1101,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public Builder mergeSimpleMessage(com.openxc.BinaryMessages.SimpleMessage value) {
         if (simpleMessageBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -867,6 +1120,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public Builder clearSimpleMessage() {
         if (simpleMessageBuilder_ == null) {
           simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
@@ -877,11 +1133,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public com.openxc.BinaryMessages.SimpleMessage.Builder getSimpleMessageBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getSimpleMessageFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       public com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder() {
         if (simpleMessageBuilder_ != null) {
           return simpleMessageBuilder_.getMessageOrBuilder();
@@ -889,6 +1151,9 @@ public final class BinaryMessages {
           return simpleMessage_;
         }
       }
+      /**
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.SimpleMessage, com.openxc.BinaryMessages.SimpleMessage.Builder, com.openxc.BinaryMessages.SimpleMessageOrBuilder> 
           getSimpleMessageFieldBuilder() {
@@ -902,14 +1167,20 @@ public final class BinaryMessages {
         }
         return simpleMessageBuilder_;
       }
-      
+
       // optional .openxc.DiagnosticResponse diagnostic_response = 4;
       private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder> diagnosticResponseBuilder_;
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public boolean hasDiagnosticResponse() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() {
         if (diagnosticResponseBuilder_ == null) {
           return diagnosticResponse_;
@@ -917,6 +1188,9 @@ public final class BinaryMessages {
           return diagnosticResponseBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public Builder setDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) {
         if (diagnosticResponseBuilder_ == null) {
           if (value == null) {
@@ -930,6 +1204,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000008;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public Builder setDiagnosticResponse(
           com.openxc.BinaryMessages.DiagnosticResponse.Builder builderForValue) {
         if (diagnosticResponseBuilder_ == null) {
@@ -941,6 +1218,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000008;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public Builder mergeDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) {
         if (diagnosticResponseBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
@@ -957,6 +1237,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000008;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public Builder clearDiagnosticResponse() {
         if (diagnosticResponseBuilder_ == null) {
           diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
@@ -967,11 +1250,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticResponse.Builder getDiagnosticResponseBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getDiagnosticResponseFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() {
         if (diagnosticResponseBuilder_ != null) {
           return diagnosticResponseBuilder_.getMessageOrBuilder();
@@ -979,6 +1268,9 @@ public final class BinaryMessages {
           return diagnosticResponse_;
         }
       }
+      /**
+       * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder> 
           getDiagnosticResponseFieldBuilder() {
@@ -992,14 +1284,20 @@ public final class BinaryMessages {
         }
         return diagnosticResponseBuilder_;
       }
-      
+
       // optional .openxc.ControlCommand control_command = 5;
       private com.openxc.BinaryMessages.ControlCommand controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> controlCommandBuilder_;
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public boolean hasControlCommand() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public com.openxc.BinaryMessages.ControlCommand getControlCommand() {
         if (controlCommandBuilder_ == null) {
           return controlCommand_;
@@ -1007,6 +1305,9 @@ public final class BinaryMessages {
           return controlCommandBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public Builder setControlCommand(com.openxc.BinaryMessages.ControlCommand value) {
         if (controlCommandBuilder_ == null) {
           if (value == null) {
@@ -1020,6 +1321,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000010;
         return this;
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public Builder setControlCommand(
           com.openxc.BinaryMessages.ControlCommand.Builder builderForValue) {
         if (controlCommandBuilder_ == null) {
@@ -1031,6 +1335,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000010;
         return this;
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public Builder mergeControlCommand(com.openxc.BinaryMessages.ControlCommand value) {
         if (controlCommandBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
@@ -1047,6 +1354,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000010;
         return this;
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public Builder clearControlCommand() {
         if (controlCommandBuilder_ == null) {
           controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
@@ -1057,11 +1367,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public com.openxc.BinaryMessages.ControlCommand.Builder getControlCommandBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getControlCommandFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() {
         if (controlCommandBuilder_ != null) {
           return controlCommandBuilder_.getMessageOrBuilder();
@@ -1069,6 +1385,9 @@ public final class BinaryMessages {
           return controlCommand_;
         }
       }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> 
           getControlCommandFieldBuilder() {
@@ -1082,14 +1401,20 @@ public final class BinaryMessages {
         }
         return controlCommandBuilder_;
       }
-      
+
       // optional .openxc.CommandResponse command_response = 6;
       private com.openxc.BinaryMessages.CommandResponse commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> commandResponseBuilder_;
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public boolean hasCommandResponse() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public com.openxc.BinaryMessages.CommandResponse getCommandResponse() {
         if (commandResponseBuilder_ == null) {
           return commandResponse_;
@@ -1097,6 +1422,9 @@ public final class BinaryMessages {
           return commandResponseBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public Builder setCommandResponse(com.openxc.BinaryMessages.CommandResponse value) {
         if (commandResponseBuilder_ == null) {
           if (value == null) {
@@ -1110,6 +1438,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000020;
         return this;
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public Builder setCommandResponse(
           com.openxc.BinaryMessages.CommandResponse.Builder builderForValue) {
         if (commandResponseBuilder_ == null) {
@@ -1121,6 +1452,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000020;
         return this;
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public Builder mergeCommandResponse(com.openxc.BinaryMessages.CommandResponse value) {
         if (commandResponseBuilder_ == null) {
           if (((bitField0_ & 0x00000020) == 0x00000020) &&
@@ -1137,6 +1471,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000020;
         return this;
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public Builder clearCommandResponse() {
         if (commandResponseBuilder_ == null) {
           commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
@@ -1147,11 +1484,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public com.openxc.BinaryMessages.CommandResponse.Builder getCommandResponseBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return getCommandResponseFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() {
         if (commandResponseBuilder_ != null) {
           return commandResponseBuilder_.getMessageOrBuilder();
@@ -1159,6 +1502,9 @@ public final class BinaryMessages {
           return commandResponse_;
         }
       }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> 
           getCommandResponseFieldBuilder() {
@@ -1172,98 +1518,237 @@ public final class BinaryMessages {
         }
         return commandResponseBuilder_;
       }
-      
-      // optional uint32 uptime = 7;
-      private int uptime_ ;
-      public boolean hasUptime() {
+
+      // optional uint64 timestamp = 7;
+      private long timestamp_ ;
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
-      public int getUptime() {
-        return uptime_;
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public long getTimestamp() {
+        return timestamp_;
       }
-      public Builder setUptime(int value) {
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public Builder setTimestamp(long value) {
         bitField0_ |= 0x00000040;
-        uptime_ = value;
+        timestamp_ = value;
         onChanged();
         return this;
       }
-      public Builder clearUptime() {
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public Builder clearTimestamp() {
         bitField0_ = (bitField0_ & ~0x00000040);
-        uptime_ = 0;
+        timestamp_ = 0L;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.VehicleMessage)
     }
-    
+
     static {
       defaultInstance = new VehicleMessage(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.VehicleMessage)
   }
-  
+
   public interface CanMessageOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     int getBus();
-    
+
     // optional uint32 id = 2;
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
     boolean hasId();
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
     int getId();
-    
+
     // optional bytes data = 3;
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
     boolean hasData();
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
     com.google.protobuf.ByteString getData();
-    
+
     // optional .openxc.CanMessage.FrameFormat frame_format = 4;
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
     boolean hasFrameFormat();
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
     com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat();
   }
+  /**
+   * Protobuf type {@code openxc.CanMessage}
+   */
   public static final class CanMessage extends
       com.google.protobuf.GeneratedMessage
       implements CanMessageOrBuilder {
     // Use CanMessage.newBuilder() to construct.
-    private CanMessage(Builder builder) {
+    private CanMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private CanMessage(boolean noInit) {}
-    
+    private CanMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final CanMessage defaultInstance;
     public static CanMessage getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public CanMessage getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private CanMessage(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              id_ = input.readUInt32();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              data_ = input.readBytes();
+              break;
+            }
+            case 32: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.CanMessage.FrameFormat value = com.openxc.BinaryMessages.CanMessage.FrameFormat.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(4, rawValue);
+              } else {
+                bitField0_ |= 0x00000008;
+                frameFormat_ = value;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.CanMessage.class, com.openxc.BinaryMessages.CanMessage.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<CanMessage> PARSER =
+        new com.google.protobuf.AbstractParser<CanMessage>() {
+      public CanMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new CanMessage(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<CanMessage> getParserForType() {
+      return PARSER;
     }
-    
+
+    /**
+     * Protobuf enum {@code openxc.CanMessage.FrameFormat}
+     */
     public enum FrameFormat
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>STANDARD = 1;</code>
+       */
       STANDARD(0, 1),
+      /**
+       * <code>EXTENDED = 2;</code>
+       */
       EXTENDED(1, 2),
       ;
-      
+
+      /**
+       * <code>STANDARD = 1;</code>
+       */
       public static final int STANDARD_VALUE = 1;
+      /**
+       * <code>EXTENDED = 2;</code>
+       */
       public static final int EXTENDED_VALUE = 2;
-      
-      
+
+
       public final int getNumber() { return value; }
-      
+
       public static FrameFormat valueOf(int value) {
         switch (value) {
           case 1: return STANDARD;
@@ -1271,7 +1756,7 @@ public final class BinaryMessages {
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<FrameFormat>
           internalGetValueMap() {
         return internalValueMap;
@@ -1283,7 +1768,7 @@ public final class BinaryMessages {
                 return FrameFormat.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -1296,11 +1781,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.CanMessage.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final FrameFormat[] VALUES = {
-        STANDARD, EXTENDED, 
-      };
-      
+
+      private static final FrameFormat[] VALUES = values();
+
       public static FrameFormat valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -1309,59 +1792,83 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private FrameFormat(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.CanMessage.FrameFormat)
     }
-    
+
     private int bitField0_;
     // optional int32 bus = 1;
     public static final int BUS_FIELD_NUMBER = 1;
     private int bus_;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public boolean hasBus() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public int getBus() {
       return bus_;
     }
-    
+
     // optional uint32 id = 2;
     public static final int ID_FIELD_NUMBER = 2;
     private int id_;
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
     public boolean hasId() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
     public int getId() {
       return id_;
     }
-    
+
     // optional bytes data = 3;
     public static final int DATA_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString data_;
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
     public boolean hasData() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
     public com.google.protobuf.ByteString getData() {
       return data_;
     }
-    
+
     // optional .openxc.CanMessage.FrameFormat frame_format = 4;
     public static final int FRAME_FORMAT_FIELD_NUMBER = 4;
     private com.openxc.BinaryMessages.CanMessage.FrameFormat frameFormat_;
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
     public boolean hasFrameFormat() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
     public com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat() {
       return frameFormat_;
     }
-    
+
     private void initFields() {
       bus_ = 0;
       id_ = 0;
@@ -1372,11 +1879,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -1394,12 +1901,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -1421,94 +1928,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.CanMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.CanMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CanMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.CanMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CanMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.CanMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CanMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.CanMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CanMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.CanMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.CanMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.CanMessage}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.CanMessageOrBuilder {
@@ -1516,18 +2012,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.CanMessage.class, com.openxc.BinaryMessages.CanMessage.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.CanMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1538,7 +2037,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         bus_ = 0;
@@ -1551,20 +2050,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.CanMessage.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.CanMessage getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.CanMessage build() {
         com.openxc.BinaryMessages.CanMessage result = buildPartial();
         if (!result.isInitialized()) {
@@ -1572,17 +2071,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.CanMessage buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.CanMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.CanMessage buildPartial() {
         com.openxc.BinaryMessages.CanMessage result = new com.openxc.BinaryMessages.CanMessage(this);
         int from_bitField0_ = bitField0_;
@@ -1607,7 +2096,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.CanMessage) {
           return mergeFrom((com.openxc.BinaryMessages.CanMessage)other);
@@ -1616,7 +2105,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.CanMessage other) {
         if (other == com.openxc.BinaryMessages.CanMessage.getDefaultInstance()) return this;
         if (other.hasBus()) {
@@ -1634,116 +2123,113 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              bus_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              id_ = input.readUInt32();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              data_ = input.readBytes();
-              break;
-            }
-            case 32: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.CanMessage.FrameFormat value = com.openxc.BinaryMessages.CanMessage.FrameFormat.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(4, rawValue);
-              } else {
-                bitField0_ |= 0x00000008;
-                frameFormat_ = value;
-              }
-              break;
-            }
+        com.openxc.BinaryMessages.CanMessage parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.CanMessage) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional int32 bus = 1;
       private int bus_ ;
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public boolean hasBus() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public int getBus() {
         return bus_;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder setBus(int value) {
         bitField0_ |= 0x00000001;
         bus_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder clearBus() {
         bitField0_ = (bitField0_ & ~0x00000001);
         bus_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 id = 2;
       private int id_ ;
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
       public boolean hasId() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
       public int getId() {
         return id_;
       }
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
       public Builder setId(int value) {
         bitField0_ |= 0x00000002;
         id_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
       public Builder clearId() {
         bitField0_ = (bitField0_ & ~0x00000002);
         id_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional bytes data = 3;
       private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
       public boolean hasData() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
       public com.google.protobuf.ByteString getData() {
         return data_;
       }
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
       public Builder setData(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -1753,21 +2239,33 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
       public Builder clearData() {
         bitField0_ = (bitField0_ & ~0x00000004);
         data_ = getDefaultInstance().getData();
         onChanged();
         return this;
       }
-      
+
       // optional .openxc.CanMessage.FrameFormat frame_format = 4;
       private com.openxc.BinaryMessages.CanMessage.FrameFormat frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD;
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
       public boolean hasFrameFormat() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
       public com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat() {
         return frameFormat_;
       }
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
       public Builder setFrameFormat(com.openxc.BinaryMessages.CanMessage.FrameFormat value) {
         if (value == null) {
           throw new NullPointerException();
@@ -1777,113 +2275,421 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
       public Builder clearFrameFormat() {
         bitField0_ = (bitField0_ & ~0x00000008);
         frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.CanMessage)
     }
-    
+
     static {
       defaultInstance = new CanMessage(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.CanMessage)
   }
-  
+
   public interface ControlCommandOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional .openxc.ControlCommand.Type type = 1;
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     boolean hasType();
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     com.openxc.BinaryMessages.ControlCommand.Type getType();
-    
+
     // optional .openxc.DiagnosticControlCommand diagnostic_request = 2;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
     boolean hasDiagnosticRequest();
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest();
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder();
-    
+
     // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
     boolean hasPassthroughModeRequest();
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
     com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest();
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
     com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder();
-    
+
     // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
     boolean hasAcceptanceFilterBypassCommand();
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
     com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand();
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
     com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder();
-    
+
     // optional .openxc.PayloadFormatCommand payload_format_command = 5;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
     boolean hasPayloadFormatCommand();
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
     com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand();
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
     com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder();
-    
+
     // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
     boolean hasPredefinedObd2RequestsCommand();
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
     com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand();
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
     com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder();
-    
+
     // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
     boolean hasModemConfigurationCommand();
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
     com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand();
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
     com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder();
+
+    // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    boolean hasRtcConfigurationCommand();
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand();
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder();
   }
+  /**
+   * Protobuf type {@code openxc.ControlCommand}
+   */
   public static final class ControlCommand extends
       com.google.protobuf.GeneratedMessage
       implements ControlCommandOrBuilder {
     // Use ControlCommand.newBuilder() to construct.
-    private ControlCommand(Builder builder) {
+    private ControlCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private ControlCommand(boolean noInit) {}
-    
+    private ControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final ControlCommand defaultInstance;
     public static ControlCommand getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public ControlCommand getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ControlCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
+              break;
+            }
+            case 18: {
+              com.openxc.BinaryMessages.DiagnosticControlCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000002) == 0x00000002)) {
+                subBuilder = diagnosticRequest_.toBuilder();
+              }
+              diagnosticRequest_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticControlCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(diagnosticRequest_);
+                diagnosticRequest_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000002;
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = passthroughModeRequest_.toBuilder();
+              }
+              passthroughModeRequest_ = input.readMessage(com.openxc.BinaryMessages.PassthroughModeControlCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(passthroughModeRequest_);
+                passthroughModeRequest_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              break;
+            }
+            case 34: {
+              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000008) == 0x00000008)) {
+                subBuilder = acceptanceFilterBypassCommand_.toBuilder();
+              }
+              acceptanceFilterBypassCommand_ = input.readMessage(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(acceptanceFilterBypassCommand_);
+                acceptanceFilterBypassCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000008;
+              break;
+            }
+            case 42: {
+              com.openxc.BinaryMessages.PayloadFormatCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000010) == 0x00000010)) {
+                subBuilder = payloadFormatCommand_.toBuilder();
+              }
+              payloadFormatCommand_ = input.readMessage(com.openxc.BinaryMessages.PayloadFormatCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(payloadFormatCommand_);
+                payloadFormatCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000010;
+              break;
+            }
+            case 50: {
+              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000020) == 0x00000020)) {
+                subBuilder = predefinedObd2RequestsCommand_.toBuilder();
+              }
+              predefinedObd2RequestsCommand_ = input.readMessage(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(predefinedObd2RequestsCommand_);
+                predefinedObd2RequestsCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000020;
+              break;
+            }
+            case 58: {
+              com.openxc.BinaryMessages.ModemConfigurationCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000040) == 0x00000040)) {
+                subBuilder = modemConfigurationCommand_.toBuilder();
+              }
+              modemConfigurationCommand_ = input.readMessage(com.openxc.BinaryMessages.ModemConfigurationCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(modemConfigurationCommand_);
+                modemConfigurationCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000040;
+              break;
+            }
+            case 66: {
+              com.openxc.BinaryMessages.RTCConfigurationCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000080) == 0x00000080)) {
+                subBuilder = rtcConfigurationCommand_.toBuilder();
+              }
+              rtcConfigurationCommand_ = input.readMessage(com.openxc.BinaryMessages.RTCConfigurationCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(rtcConfigurationCommand_);
+                rtcConfigurationCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000080;
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<ControlCommand> PARSER =
+        new com.google.protobuf.AbstractParser<ControlCommand>() {
+      public ControlCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ControlCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ControlCommand> getParserForType() {
+      return PARSER;
     }
-    
+
+    /**
+     * Protobuf enum {@code openxc.ControlCommand.Type}
+     */
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>VERSION = 1;</code>
+       */
       VERSION(0, 1),
+      /**
+       * <code>DEVICE_ID = 2;</code>
+       */
       DEVICE_ID(1, 2),
+      /**
+       * <code>DIAGNOSTIC = 3;</code>
+       */
       DIAGNOSTIC(2, 3),
+      /**
+       * <code>PASSTHROUGH = 4;</code>
+       */
       PASSTHROUGH(3, 4),
+      /**
+       * <code>ACCEPTANCE_FILTER_BYPASS = 5;</code>
+       */
       ACCEPTANCE_FILTER_BYPASS(4, 5),
+      /**
+       * <code>PAYLOAD_FORMAT = 6;</code>
+       */
       PAYLOAD_FORMAT(5, 6),
+      /**
+       * <code>PREDEFINED_OBD2_REQUESTS = 7;</code>
+       */
       PREDEFINED_OBD2_REQUESTS(6, 7),
+      /**
+       * <code>MODEM_CONFIGURATION = 8;</code>
+       */
       MODEM_CONFIGURATION(7, 8),
+      /**
+       * <code>RTC_CONFIGURATION = 9;</code>
+       */
+      RTC_CONFIGURATION(8, 9),
+      /**
+       * <code>SD_MOUNT_STATUS = 10;</code>
+       */
+      SD_MOUNT_STATUS(9, 10),
       ;
-      
+
+      /**
+       * <code>VERSION = 1;</code>
+       */
       public static final int VERSION_VALUE = 1;
+      /**
+       * <code>DEVICE_ID = 2;</code>
+       */
       public static final int DEVICE_ID_VALUE = 2;
+      /**
+       * <code>DIAGNOSTIC = 3;</code>
+       */
       public static final int DIAGNOSTIC_VALUE = 3;
+      /**
+       * <code>PASSTHROUGH = 4;</code>
+       */
       public static final int PASSTHROUGH_VALUE = 4;
+      /**
+       * <code>ACCEPTANCE_FILTER_BYPASS = 5;</code>
+       */
       public static final int ACCEPTANCE_FILTER_BYPASS_VALUE = 5;
+      /**
+       * <code>PAYLOAD_FORMAT = 6;</code>
+       */
       public static final int PAYLOAD_FORMAT_VALUE = 6;
+      /**
+       * <code>PREDEFINED_OBD2_REQUESTS = 7;</code>
+       */
       public static final int PREDEFINED_OBD2_REQUESTS_VALUE = 7;
+      /**
+       * <code>MODEM_CONFIGURATION = 8;</code>
+       */
       public static final int MODEM_CONFIGURATION_VALUE = 8;
-      
-      
+      /**
+       * <code>RTC_CONFIGURATION = 9;</code>
+       */
+      public static final int RTC_CONFIGURATION_VALUE = 9;
+      /**
+       * <code>SD_MOUNT_STATUS = 10;</code>
+       */
+      public static final int SD_MOUNT_STATUS_VALUE = 10;
+
+
       public final int getNumber() { return value; }
-      
+
       public static Type valueOf(int value) {
         switch (value) {
           case 1: return VERSION;
@@ -1894,10 +2700,12 @@ public final class BinaryMessages {
           case 6: return PAYLOAD_FORMAT;
           case 7: return PREDEFINED_OBD2_REQUESTS;
           case 8: return MODEM_CONFIGURATION;
+          case 9: return RTC_CONFIGURATION;
+          case 10: return SD_MOUNT_STATUS;
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<Type>
           internalGetValueMap() {
         return internalValueMap;
@@ -1909,7 +2717,7 @@ public final class BinaryMessages {
                 return Type.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -1922,11 +2730,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.ControlCommand.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final Type[] VALUES = {
-        VERSION, DEVICE_ID, DIAGNOSTIC, PASSTHROUGH, ACCEPTANCE_FILTER_BYPASS, PAYLOAD_FORMAT, PREDEFINED_OBD2_REQUESTS, MODEM_CONFIGURATION, 
-      };
-      
+
+      private static final Type[] VALUES = values();
+
       public static Type valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -1935,107 +2741,189 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private Type(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.ControlCommand.Type)
     }
-    
+
     private int bitField0_;
     // optional .openxc.ControlCommand.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private com.openxc.BinaryMessages.ControlCommand.Type type_;
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     public com.openxc.BinaryMessages.ControlCommand.Type getType() {
       return type_;
     }
-    
+
     // optional .openxc.DiagnosticControlCommand diagnostic_request = 2;
     public static final int DIAGNOSTIC_REQUEST_FIELD_NUMBER = 2;
     private com.openxc.BinaryMessages.DiagnosticControlCommand diagnosticRequest_;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
     public boolean hasDiagnosticRequest() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest() {
       return diagnosticRequest_;
     }
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder() {
       return diagnosticRequest_;
     }
-    
+
     // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;
     public static final int PASSTHROUGH_MODE_REQUEST_FIELD_NUMBER = 3;
     private com.openxc.BinaryMessages.PassthroughModeControlCommand passthroughModeRequest_;
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
     public boolean hasPassthroughModeRequest() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
     public com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest() {
       return passthroughModeRequest_;
     }
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
     public com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder() {
       return passthroughModeRequest_;
     }
-    
+
     // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
     public static final int ACCEPTANCE_FILTER_BYPASS_COMMAND_FIELD_NUMBER = 4;
     private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand acceptanceFilterBypassCommand_;
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
     public boolean hasAcceptanceFilterBypassCommand() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
     public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand() {
       return acceptanceFilterBypassCommand_;
     }
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
     public com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder() {
       return acceptanceFilterBypassCommand_;
     }
-    
+
     // optional .openxc.PayloadFormatCommand payload_format_command = 5;
     public static final int PAYLOAD_FORMAT_COMMAND_FIELD_NUMBER = 5;
     private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
     public boolean hasPayloadFormatCommand() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
     public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() {
       return payloadFormatCommand_;
     }
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
     public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() {
       return payloadFormatCommand_;
     }
-    
+
     // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
     public static final int PREDEFINED_OBD2_REQUESTS_COMMAND_FIELD_NUMBER = 6;
     private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand predefinedObd2RequestsCommand_;
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
     public boolean hasPredefinedObd2RequestsCommand() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
     public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand() {
       return predefinedObd2RequestsCommand_;
     }
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
     public com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder() {
       return predefinedObd2RequestsCommand_;
     }
-    
+
     // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;
     public static final int MODEM_CONFIGURATION_COMMAND_FIELD_NUMBER = 7;
     private com.openxc.BinaryMessages.ModemConfigurationCommand modemConfigurationCommand_;
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
     public boolean hasModemConfigurationCommand() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
     public com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand() {
       return modemConfigurationCommand_;
     }
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
     public com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder() {
       return modemConfigurationCommand_;
     }
-    
+
+    // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;
+    public static final int RTC_CONFIGURATION_COMMAND_FIELD_NUMBER = 8;
+    private com.openxc.BinaryMessages.RTCConfigurationCommand rtcConfigurationCommand_;
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    public boolean hasRtcConfigurationCommand() {
+      return ((bitField0_ & 0x00000080) == 0x00000080);
+    }
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    public com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand() {
+      return rtcConfigurationCommand_;
+    }
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    public com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder() {
+      return rtcConfigurationCommand_;
+    }
+
     private void initFields() {
       type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
       diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
@@ -2044,16 +2932,17 @@ public final class BinaryMessages {
       payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
       predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
       modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
+      rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -2078,14 +2967,17 @@ public final class BinaryMessages {
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         output.writeMessage(7, modemConfigurationCommand_);
       }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        output.writeMessage(8, rtcConfigurationCommand_);
+      }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -2115,98 +3007,91 @@ public final class BinaryMessages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, modemConfigurationCommand_);
       }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, rtcConfigurationCommand_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.ControlCommand parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.ControlCommand prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.ControlCommand}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.ControlCommandOrBuilder {
@@ -2214,18 +3099,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.ControlCommand.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2237,12 +3125,13 @@ public final class BinaryMessages {
           getPayloadFormatCommandFieldBuilder();
           getPredefinedObd2RequestsCommandFieldBuilder();
           getModemConfigurationCommandFieldBuilder();
+          getRtcConfigurationCommandFieldBuilder();
         }
       }
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
@@ -2283,22 +3172,28 @@ public final class BinaryMessages {
           modemConfigurationCommandBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000040);
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+        } else {
+          rtcConfigurationCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.ControlCommand.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.ControlCommand getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.ControlCommand build() {
         com.openxc.BinaryMessages.ControlCommand result = buildPartial();
         if (!result.isInitialized()) {
@@ -2306,17 +3201,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.ControlCommand buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.ControlCommand result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.ControlCommand buildPartial() {
         com.openxc.BinaryMessages.ControlCommand result = new com.openxc.BinaryMessages.ControlCommand(this);
         int from_bitField0_ = bitField0_;
@@ -2373,11 +3258,19 @@ public final class BinaryMessages {
         } else {
           result.modemConfigurationCommand_ = modemConfigurationCommandBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+          to_bitField0_ |= 0x00000080;
+        }
+        if (rtcConfigurationCommandBuilder_ == null) {
+          result.rtcConfigurationCommand_ = rtcConfigurationCommand_;
+        } else {
+          result.rtcConfigurationCommand_ = rtcConfigurationCommandBuilder_.build();
+        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.ControlCommand) {
           return mergeFrom((com.openxc.BinaryMessages.ControlCommand)other);
@@ -2386,7 +3279,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.ControlCommand other) {
         if (other == com.openxc.BinaryMessages.ControlCommand.getDefaultInstance()) return this;
         if (other.hasType()) {
@@ -2410,116 +3303,53 @@ public final class BinaryMessages {
         if (other.hasModemConfigurationCommand()) {
           mergeModemConfigurationCommand(other.getModemConfigurationCommand());
         }
+        if (other.hasRtcConfigurationCommand()) {
+          mergeRtcConfigurationCommand(other.getRtcConfigurationCommand());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = value;
-              }
-              break;
-            }
-            case 18: {
-              com.openxc.BinaryMessages.DiagnosticControlCommand.Builder subBuilder = com.openxc.BinaryMessages.DiagnosticControlCommand.newBuilder();
-              if (hasDiagnosticRequest()) {
-                subBuilder.mergeFrom(getDiagnosticRequest());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setDiagnosticRequest(subBuilder.buildPartial());
-              break;
-            }
-            case 26: {
-              com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder subBuilder = com.openxc.BinaryMessages.PassthroughModeControlCommand.newBuilder();
-              if (hasPassthroughModeRequest()) {
-                subBuilder.mergeFrom(getPassthroughModeRequest());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setPassthroughModeRequest(subBuilder.buildPartial());
-              break;
-            }
-            case 34: {
-              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder subBuilder = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.newBuilder();
-              if (hasAcceptanceFilterBypassCommand()) {
-                subBuilder.mergeFrom(getAcceptanceFilterBypassCommand());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setAcceptanceFilterBypassCommand(subBuilder.buildPartial());
-              break;
-            }
-            case 42: {
-              com.openxc.BinaryMessages.PayloadFormatCommand.Builder subBuilder = com.openxc.BinaryMessages.PayloadFormatCommand.newBuilder();
-              if (hasPayloadFormatCommand()) {
-                subBuilder.mergeFrom(getPayloadFormatCommand());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setPayloadFormatCommand(subBuilder.buildPartial());
-              break;
-            }
-            case 50: {
-              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder subBuilder = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.newBuilder();
-              if (hasPredefinedObd2RequestsCommand()) {
-                subBuilder.mergeFrom(getPredefinedObd2RequestsCommand());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setPredefinedObd2RequestsCommand(subBuilder.buildPartial());
-              break;
-            }
-            case 58: {
-              com.openxc.BinaryMessages.ModemConfigurationCommand.Builder subBuilder = com.openxc.BinaryMessages.ModemConfigurationCommand.newBuilder();
-              if (hasModemConfigurationCommand()) {
-                subBuilder.mergeFrom(getModemConfigurationCommand());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setModemConfigurationCommand(subBuilder.buildPartial());
-              break;
-            }
+        com.openxc.BinaryMessages.ControlCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.ControlCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional .openxc.ControlCommand.Type type = 1;
       private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public com.openxc.BinaryMessages.ControlCommand.Type getType() {
         return type_;
       }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) {
         if (value == null) {
           throw new NullPointerException();
@@ -2529,20 +3359,29 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
         type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
         onChanged();
         return this;
       }
-      
+
       // optional .openxc.DiagnosticControlCommand diagnostic_request = 2;
       private com.openxc.BinaryMessages.DiagnosticControlCommand diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DiagnosticControlCommand, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder, com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder> diagnosticRequestBuilder_;
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public boolean hasDiagnosticRequest() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest() {
         if (diagnosticRequestBuilder_ == null) {
           return diagnosticRequest_;
@@ -2550,6 +3389,9 @@ public final class BinaryMessages {
           return diagnosticRequestBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public Builder setDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticControlCommand value) {
         if (diagnosticRequestBuilder_ == null) {
           if (value == null) {
@@ -2563,6 +3405,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public Builder setDiagnosticRequest(
           com.openxc.BinaryMessages.DiagnosticControlCommand.Builder builderForValue) {
         if (diagnosticRequestBuilder_ == null) {
@@ -2574,6 +3419,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public Builder mergeDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticControlCommand value) {
         if (diagnosticRequestBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
@@ -2590,6 +3438,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public Builder clearDiagnosticRequest() {
         if (diagnosticRequestBuilder_ == null) {
           diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
@@ -2600,11 +3451,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticControlCommand.Builder getDiagnosticRequestBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getDiagnosticRequestFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder() {
         if (diagnosticRequestBuilder_ != null) {
           return diagnosticRequestBuilder_.getMessageOrBuilder();
@@ -2612,6 +3469,9 @@ public final class BinaryMessages {
           return diagnosticRequest_;
         }
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DiagnosticControlCommand, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder, com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder> 
           getDiagnosticRequestFieldBuilder() {
@@ -2625,14 +3485,20 @@ public final class BinaryMessages {
         }
         return diagnosticRequestBuilder_;
       }
-      
+
       // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;
       private com.openxc.BinaryMessages.PassthroughModeControlCommand passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.PassthroughModeControlCommand, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder, com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder> passthroughModeRequestBuilder_;
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public boolean hasPassthroughModeRequest() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest() {
         if (passthroughModeRequestBuilder_ == null) {
           return passthroughModeRequest_;
@@ -2640,6 +3506,9 @@ public final class BinaryMessages {
           return passthroughModeRequestBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public Builder setPassthroughModeRequest(com.openxc.BinaryMessages.PassthroughModeControlCommand value) {
         if (passthroughModeRequestBuilder_ == null) {
           if (value == null) {
@@ -2653,6 +3522,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public Builder setPassthroughModeRequest(
           com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder builderForValue) {
         if (passthroughModeRequestBuilder_ == null) {
@@ -2664,6 +3536,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public Builder mergePassthroughModeRequest(com.openxc.BinaryMessages.PassthroughModeControlCommand value) {
         if (passthroughModeRequestBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -2680,6 +3555,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public Builder clearPassthroughModeRequest() {
         if (passthroughModeRequestBuilder_ == null) {
           passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
@@ -2690,11 +3568,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder getPassthroughModeRequestBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getPassthroughModeRequestFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       public com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder() {
         if (passthroughModeRequestBuilder_ != null) {
           return passthroughModeRequestBuilder_.getMessageOrBuilder();
@@ -2702,6 +3586,9 @@ public final class BinaryMessages {
           return passthroughModeRequest_;
         }
       }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.PassthroughModeControlCommand, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder, com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder> 
           getPassthroughModeRequestFieldBuilder() {
@@ -2715,14 +3602,20 @@ public final class BinaryMessages {
         }
         return passthroughModeRequestBuilder_;
       }
-      
+
       // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
       private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.AcceptanceFilterBypassCommand, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder, com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder> acceptanceFilterBypassCommandBuilder_;
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public boolean hasAcceptanceFilterBypassCommand() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand() {
         if (acceptanceFilterBypassCommandBuilder_ == null) {
           return acceptanceFilterBypassCommand_;
@@ -2730,6 +3623,9 @@ public final class BinaryMessages {
           return acceptanceFilterBypassCommandBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public Builder setAcceptanceFilterBypassCommand(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand value) {
         if (acceptanceFilterBypassCommandBuilder_ == null) {
           if (value == null) {
@@ -2743,6 +3639,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000008;
         return this;
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public Builder setAcceptanceFilterBypassCommand(
           com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder builderForValue) {
         if (acceptanceFilterBypassCommandBuilder_ == null) {
@@ -2754,6 +3653,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000008;
         return this;
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public Builder mergeAcceptanceFilterBypassCommand(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand value) {
         if (acceptanceFilterBypassCommandBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
@@ -2770,6 +3672,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000008;
         return this;
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public Builder clearAcceptanceFilterBypassCommand() {
         if (acceptanceFilterBypassCommandBuilder_ == null) {
           acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
@@ -2780,11 +3685,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder getAcceptanceFilterBypassCommandBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getAcceptanceFilterBypassCommandFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       public com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder() {
         if (acceptanceFilterBypassCommandBuilder_ != null) {
           return acceptanceFilterBypassCommandBuilder_.getMessageOrBuilder();
@@ -2792,6 +3703,9 @@ public final class BinaryMessages {
           return acceptanceFilterBypassCommand_;
         }
       }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.AcceptanceFilterBypassCommand, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder, com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder> 
           getAcceptanceFilterBypassCommandFieldBuilder() {
@@ -2805,14 +3719,20 @@ public final class BinaryMessages {
         }
         return acceptanceFilterBypassCommandBuilder_;
       }
-      
+
       // optional .openxc.PayloadFormatCommand payload_format_command = 5;
       private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder> payloadFormatCommandBuilder_;
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public boolean hasPayloadFormatCommand() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() {
         if (payloadFormatCommandBuilder_ == null) {
           return payloadFormatCommand_;
@@ -2820,6 +3740,9 @@ public final class BinaryMessages {
           return payloadFormatCommandBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public Builder setPayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) {
         if (payloadFormatCommandBuilder_ == null) {
           if (value == null) {
@@ -2833,6 +3756,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000010;
         return this;
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public Builder setPayloadFormatCommand(
           com.openxc.BinaryMessages.PayloadFormatCommand.Builder builderForValue) {
         if (payloadFormatCommandBuilder_ == null) {
@@ -2844,6 +3770,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000010;
         return this;
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public Builder mergePayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) {
         if (payloadFormatCommandBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
@@ -2860,6 +3789,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000010;
         return this;
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public Builder clearPayloadFormatCommand() {
         if (payloadFormatCommandBuilder_ == null) {
           payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
@@ -2870,11 +3802,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public com.openxc.BinaryMessages.PayloadFormatCommand.Builder getPayloadFormatCommandBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getPayloadFormatCommandFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() {
         if (payloadFormatCommandBuilder_ != null) {
           return payloadFormatCommandBuilder_.getMessageOrBuilder();
@@ -2882,6 +3820,9 @@ public final class BinaryMessages {
           return payloadFormatCommand_;
         }
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder> 
           getPayloadFormatCommandFieldBuilder() {
@@ -2895,14 +3836,20 @@ public final class BinaryMessages {
         }
         return payloadFormatCommandBuilder_;
       }
-      
+
       // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
       private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.PredefinedObd2RequestsCommand, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder, com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder> predefinedObd2RequestsCommandBuilder_;
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public boolean hasPredefinedObd2RequestsCommand() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand() {
         if (predefinedObd2RequestsCommandBuilder_ == null) {
           return predefinedObd2RequestsCommand_;
@@ -2910,6 +3857,9 @@ public final class BinaryMessages {
           return predefinedObd2RequestsCommandBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public Builder setPredefinedObd2RequestsCommand(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand value) {
         if (predefinedObd2RequestsCommandBuilder_ == null) {
           if (value == null) {
@@ -2923,6 +3873,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000020;
         return this;
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public Builder setPredefinedObd2RequestsCommand(
           com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder builderForValue) {
         if (predefinedObd2RequestsCommandBuilder_ == null) {
@@ -2934,6 +3887,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000020;
         return this;
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public Builder mergePredefinedObd2RequestsCommand(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand value) {
         if (predefinedObd2RequestsCommandBuilder_ == null) {
           if (((bitField0_ & 0x00000020) == 0x00000020) &&
@@ -2950,6 +3906,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000020;
         return this;
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public Builder clearPredefinedObd2RequestsCommand() {
         if (predefinedObd2RequestsCommandBuilder_ == null) {
           predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
@@ -2960,11 +3919,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder getPredefinedObd2RequestsCommandBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return getPredefinedObd2RequestsCommandFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       public com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder() {
         if (predefinedObd2RequestsCommandBuilder_ != null) {
           return predefinedObd2RequestsCommandBuilder_.getMessageOrBuilder();
@@ -2972,6 +3937,9 @@ public final class BinaryMessages {
           return predefinedObd2RequestsCommand_;
         }
       }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.PredefinedObd2RequestsCommand, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder, com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder> 
           getPredefinedObd2RequestsCommandFieldBuilder() {
@@ -2985,14 +3953,20 @@ public final class BinaryMessages {
         }
         return predefinedObd2RequestsCommandBuilder_;
       }
-      
+
       // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;
       private com.openxc.BinaryMessages.ModemConfigurationCommand modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.ModemConfigurationCommand, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder, com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder> modemConfigurationCommandBuilder_;
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public boolean hasModemConfigurationCommand() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand() {
         if (modemConfigurationCommandBuilder_ == null) {
           return modemConfigurationCommand_;
@@ -3000,6 +3974,9 @@ public final class BinaryMessages {
           return modemConfigurationCommandBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public Builder setModemConfigurationCommand(com.openxc.BinaryMessages.ModemConfigurationCommand value) {
         if (modemConfigurationCommandBuilder_ == null) {
           if (value == null) {
@@ -3013,6 +3990,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000040;
         return this;
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public Builder setModemConfigurationCommand(
           com.openxc.BinaryMessages.ModemConfigurationCommand.Builder builderForValue) {
         if (modemConfigurationCommandBuilder_ == null) {
@@ -3024,6 +4004,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000040;
         return this;
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public Builder mergeModemConfigurationCommand(com.openxc.BinaryMessages.ModemConfigurationCommand value) {
         if (modemConfigurationCommandBuilder_ == null) {
           if (((bitField0_ & 0x00000040) == 0x00000040) &&
@@ -3040,6 +4023,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000040;
         return this;
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public Builder clearModemConfigurationCommand() {
         if (modemConfigurationCommandBuilder_ == null) {
           modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
@@ -3050,11 +4036,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public com.openxc.BinaryMessages.ModemConfigurationCommand.Builder getModemConfigurationCommandBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
         return getModemConfigurationCommandFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       public com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder() {
         if (modemConfigurationCommandBuilder_ != null) {
           return modemConfigurationCommandBuilder_.getMessageOrBuilder();
@@ -3062,6 +4054,9 @@ public final class BinaryMessages {
           return modemConfigurationCommand_;
         }
       }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.ModemConfigurationCommand, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder, com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder> 
           getModemConfigurationCommandFieldBuilder() {
@@ -3075,70 +4070,303 @@ public final class BinaryMessages {
         }
         return modemConfigurationCommandBuilder_;
       }
-      
+
+      // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;
+      private com.openxc.BinaryMessages.RTCConfigurationCommand rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder> rtcConfigurationCommandBuilder_;
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public boolean hasRtcConfigurationCommand() {
+        return ((bitField0_ & 0x00000080) == 0x00000080);
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand() {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          return rtcConfigurationCommand_;
+        } else {
+          return rtcConfigurationCommandBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder setRtcConfigurationCommand(com.openxc.BinaryMessages.RTCConfigurationCommand value) {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          rtcConfigurationCommand_ = value;
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder setRtcConfigurationCommand(
+          com.openxc.BinaryMessages.RTCConfigurationCommand.Builder builderForValue) {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder mergeRtcConfigurationCommand(com.openxc.BinaryMessages.RTCConfigurationCommand value) {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000080) == 0x00000080) &&
+              rtcConfigurationCommand_ != com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance()) {
+            rtcConfigurationCommand_ =
+              com.openxc.BinaryMessages.RTCConfigurationCommand.newBuilder(rtcConfigurationCommand_).mergeFrom(value).buildPartial();
+          } else {
+            rtcConfigurationCommand_ = value;
+          }
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder clearRtcConfigurationCommand() {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000080);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public com.openxc.BinaryMessages.RTCConfigurationCommand.Builder getRtcConfigurationCommandBuilder() {
+        bitField0_ |= 0x00000080;
+        onChanged();
+        return getRtcConfigurationCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder() {
+        if (rtcConfigurationCommandBuilder_ != null) {
+          return rtcConfigurationCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return rtcConfigurationCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder> 
+          getRtcConfigurationCommandFieldBuilder() {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder>(
+                  rtcConfigurationCommand_,
+                  getParentForChildren(),
+                  isClean());
+          rtcConfigurationCommand_ = null;
+        }
+        return rtcConfigurationCommandBuilder_;
+      }
+
       // @@protoc_insertion_point(builder_scope:openxc.ControlCommand)
     }
-    
+
     static {
       defaultInstance = new ControlCommand(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.ControlCommand)
   }
-  
+
   public interface DiagnosticControlCommandOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional .openxc.DiagnosticRequest request = 1;
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
     boolean hasRequest();
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticRequest getRequest();
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder();
-    
+
     // optional .openxc.DiagnosticControlCommand.Action action = 2;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
     boolean hasAction();
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction();
   }
+  /**
+   * Protobuf type {@code openxc.DiagnosticControlCommand}
+   */
   public static final class DiagnosticControlCommand extends
       com.google.protobuf.GeneratedMessage
       implements DiagnosticControlCommandOrBuilder {
     // Use DiagnosticControlCommand.newBuilder() to construct.
-    private DiagnosticControlCommand(Builder builder) {
+    private DiagnosticControlCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private DiagnosticControlCommand(boolean noInit) {}
-    
+    private DiagnosticControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final DiagnosticControlCommand defaultInstance;
     public static DiagnosticControlCommand getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public DiagnosticControlCommand getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DiagnosticControlCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000001) == 0x00000001)) {
+                subBuilder = request_.toBuilder();
+              }
+              request_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticRequest.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(request_);
+                request_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000001;
+              break;
+            }
+            case 16: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.DiagnosticControlCommand.Action value = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(2, rawValue);
+              } else {
+                bitField0_ |= 0x00000002;
+                action_ = value;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.DiagnosticControlCommand.class, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<DiagnosticControlCommand> PARSER =
+        new com.google.protobuf.AbstractParser<DiagnosticControlCommand>() {
+      public DiagnosticControlCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DiagnosticControlCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DiagnosticControlCommand> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.DiagnosticControlCommand.Action}
+     */
     public enum Action
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ADD = 1;</code>
+       */
       ADD(0, 1),
+      /**
+       * <code>CANCEL = 2;</code>
+       */
       CANCEL(1, 2),
       ;
-      
+
+      /**
+       * <code>ADD = 1;</code>
+       */
       public static final int ADD_VALUE = 1;
+      /**
+       * <code>CANCEL = 2;</code>
+       */
       public static final int CANCEL_VALUE = 2;
-      
-      
+
+
       public final int getNumber() { return value; }
-      
+
       public static Action valueOf(int value) {
         switch (value) {
           case 1: return ADD;
@@ -3146,7 +4374,7 @@ public final class BinaryMessages {
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<Action>
           internalGetValueMap() {
         return internalValueMap;
@@ -3158,7 +4386,7 @@ public final class BinaryMessages {
                 return Action.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -3171,11 +4399,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.DiagnosticControlCommand.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final Action[] VALUES = {
-        ADD, CANCEL, 
-      };
-      
+
+      private static final Action[] VALUES = values();
+
       public static Action valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -3184,42 +4410,57 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private Action(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.DiagnosticControlCommand.Action)
     }
-    
+
     private int bitField0_;
     // optional .openxc.DiagnosticRequest request = 1;
     public static final int REQUEST_FIELD_NUMBER = 1;
     private com.openxc.BinaryMessages.DiagnosticRequest request_;
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticRequest getRequest() {
       return request_;
     }
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder() {
       return request_;
     }
-    
+
     // optional .openxc.DiagnosticControlCommand.Action action = 2;
     public static final int ACTION_FIELD_NUMBER = 2;
     private com.openxc.BinaryMessages.DiagnosticControlCommand.Action action_;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
     public boolean hasAction() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction() {
       return action_;
     }
-    
+
     private void initFields() {
       request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
       action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD;
@@ -3228,11 +4469,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -3244,12 +4485,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -3263,94 +4504,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticControlCommand prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.DiagnosticControlCommand}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder {
@@ -3358,18 +4588,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.DiagnosticControlCommand.class, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.DiagnosticControlCommand.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -3381,7 +4614,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         if (requestBuilder_ == null) {
@@ -3394,20 +4627,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.DiagnosticControlCommand.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.DiagnosticControlCommand getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.DiagnosticControlCommand build() {
         com.openxc.BinaryMessages.DiagnosticControlCommand result = buildPartial();
         if (!result.isInitialized()) {
@@ -3415,17 +4648,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.DiagnosticControlCommand buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.DiagnosticControlCommand result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.DiagnosticControlCommand buildPartial() {
         com.openxc.BinaryMessages.DiagnosticControlCommand result = new com.openxc.BinaryMessages.DiagnosticControlCommand(this);
         int from_bitField0_ = bitField0_;
@@ -3446,7 +4669,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.DiagnosticControlCommand) {
           return mergeFrom((com.openxc.BinaryMessages.DiagnosticControlCommand)other);
@@ -3455,7 +4678,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticControlCommand other) {
         if (other == com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance()) return this;
         if (other.hasRequest()) {
@@ -3467,67 +4690,43 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = com.openxc.BinaryMessages.DiagnosticRequest.newBuilder();
-              if (hasRequest()) {
-                subBuilder.mergeFrom(getRequest());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setRequest(subBuilder.buildPartial());
-              break;
-            }
-            case 16: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.DiagnosticControlCommand.Action value = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(2, rawValue);
-              } else {
-                bitField0_ |= 0x00000002;
-                action_ = value;
-              }
-              break;
-            }
+        com.openxc.BinaryMessages.DiagnosticControlCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.DiagnosticControlCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional .openxc.DiagnosticRequest request = 1;
       private com.openxc.BinaryMessages.DiagnosticRequest request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> requestBuilder_;
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public boolean hasRequest() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticRequest getRequest() {
         if (requestBuilder_ == null) {
           return request_;
@@ -3535,6 +4734,9 @@ public final class BinaryMessages {
           return requestBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public Builder setRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
         if (requestBuilder_ == null) {
           if (value == null) {
@@ -3548,6 +4750,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000001;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public Builder setRequest(
           com.openxc.BinaryMessages.DiagnosticRequest.Builder builderForValue) {
         if (requestBuilder_ == null) {
@@ -3559,6 +4764,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000001;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public Builder mergeRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
@@ -3575,6 +4783,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000001;
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public Builder clearRequest() {
         if (requestBuilder_ == null) {
           request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
@@ -3585,11 +4796,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticRequest.Builder getRequestBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getRequestFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder() {
         if (requestBuilder_ != null) {
           return requestBuilder_.getMessageOrBuilder();
@@ -3597,6 +4814,9 @@ public final class BinaryMessages {
           return request_;
         }
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> 
           getRequestFieldBuilder() {
@@ -3610,15 +4830,24 @@ public final class BinaryMessages {
         }
         return requestBuilder_;
       }
-      
+
       // optional .openxc.DiagnosticControlCommand.Action action = 2;
       private com.openxc.BinaryMessages.DiagnosticControlCommand.Action action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD;
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
       public boolean hasAction() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction() {
         return action_;
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
       public Builder setAction(com.openxc.BinaryMessages.DiagnosticControlCommand.Action value) {
         if (value == null) {
           throw new NullPointerException();
@@ -3628,84 +4857,183 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
       public Builder clearAction() {
         bitField0_ = (bitField0_ & ~0x00000002);
         action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.DiagnosticControlCommand)
     }
-    
+
     static {
       defaultInstance = new DiagnosticControlCommand(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.DiagnosticControlCommand)
   }
-  
+
   public interface PassthroughModeControlCommandOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     int getBus();
-    
+
     // optional bool enabled = 2;
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
     boolean hasEnabled();
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
     boolean getEnabled();
   }
+  /**
+   * Protobuf type {@code openxc.PassthroughModeControlCommand}
+   */
   public static final class PassthroughModeControlCommand extends
       com.google.protobuf.GeneratedMessage
       implements PassthroughModeControlCommandOrBuilder {
     // Use PassthroughModeControlCommand.newBuilder() to construct.
-    private PassthroughModeControlCommand(Builder builder) {
+    private PassthroughModeControlCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private PassthroughModeControlCommand(boolean noInit) {}
-    
+    private PassthroughModeControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final PassthroughModeControlCommand defaultInstance;
     public static PassthroughModeControlCommand getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public PassthroughModeControlCommand getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PassthroughModeControlCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              enabled_ = input.readBool();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.PassthroughModeControlCommand.class, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<PassthroughModeControlCommand> PARSER =
+        new com.google.protobuf.AbstractParser<PassthroughModeControlCommand>() {
+      public PassthroughModeControlCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PassthroughModeControlCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PassthroughModeControlCommand> getParserForType() {
+      return PARSER;
+    }
+
     private int bitField0_;
     // optional int32 bus = 1;
     public static final int BUS_FIELD_NUMBER = 1;
     private int bus_;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public boolean hasBus() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public int getBus() {
       return bus_;
     }
-    
+
     // optional bool enabled = 2;
     public static final int ENABLED_FIELD_NUMBER = 2;
     private boolean enabled_;
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
     public boolean hasEnabled() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
     public boolean getEnabled() {
       return enabled_;
     }
-    
+
     private void initFields() {
       bus_ = 0;
       enabled_ = false;
@@ -3714,11 +5042,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -3730,12 +5058,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -3749,94 +5077,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.PassthroughModeControlCommand prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.PassthroughModeControlCommand}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder {
@@ -3844,18 +5161,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.PassthroughModeControlCommand.class, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.PassthroughModeControlCommand.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -3866,7 +5186,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         bus_ = 0;
@@ -3875,20 +5195,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.PassthroughModeControlCommand.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.PassthroughModeControlCommand getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.PassthroughModeControlCommand build() {
         com.openxc.BinaryMessages.PassthroughModeControlCommand result = buildPartial();
         if (!result.isInitialized()) {
@@ -3896,17 +5216,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.PassthroughModeControlCommand buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.PassthroughModeControlCommand result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.PassthroughModeControlCommand buildPartial() {
         com.openxc.BinaryMessages.PassthroughModeControlCommand result = new com.openxc.BinaryMessages.PassthroughModeControlCommand(this);
         int from_bitField0_ = bitField0_;
@@ -3923,7 +5233,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.PassthroughModeControlCommand) {
           return mergeFrom((com.openxc.BinaryMessages.PassthroughModeControlCommand)other);
@@ -3932,7 +5242,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.PassthroughModeControlCommand other) {
         if (other == com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance()) return this;
         if (other.hasBus()) {
@@ -3944,163 +5254,263 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              bus_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              enabled_ = input.readBool();
-              break;
-            }
+        com.openxc.BinaryMessages.PassthroughModeControlCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.PassthroughModeControlCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional int32 bus = 1;
       private int bus_ ;
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public boolean hasBus() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public int getBus() {
         return bus_;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder setBus(int value) {
         bitField0_ |= 0x00000001;
         bus_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder clearBus() {
         bitField0_ = (bitField0_ & ~0x00000001);
         bus_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional bool enabled = 2;
       private boolean enabled_ ;
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
       public boolean hasEnabled() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
       public boolean getEnabled() {
         return enabled_;
       }
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
       public Builder setEnabled(boolean value) {
         bitField0_ |= 0x00000002;
         enabled_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
       public Builder clearEnabled() {
         bitField0_ = (bitField0_ & ~0x00000002);
         enabled_ = false;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.PassthroughModeControlCommand)
     }
-    
+
     static {
       defaultInstance = new PassthroughModeControlCommand(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.PassthroughModeControlCommand)
   }
-  
+
   public interface AcceptanceFilterBypassCommandOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     int getBus();
-    
+
     // optional bool bypass = 2;
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
     boolean hasBypass();
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
     boolean getBypass();
   }
+  /**
+   * Protobuf type {@code openxc.AcceptanceFilterBypassCommand}
+   */
   public static final class AcceptanceFilterBypassCommand extends
       com.google.protobuf.GeneratedMessage
       implements AcceptanceFilterBypassCommandOrBuilder {
     // Use AcceptanceFilterBypassCommand.newBuilder() to construct.
-    private AcceptanceFilterBypassCommand(Builder builder) {
+    private AcceptanceFilterBypassCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private AcceptanceFilterBypassCommand(boolean noInit) {}
-    
+    private AcceptanceFilterBypassCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final AcceptanceFilterBypassCommand defaultInstance;
     public static AcceptanceFilterBypassCommand getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public AcceptanceFilterBypassCommand getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AcceptanceFilterBypassCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              bypass_ = input.readBool();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<AcceptanceFilterBypassCommand> PARSER =
+        new com.google.protobuf.AbstractParser<AcceptanceFilterBypassCommand>() {
+      public AcceptanceFilterBypassCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AcceptanceFilterBypassCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AcceptanceFilterBypassCommand> getParserForType() {
+      return PARSER;
     }
-    
+
     private int bitField0_;
     // optional int32 bus = 1;
     public static final int BUS_FIELD_NUMBER = 1;
     private int bus_;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public boolean hasBus() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public int getBus() {
       return bus_;
     }
-    
+
     // optional bool bypass = 2;
     public static final int BYPASS_FIELD_NUMBER = 2;
     private boolean bypass_;
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
     public boolean hasBypass() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
     public boolean getBypass() {
       return bypass_;
     }
-    
+
     private void initFields() {
       bus_ = 0;
       bypass_ = false;
@@ -4109,11 +5519,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -4125,12 +5535,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -4144,94 +5554,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.AcceptanceFilterBypassCommand}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder {
@@ -4239,18 +5638,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -4261,7 +5663,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         bus_ = 0;
@@ -4270,20 +5672,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand build() {
         com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = buildPartial();
         if (!result.isInitialized()) {
@@ -4291,17 +5693,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand buildPartial() {
         com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = new com.openxc.BinaryMessages.AcceptanceFilterBypassCommand(this);
         int from_bitField0_ = bitField0_;
@@ -4318,7 +5710,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.AcceptanceFilterBypassCommand) {
           return mergeFrom((com.openxc.BinaryMessages.AcceptanceFilterBypassCommand)other);
@@ -4327,7 +5719,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand other) {
         if (other == com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance()) return this;
         if (other.hasBus()) {
@@ -4339,158 +5731,265 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              bus_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              bypass_ = input.readBool();
-              break;
-            }
+        com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.AcceptanceFilterBypassCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional int32 bus = 1;
       private int bus_ ;
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public boolean hasBus() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public int getBus() {
         return bus_;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder setBus(int value) {
         bitField0_ |= 0x00000001;
         bus_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder clearBus() {
         bitField0_ = (bitField0_ & ~0x00000001);
         bus_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional bool bypass = 2;
       private boolean bypass_ ;
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
       public boolean hasBypass() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
       public boolean getBypass() {
         return bypass_;
       }
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
       public Builder setBypass(boolean value) {
         bitField0_ |= 0x00000002;
         bypass_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
       public Builder clearBypass() {
         bitField0_ = (bitField0_ & ~0x00000002);
         bypass_ = false;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.AcceptanceFilterBypassCommand)
     }
-    
+
     static {
       defaultInstance = new AcceptanceFilterBypassCommand(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand)
   }
-  
+
   public interface PayloadFormatCommandOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
     boolean hasFormat();
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
     com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat();
   }
+  /**
+   * Protobuf type {@code openxc.PayloadFormatCommand}
+   */
   public static final class PayloadFormatCommand extends
       com.google.protobuf.GeneratedMessage
       implements PayloadFormatCommandOrBuilder {
     // Use PayloadFormatCommand.newBuilder() to construct.
-    private PayloadFormatCommand(Builder builder) {
+    private PayloadFormatCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private PayloadFormatCommand(boolean noInit) {}
-    
+    private PayloadFormatCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final PayloadFormatCommand defaultInstance;
     public static PayloadFormatCommand getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public PayloadFormatCommand getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PayloadFormatCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                format_ = value;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<PayloadFormatCommand> PARSER =
+        new com.google.protobuf.AbstractParser<PayloadFormatCommand>() {
+      public PayloadFormatCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PayloadFormatCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PayloadFormatCommand> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.PayloadFormatCommand.PayloadFormat}
+     */
     public enum PayloadFormat
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>JSON = 1;</code>
+       */
       JSON(0, 1),
+      /**
+       * <code>PROTOBUF = 2;</code>
+       */
       PROTOBUF(1, 2),
+      /**
+       * <code>MESSAGEPACK = 3;</code>
+       */
+      MESSAGEPACK(2, 3),
       ;
-      
+
+      /**
+       * <code>JSON = 1;</code>
+       */
       public static final int JSON_VALUE = 1;
+      /**
+       * <code>PROTOBUF = 2;</code>
+       */
       public static final int PROTOBUF_VALUE = 2;
-      
-      
+      /**
+       * <code>MESSAGEPACK = 3;</code>
+       */
+      public static final int MESSAGEPACK_VALUE = 3;
+
+
       public final int getNumber() { return value; }
-      
+
       public static PayloadFormat valueOf(int value) {
         switch (value) {
           case 1: return JSON;
           case 2: return PROTOBUF;
+          case 3: return MESSAGEPACK;
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<PayloadFormat>
           internalGetValueMap() {
         return internalValueMap;
@@ -4502,7 +6001,7 @@ public final class BinaryMessages {
                 return PayloadFormat.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -4515,11 +6014,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.PayloadFormatCommand.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final PayloadFormat[] VALUES = {
-        JSON, PROTOBUF, 
-      };
-      
+
+      private static final PayloadFormat[] VALUES = values();
+
       public static PayloadFormat valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -4528,29 +6025,35 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private PayloadFormat(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.PayloadFormatCommand.PayloadFormat)
     }
-    
+
     private int bitField0_;
     // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
     public static final int FORMAT_FIELD_NUMBER = 1;
     private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
     public boolean hasFormat() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
     public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() {
       return format_;
     }
-    
+
     private void initFields() {
       format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
     }
@@ -4558,11 +6061,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -4571,12 +6074,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -4586,94 +6089,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.PayloadFormatCommand prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.PayloadFormatCommand}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder {
@@ -4681,18 +6173,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.PayloadFormatCommand.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -4703,27 +6198,27 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.PayloadFormatCommand.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.PayloadFormatCommand getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.PayloadFormatCommand build() {
         com.openxc.BinaryMessages.PayloadFormatCommand result = buildPartial();
         if (!result.isInitialized()) {
@@ -4731,17 +6226,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.PayloadFormatCommand buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.PayloadFormatCommand result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.PayloadFormatCommand buildPartial() {
         com.openxc.BinaryMessages.PayloadFormatCommand result = new com.openxc.BinaryMessages.PayloadFormatCommand(this);
         int from_bitField0_ = bitField0_;
@@ -4754,7 +6239,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.PayloadFormatCommand) {
           return mergeFrom((com.openxc.BinaryMessages.PayloadFormatCommand)other);
@@ -4763,7 +6248,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.PayloadFormatCommand other) {
         if (other == com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance()) return this;
         if (other.hasFormat()) {
@@ -4772,59 +6257,47 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                format_ = value;
-              }
-              break;
-            }
+        com.openxc.BinaryMessages.PayloadFormatCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.PayloadFormatCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
       private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
       public boolean hasFormat() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
       public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() {
         return format_;
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
       public Builder setFormat(com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value) {
         if (value == null) {
           throw new NullPointerException();
@@ -4834,70 +6307,152 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
       public Builder clearFormat() {
         bitField0_ = (bitField0_ & ~0x00000001);
         format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.PayloadFormatCommand)
     }
-    
+
     static {
       defaultInstance = new PayloadFormatCommand(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.PayloadFormatCommand)
   }
-  
+
   public interface PredefinedObd2RequestsCommandOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional bool enabled = 1;
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
     boolean hasEnabled();
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
     boolean getEnabled();
   }
+  /**
+   * Protobuf type {@code openxc.PredefinedObd2RequestsCommand}
+   */
   public static final class PredefinedObd2RequestsCommand extends
       com.google.protobuf.GeneratedMessage
       implements PredefinedObd2RequestsCommandOrBuilder {
     // Use PredefinedObd2RequestsCommand.newBuilder() to construct.
-    private PredefinedObd2RequestsCommand(Builder builder) {
+    private PredefinedObd2RequestsCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private PredefinedObd2RequestsCommand(boolean noInit) {}
-    
+    private PredefinedObd2RequestsCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final PredefinedObd2RequestsCommand defaultInstance;
     public static PredefinedObd2RequestsCommand getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public PredefinedObd2RequestsCommand getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PredefinedObd2RequestsCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              enabled_ = input.readBool();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<PredefinedObd2RequestsCommand> PARSER =
+        new com.google.protobuf.AbstractParser<PredefinedObd2RequestsCommand>() {
+      public PredefinedObd2RequestsCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PredefinedObd2RequestsCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PredefinedObd2RequestsCommand> getParserForType() {
+      return PARSER;
     }
-    
+
     private int bitField0_;
     // optional bool enabled = 1;
     public static final int ENABLED_FIELD_NUMBER = 1;
     private boolean enabled_;
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
     public boolean hasEnabled() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
     public boolean getEnabled() {
       return enabled_;
     }
-    
+
     private void initFields() {
       enabled_ = false;
     }
@@ -4905,11 +6460,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -4918,12 +6473,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -4933,94 +6488,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.PredefinedObd2RequestsCommand}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder {
@@ -5028,18 +6572,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -5050,27 +6597,27 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         enabled_ = false;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand build() {
         com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = buildPartial();
         if (!result.isInitialized()) {
@@ -5078,17 +6625,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand buildPartial() {
         com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = new com.openxc.BinaryMessages.PredefinedObd2RequestsCommand(this);
         int from_bitField0_ = bitField0_;
@@ -5101,7 +6638,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.PredefinedObd2RequestsCommand) {
           return mergeFrom((com.openxc.BinaryMessages.PredefinedObd2RequestsCommand)other);
@@ -5110,7 +6647,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand other) {
         if (other == com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance()) return this;
         if (other.hasEnabled()) {
@@ -5119,139 +6656,281 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              enabled_ = input.readBool();
-              break;
-            }
+        com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.PredefinedObd2RequestsCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional bool enabled = 1;
       private boolean enabled_ ;
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
       public boolean hasEnabled() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
       public boolean getEnabled() {
         return enabled_;
       }
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
       public Builder setEnabled(boolean value) {
         bitField0_ |= 0x00000001;
         enabled_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
       public Builder clearEnabled() {
         bitField0_ = (bitField0_ & ~0x00000001);
         enabled_ = false;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.PredefinedObd2RequestsCommand)
     }
-    
+
     static {
       defaultInstance = new PredefinedObd2RequestsCommand(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.PredefinedObd2RequestsCommand)
   }
-  
+
   public interface NetworkOperatorSettingsOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional bool allowDataRoaming = 1;
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
     boolean hasAllowDataRoaming();
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
     boolean getAllowDataRoaming();
-    
+
     // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
     boolean hasOperatorSelectMode();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
     com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode();
-    
+
     // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
     boolean hasNetworkDescriptor();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
     com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
     com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder();
   }
+  /**
+   * Protobuf type {@code openxc.NetworkOperatorSettings}
+   */
   public static final class NetworkOperatorSettings extends
       com.google.protobuf.GeneratedMessage
       implements NetworkOperatorSettingsOrBuilder {
     // Use NetworkOperatorSettings.newBuilder() to construct.
-    private NetworkOperatorSettings(Builder builder) {
+    private NetworkOperatorSettings(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private NetworkOperatorSettings(boolean noInit) {}
-    
+    private NetworkOperatorSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final NetworkOperatorSettings defaultInstance;
     public static NetworkOperatorSettings getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public NetworkOperatorSettings getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private NetworkOperatorSettings(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              allowDataRoaming_ = input.readBool();
+              break;
+            }
+            case 16: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(2, rawValue);
+              } else {
+                bitField0_ |= 0x00000002;
+                operatorSelectMode_ = value;
+              }
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = networkDescriptor_.toBuilder();
+              }
+              networkDescriptor_ = input.readMessage(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(networkDescriptor_);
+                networkDescriptor_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.NetworkOperatorSettings.class, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<NetworkOperatorSettings> PARSER =
+        new com.google.protobuf.AbstractParser<NetworkOperatorSettings>() {
+      public NetworkOperatorSettings parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new NetworkOperatorSettings(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NetworkOperatorSettings> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.NetworkOperatorSettings.OperatorSelectMode}
+     */
     public enum OperatorSelectMode
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>AUTOMATIC = 0;</code>
+       */
       AUTOMATIC(0, 0),
+      /**
+       * <code>MANUAL = 1;</code>
+       */
       MANUAL(1, 1),
+      /**
+       * <code>DEREGISTER = 2;</code>
+       */
       DEREGISTER(2, 2),
+      /**
+       * <code>SET_ONLY = 3;</code>
+       */
       SET_ONLY(3, 3),
+      /**
+       * <code>MANUAL_AUTOMATIC = 4;</code>
+       */
       MANUAL_AUTOMATIC(4, 4),
       ;
-      
+
+      /**
+       * <code>AUTOMATIC = 0;</code>
+       */
       public static final int AUTOMATIC_VALUE = 0;
+      /**
+       * <code>MANUAL = 1;</code>
+       */
       public static final int MANUAL_VALUE = 1;
+      /**
+       * <code>DEREGISTER = 2;</code>
+       */
       public static final int DEREGISTER_VALUE = 2;
+      /**
+       * <code>SET_ONLY = 3;</code>
+       */
       public static final int SET_ONLY_VALUE = 3;
+      /**
+       * <code>MANUAL_AUTOMATIC = 4;</code>
+       */
       public static final int MANUAL_AUTOMATIC_VALUE = 4;
-      
-      
+
+
       public final int getNumber() { return value; }
-      
+
       public static OperatorSelectMode valueOf(int value) {
         switch (value) {
           case 0: return AUTOMATIC;
@@ -5262,7 +6941,7 @@ public final class BinaryMessages {
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<OperatorSelectMode>
           internalGetValueMap() {
         return internalValueMap;
@@ -5274,7 +6953,7 @@ public final class BinaryMessages {
                 return OperatorSelectMode.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -5287,11 +6966,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.NetworkOperatorSettings.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final OperatorSelectMode[] VALUES = {
-        AUTOMATIC, MANUAL, DEREGISTER, SET_ONLY, MANUAL_AUTOMATIC, 
-      };
-      
+
+      private static final OperatorSelectMode[] VALUES = values();
+
       public static OperatorSelectMode valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -5300,69 +6977,174 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private OperatorSelectMode(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.NetworkOperatorSettings.OperatorSelectMode)
     }
-    
+
     public interface NetworkDescriptorOrBuilder
         extends com.google.protobuf.MessageOrBuilder {
-      
+
       // optional uint32 PLMN = 1;
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
       boolean hasPLMN();
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
       int getPLMN();
-      
+
       // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
       boolean hasNetworkType();
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
       com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType();
     }
+    /**
+     * Protobuf type {@code openxc.NetworkOperatorSettings.NetworkDescriptor}
+     */
     public static final class NetworkDescriptor extends
         com.google.protobuf.GeneratedMessage
         implements NetworkDescriptorOrBuilder {
       // Use NetworkDescriptor.newBuilder() to construct.
-      private NetworkDescriptor(Builder builder) {
+      private NetworkDescriptor(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
         super(builder);
+        this.unknownFields = builder.getUnknownFields();
       }
-      private NetworkDescriptor(boolean noInit) {}
-      
+      private NetworkDescriptor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
       private static final NetworkDescriptor defaultInstance;
       public static NetworkDescriptor getDefaultInstance() {
         return defaultInstance;
       }
-      
+
       public NetworkDescriptor getDefaultInstanceForType() {
         return defaultInstance;
       }
-      
+
+      private final com.google.protobuf.UnknownFieldSet unknownFields;
+      @java.lang.Override
+      public final com.google.protobuf.UnknownFieldSet
+          getUnknownFields() {
+        return this.unknownFields;
+      }
+      private NetworkDescriptor(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        initFields();
+        int mutable_bitField0_ = 0;
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              default: {
+                if (!parseUnknownField(input, unknownFields,
+                                       extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+              case 8: {
+                bitField0_ |= 0x00000001;
+                pLMN_ = input.readUInt32();
+                break;
+              }
+              case 16: {
+                int rawValue = input.readEnum();
+                com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.valueOf(rawValue);
+                if (value == null) {
+                  unknownFields.mergeVarintField(2, rawValue);
+                } else {
+                  bitField0_ |= 0x00000002;
+                  networkType_ = value;
+                }
+                break;
+              }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(
+              e.getMessage()).setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class);
       }
-      
+
+      public static com.google.protobuf.Parser<NetworkDescriptor> PARSER =
+          new com.google.protobuf.AbstractParser<NetworkDescriptor>() {
+        public NetworkDescriptor parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new NetworkDescriptor(input, extensionRegistry);
+        }
+      };
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<NetworkDescriptor> getParserForType() {
+        return PARSER;
+      }
+
+      /**
+       * Protobuf enum {@code openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType}
+       */
       public enum NetworkType
           implements com.google.protobuf.ProtocolMessageEnum {
+        /**
+         * <code>GSM = 0;</code>
+         */
         GSM(0, 0),
+        /**
+         * <code>UTRAN = 2;</code>
+         */
         UTRAN(1, 2),
         ;
-        
+
+        /**
+         * <code>GSM = 0;</code>
+         */
         public static final int GSM_VALUE = 0;
+        /**
+         * <code>UTRAN = 2;</code>
+         */
         public static final int UTRAN_VALUE = 2;
-        
-        
+
+
         public final int getNumber() { return value; }
-        
+
         public static NetworkType valueOf(int value) {
           switch (value) {
             case 0: return GSM;
@@ -5370,7 +7152,7 @@ public final class BinaryMessages {
             default: return null;
           }
         }
-        
+
         public static com.google.protobuf.Internal.EnumLiteMap<NetworkType>
             internalGetValueMap() {
           return internalValueMap;
@@ -5382,7 +7164,7 @@ public final class BinaryMessages {
                   return NetworkType.valueOf(number);
                 }
               };
-        
+
         public final com.google.protobuf.Descriptors.EnumValueDescriptor
             getValueDescriptor() {
           return getDescriptor().getValues().get(index);
@@ -5395,11 +7177,9 @@ public final class BinaryMessages {
             getDescriptor() {
           return com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDescriptor().getEnumTypes().get(0);
         }
-        
-        private static final NetworkType[] VALUES = {
-          GSM, UTRAN, 
-        };
-        
+
+        private static final NetworkType[] VALUES = values();
+
         public static NetworkType valueOf(
             com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
           if (desc.getType() != getDescriptor()) {
@@ -5408,39 +7188,51 @@ public final class BinaryMessages {
           }
           return VALUES[desc.getIndex()];
         }
-        
+
         private final int index;
         private final int value;
-        
+
         private NetworkType(int index, int value) {
           this.index = index;
           this.value = value;
         }
-        
+
         // @@protoc_insertion_point(enum_scope:openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType)
       }
-      
+
       private int bitField0_;
       // optional uint32 PLMN = 1;
       public static final int PLMN_FIELD_NUMBER = 1;
       private int pLMN_;
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
       public boolean hasPLMN() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
       public int getPLMN() {
         return pLMN_;
       }
-      
+
       // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;
       public static final int NETWORKTYPE_FIELD_NUMBER = 2;
       private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType_;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
       public boolean hasNetworkType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType() {
         return networkType_;
       }
-      
+
       private void initFields() {
         pLMN_ = 0;
         networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM;
@@ -5449,11 +7241,11 @@ public final class BinaryMessages {
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized != -1) return isInitialized == 1;
-        
+
         memoizedIsInitialized = 1;
         return true;
       }
-      
+
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         getSerializedSize();
@@ -5465,12 +7257,12 @@ public final class BinaryMessages {
         }
         getUnknownFields().writeTo(output);
       }
-      
+
       private int memoizedSerializedSize = -1;
       public int getSerializedSize() {
         int size = memoizedSerializedSize;
         if (size != -1) return size;
-      
+
         size = 0;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           size += com.google.protobuf.CodedOutputStream
@@ -5484,94 +7276,83 @@ public final class BinaryMessages {
         memoizedSerializedSize = size;
         return size;
       }
-      
+
       private static final long serialVersionUID = 0L;
       @java.lang.Override
       protected java.lang.Object writeReplace()
           throws java.io.ObjectStreamException {
         return super.writeReplace();
       }
-      
+
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return newBuilder().mergeFrom(data).buildParsed();
+        return PARSER.parseFrom(data);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
           com.google.protobuf.ByteString data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return newBuilder().mergeFrom(data, extensionRegistry)
-                 .buildParsed();
+        return PARSER.parseFrom(data, extensionRegistry);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return newBuilder().mergeFrom(data).buildParsed();
+        return PARSER.parseFrom(data);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
           byte[] data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return newBuilder().mergeFrom(data, extensionRegistry)
-                 .buildParsed();
+        return PARSER.parseFrom(data, extensionRegistry);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return newBuilder().mergeFrom(input).buildParsed();
+        return PARSER.parseFrom(input);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return newBuilder().mergeFrom(input, extensionRegistry)
-                 .buildParsed();
+        return PARSER.parseFrom(input, extensionRegistry);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        Builder builder = newBuilder();
-        if (builder.mergeDelimitedFrom(input)) {
-          return builder.buildParsed();
-        } else {
-          return null;
-        }
+        return PARSER.parseDelimitedFrom(input);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseDelimitedFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        Builder builder = newBuilder();
-        if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-          return builder.buildParsed();
-        } else {
-          return null;
-        }
+        return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
-        return newBuilder().mergeFrom(input).buildParsed();
+        return PARSER.parseFrom(input);
       }
       public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return newBuilder().mergeFrom(input, extensionRegistry)
-                 .buildParsed();
+        return PARSER.parseFrom(input, extensionRegistry);
       }
-      
+
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
-      
+
       @java.lang.Override
       protected Builder newBuilderForType(
           com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
+      /**
+       * Protobuf type {@code openxc.NetworkOperatorSettings.NetworkDescriptor}
+       */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder<Builder>
          implements com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder {
@@ -5579,18 +7360,21 @@ public final class BinaryMessages {
             getDescriptor() {
           return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor;
         }
-        
+
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable;
+          return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class);
         }
-        
+
         // Construct using com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
-        
-        private Builder(BuilderParent parent) {
+
+        private Builder(
+            com.google.protobuf.GeneratedMessage.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
@@ -5601,7 +7385,7 @@ public final class BinaryMessages {
         private static Builder create() {
           return new Builder();
         }
-        
+
         public Builder clear() {
           super.clear();
           pLMN_ = 0;
@@ -5610,20 +7394,20 @@ public final class BinaryMessages {
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
-        
+
         public Builder clone() {
           return create().mergeFrom(buildPartial());
         }
-        
+
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDescriptor();
+          return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor;
         }
-        
+
         public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getDefaultInstanceForType() {
           return com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
         }
-        
+
         public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor build() {
           com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = buildPartial();
           if (!result.isInitialized()) {
@@ -5631,17 +7415,7 @@ public final class BinaryMessages {
           }
           return result;
         }
-        
-        private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor buildParsed()
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(
-              result).asInvalidProtocolBufferException();
-          }
-          return result;
-        }
-        
+
         public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor buildPartial() {
           com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = new com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor(this);
           int from_bitField0_ = bitField0_;
@@ -5658,7 +7432,7 @@ public final class BinaryMessages {
           onBuilt();
           return result;
         }
-        
+
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor) {
             return mergeFrom((com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor)other);
@@ -5667,7 +7441,7 @@ public final class BinaryMessages {
             return this;
           }
         }
-        
+
         public Builder mergeFrom(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor other) {
           if (other == com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance()) return this;
           if (other.hasPLMN()) {
@@ -5679,85 +7453,80 @@ public final class BinaryMessages {
           this.mergeUnknownFields(other.getUnknownFields());
           return this;
         }
-        
+
         public final boolean isInitialized() {
           return true;
         }
-        
+
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder(
-              this.getUnknownFields());
-          while (true) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              default: {
-                if (!parseUnknownField(input, unknownFields,
-                                       extensionRegistry, tag)) {
-                  this.setUnknownFields(unknownFields.build());
-                  onChanged();
-                  return this;
-                }
-                break;
-              }
-              case 8: {
-                bitField0_ |= 0x00000001;
-                pLMN_ = input.readUInt32();
-                break;
-              }
-              case 16: {
-                int rawValue = input.readEnum();
-                com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.valueOf(rawValue);
-                if (value == null) {
-                  unknownFields.mergeVarintField(2, rawValue);
-                } else {
-                  bitField0_ |= 0x00000002;
-                  networkType_ = value;
-                }
-                break;
-              }
+          com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parsedMessage = null;
+          try {
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage = (com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor) e.getUnfinishedMessage();
+            throw e;
+          } finally {
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
             }
           }
+          return this;
         }
-        
         private int bitField0_;
-        
+
         // optional uint32 PLMN = 1;
         private int pLMN_ ;
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
         public boolean hasPLMN() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
         public int getPLMN() {
           return pLMN_;
         }
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
         public Builder setPLMN(int value) {
           bitField0_ |= 0x00000001;
           pLMN_ = value;
           onChanged();
           return this;
         }
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
         public Builder clearPLMN() {
           bitField0_ = (bitField0_ & ~0x00000001);
           pLMN_ = 0;
           onChanged();
           return this;
         }
-        
+
         // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;
         private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM;
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
         public boolean hasNetworkType() {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
         public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType() {
           return networkType_;
         }
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
         public Builder setNetworkType(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value) {
           if (value == null) {
             throw new NullPointerException();
@@ -5767,58 +7536,82 @@ public final class BinaryMessages {
           onChanged();
           return this;
         }
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
         public Builder clearNetworkType() {
           bitField0_ = (bitField0_ & ~0x00000002);
           networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM;
           onChanged();
           return this;
         }
-        
+
         // @@protoc_insertion_point(builder_scope:openxc.NetworkOperatorSettings.NetworkDescriptor)
       }
-      
+
       static {
         defaultInstance = new NetworkDescriptor(true);
         defaultInstance.initFields();
       }
-      
+
       // @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings.NetworkDescriptor)
     }
-    
+
     private int bitField0_;
     // optional bool allowDataRoaming = 1;
     public static final int ALLOWDATAROAMING_FIELD_NUMBER = 1;
     private boolean allowDataRoaming_;
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
     public boolean hasAllowDataRoaming() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
     public boolean getAllowDataRoaming() {
       return allowDataRoaming_;
     }
-    
+
     // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;
     public static final int OPERATORSELECTMODE_FIELD_NUMBER = 2;
     private com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode_;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
     public boolean hasOperatorSelectMode() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
     public com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode() {
       return operatorSelectMode_;
     }
-    
+
     // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;
     public static final int NETWORKDESCRIPTOR_FIELD_NUMBER = 3;
     private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor networkDescriptor_;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
     public boolean hasNetworkDescriptor() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
     public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor() {
       return networkDescriptor_;
     }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
     public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder() {
       return networkDescriptor_;
     }
-    
+
     private void initFields() {
       allowDataRoaming_ = false;
       operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC;
@@ -5828,11 +7621,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -5847,12 +7640,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -5870,94 +7663,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.NetworkOperatorSettings prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.NetworkOperatorSettings}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder {
@@ -5965,18 +7747,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.NetworkOperatorSettings.class, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.NetworkOperatorSettings.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -5988,7 +7773,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         allowDataRoaming_ = false;
@@ -6003,20 +7788,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.NetworkOperatorSettings.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.NetworkOperatorSettings getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.NetworkOperatorSettings build() {
         com.openxc.BinaryMessages.NetworkOperatorSettings result = buildPartial();
         if (!result.isInitialized()) {
@@ -6024,17 +7809,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.NetworkOperatorSettings buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.NetworkOperatorSettings result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.NetworkOperatorSettings buildPartial() {
         com.openxc.BinaryMessages.NetworkOperatorSettings result = new com.openxc.BinaryMessages.NetworkOperatorSettings(this);
         int from_bitField0_ = bitField0_;
@@ -6059,7 +7834,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.NetworkOperatorSettings) {
           return mergeFrom((com.openxc.BinaryMessages.NetworkOperatorSettings)other);
@@ -6068,7 +7843,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.NetworkOperatorSettings other) {
         if (other == com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance()) return this;
         if (other.hasAllowDataRoaming()) {
@@ -6083,94 +7858,80 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              allowDataRoaming_ = input.readBool();
-              break;
-            }
-            case 16: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(2, rawValue);
-              } else {
-                bitField0_ |= 0x00000002;
-                operatorSelectMode_ = value;
-              }
-              break;
-            }
-            case 26: {
-              com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder subBuilder = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.newBuilder();
-              if (hasNetworkDescriptor()) {
-                subBuilder.mergeFrom(getNetworkDescriptor());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setNetworkDescriptor(subBuilder.buildPartial());
-              break;
-            }
+        com.openxc.BinaryMessages.NetworkOperatorSettings parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.NetworkOperatorSettings) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional bool allowDataRoaming = 1;
       private boolean allowDataRoaming_ ;
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
       public boolean hasAllowDataRoaming() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
       public boolean getAllowDataRoaming() {
         return allowDataRoaming_;
       }
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
       public Builder setAllowDataRoaming(boolean value) {
         bitField0_ |= 0x00000001;
         allowDataRoaming_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
       public Builder clearAllowDataRoaming() {
         bitField0_ = (bitField0_ & ~0x00000001);
         allowDataRoaming_ = false;
         onChanged();
         return this;
       }
-      
+
       // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;
       private com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
       public boolean hasOperatorSelectMode() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode() {
         return operatorSelectMode_;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
       public Builder setOperatorSelectMode(com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value) {
         if (value == null) {
           throw new NullPointerException();
@@ -6180,20 +7941,29 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
       public Builder clearOperatorSelectMode() {
         bitField0_ = (bitField0_ & ~0x00000002);
         operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC;
         onChanged();
         return this;
       }
-      
+
       // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;
       private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder> networkDescriptorBuilder_;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public boolean hasNetworkDescriptor() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor() {
         if (networkDescriptorBuilder_ == null) {
           return networkDescriptor_;
@@ -6201,6 +7971,9 @@ public final class BinaryMessages {
           return networkDescriptorBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public Builder setNetworkDescriptor(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor value) {
         if (networkDescriptorBuilder_ == null) {
           if (value == null) {
@@ -6214,6 +7987,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public Builder setNetworkDescriptor(
           com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder builderForValue) {
         if (networkDescriptorBuilder_ == null) {
@@ -6225,6 +8001,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public Builder mergeNetworkDescriptor(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor value) {
         if (networkDescriptorBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -6241,6 +8020,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public Builder clearNetworkDescriptor() {
         if (networkDescriptorBuilder_ == null) {
           networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
@@ -6251,11 +8033,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder getNetworkDescriptorBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getNetworkDescriptorFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder() {
         if (networkDescriptorBuilder_ != null) {
           return networkDescriptorBuilder_.getMessageOrBuilder();
@@ -6263,6 +8051,9 @@ public final class BinaryMessages {
           return networkDescriptor_;
         }
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder> 
           getNetworkDescriptorFieldBuilder() {
@@ -6276,86 +8067,175 @@ public final class BinaryMessages {
         }
         return networkDescriptorBuilder_;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.NetworkOperatorSettings)
     }
-    
+
     static {
       defaultInstance = new NetworkOperatorSettings(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings)
   }
-  
+
   public interface NetworkDataSettingsOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional string APN = 1;
+    /**
+     * <code>optional string APN = 1;</code>
+     */
     boolean hasAPN();
-    String getAPN();
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    java.lang.String getAPN();
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    com.google.protobuf.ByteString
+        getAPNBytes();
   }
+  /**
+   * Protobuf type {@code openxc.NetworkDataSettings}
+   */
   public static final class NetworkDataSettings extends
       com.google.protobuf.GeneratedMessage
       implements NetworkDataSettingsOrBuilder {
     // Use NetworkDataSettings.newBuilder() to construct.
-    private NetworkDataSettings(Builder builder) {
+    private NetworkDataSettings(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private NetworkDataSettings(boolean noInit) {}
-    
+    private NetworkDataSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final NetworkDataSettings defaultInstance;
     public static NetworkDataSettings getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public NetworkDataSettings getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private NetworkDataSettings(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              aPN_ = input.readBytes();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.NetworkDataSettings.class, com.openxc.BinaryMessages.NetworkDataSettings.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<NetworkDataSettings> PARSER =
+        new com.google.protobuf.AbstractParser<NetworkDataSettings>() {
+      public NetworkDataSettings parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new NetworkDataSettings(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NetworkDataSettings> getParserForType() {
+      return PARSER;
     }
-    
+
     private int bitField0_;
     // optional string APN = 1;
     public static final int APN_FIELD_NUMBER = 1;
     private java.lang.Object aPN_;
+    /**
+     * <code>optional string APN = 1;</code>
+     */
     public boolean hasAPN() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public String getAPN() {
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    public java.lang.String getAPN() {
       java.lang.Object ref = aPN_;
-      if (ref instanceof String) {
-        return (String) ref;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           aPN_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getAPNBytes() {
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getAPNBytes() {
       java.lang.Object ref = aPN_;
-      if (ref instanceof String) {
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         aPN_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-    
+
     private void initFields() {
       aPN_ = "";
     }
@@ -6363,11 +8243,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -6376,12 +8256,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -6391,94 +8271,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.NetworkDataSettings prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.NetworkDataSettings}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder {
@@ -6486,18 +8355,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.NetworkDataSettings.class, com.openxc.BinaryMessages.NetworkDataSettings.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.NetworkDataSettings.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -6508,27 +8380,27 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         aPN_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.NetworkDataSettings.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.NetworkDataSettings getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.NetworkDataSettings build() {
         com.openxc.BinaryMessages.NetworkDataSettings result = buildPartial();
         if (!result.isInitialized()) {
@@ -6536,17 +8408,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.NetworkDataSettings buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.NetworkDataSettings result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.NetworkDataSettings buildPartial() {
         com.openxc.BinaryMessages.NetworkDataSettings result = new com.openxc.BinaryMessages.NetworkDataSettings(this);
         int from_bitField0_ = bitField0_;
@@ -6559,7 +8421,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.NetworkDataSettings) {
           return mergeFrom((com.openxc.BinaryMessages.NetworkDataSettings)other);
@@ -6568,70 +8430,84 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.NetworkDataSettings other) {
         if (other == com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance()) return this;
         if (other.hasAPN()) {
-          setAPN(other.getAPN());
+          bitField0_ |= 0x00000001;
+          aPN_ = other.aPN_;
+          onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              aPN_ = input.readBytes();
-              break;
-            }
+        com.openxc.BinaryMessages.NetworkDataSettings parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.NetworkDataSettings) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional string APN = 1;
       private java.lang.Object aPN_ = "";
+      /**
+       * <code>optional string APN = 1;</code>
+       */
       public boolean hasAPN() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public String getAPN() {
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public java.lang.String getAPN() {
         java.lang.Object ref = aPN_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
           aPN_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
-      public Builder setAPN(String value) {
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public com.google.protobuf.ByteString
+          getAPNBytes() {
+        java.lang.Object ref = aPN_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          aPN_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public Builder setAPN(
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -6640,111 +8516,228 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional string APN = 1;</code>
+       */
       public Builder clearAPN() {
         bitField0_ = (bitField0_ & ~0x00000001);
         aPN_ = getDefaultInstance().getAPN();
         onChanged();
         return this;
       }
-      void setAPN(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public Builder setAPNBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
         aPN_ = value;
         onChanged();
+        return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.NetworkDataSettings)
     }
-    
+
     static {
       defaultInstance = new NetworkDataSettings(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.NetworkDataSettings)
   }
-  
+
   public interface ServerConnectSettingsOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional string host = 1;
+    /**
+     * <code>optional string host = 1;</code>
+     */
     boolean hasHost();
-    String getHost();
-    
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    java.lang.String getHost();
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    com.google.protobuf.ByteString
+        getHostBytes();
+
     // optional uint32 port = 2;
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
     boolean hasPort();
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
     int getPort();
   }
+  /**
+   * Protobuf type {@code openxc.ServerConnectSettings}
+   */
   public static final class ServerConnectSettings extends
       com.google.protobuf.GeneratedMessage
       implements ServerConnectSettingsOrBuilder {
     // Use ServerConnectSettings.newBuilder() to construct.
-    private ServerConnectSettings(Builder builder) {
+    private ServerConnectSettings(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private ServerConnectSettings(boolean noInit) {}
-    
+    private ServerConnectSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final ServerConnectSettings defaultInstance;
     public static ServerConnectSettings getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public ServerConnectSettings getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ServerConnectSettings(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              host_ = input.readBytes();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              port_ = input.readUInt32();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.ServerConnectSettings.class, com.openxc.BinaryMessages.ServerConnectSettings.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<ServerConnectSettings> PARSER =
+        new com.google.protobuf.AbstractParser<ServerConnectSettings>() {
+      public ServerConnectSettings parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ServerConnectSettings(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ServerConnectSettings> getParserForType() {
+      return PARSER;
     }
-    
+
     private int bitField0_;
     // optional string host = 1;
     public static final int HOST_FIELD_NUMBER = 1;
     private java.lang.Object host_;
+    /**
+     * <code>optional string host = 1;</code>
+     */
     public boolean hasHost() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public String getHost() {
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    public java.lang.String getHost() {
       java.lang.Object ref = host_;
-      if (ref instanceof String) {
-        return (String) ref;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           host_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getHostBytes() {
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getHostBytes() {
       java.lang.Object ref = host_;
-      if (ref instanceof String) {
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         host_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-    
+
     // optional uint32 port = 2;
     public static final int PORT_FIELD_NUMBER = 2;
     private int port_;
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
     public boolean hasPort() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
     public int getPort() {
       return port_;
     }
-    
+
     private void initFields() {
       host_ = "";
       port_ = 0;
@@ -6753,11 +8746,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -6769,12 +8762,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -6788,94 +8781,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.ServerConnectSettings prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.ServerConnectSettings}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder {
@@ -6883,18 +8865,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.ServerConnectSettings.class, com.openxc.BinaryMessages.ServerConnectSettings.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.ServerConnectSettings.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -6905,7 +8890,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         host_ = "";
@@ -6914,20 +8899,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.ServerConnectSettings.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.ServerConnectSettings getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.ServerConnectSettings build() {
         com.openxc.BinaryMessages.ServerConnectSettings result = buildPartial();
         if (!result.isInitialized()) {
@@ -6935,17 +8920,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.ServerConnectSettings buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.ServerConnectSettings result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.ServerConnectSettings buildPartial() {
         com.openxc.BinaryMessages.ServerConnectSettings result = new com.openxc.BinaryMessages.ServerConnectSettings(this);
         int from_bitField0_ = bitField0_;
@@ -6962,7 +8937,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.ServerConnectSettings) {
           return mergeFrom((com.openxc.BinaryMessages.ServerConnectSettings)other);
@@ -6971,11 +8946,13 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.ServerConnectSettings other) {
         if (other == com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance()) return this;
         if (other.hasHost()) {
-          setHost(other.getHost());
+          bitField0_ |= 0x00000001;
+          host_ = other.host_;
+          onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
@@ -6983,66 +8960,73 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              host_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              port_ = input.readUInt32();
-              break;
-            }
+        com.openxc.BinaryMessages.ServerConnectSettings parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.ServerConnectSettings) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional string host = 1;
       private java.lang.Object host_ = "";
+      /**
+       * <code>optional string host = 1;</code>
+       */
       public boolean hasHost() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public String getHost() {
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public java.lang.String getHost() {
         java.lang.Object ref = host_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
           host_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public com.google.protobuf.ByteString
+          getHostBytes() {
+        java.lang.Object ref = host_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          host_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
         }
       }
-      public Builder setHost(String value) {
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public Builder setHost(
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7051,136 +9035,314 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional string host = 1;</code>
+       */
       public Builder clearHost() {
         bitField0_ = (bitField0_ & ~0x00000001);
         host_ = getDefaultInstance().getHost();
         onChanged();
         return this;
       }
-      void setHost(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public Builder setHostBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
         host_ = value;
         onChanged();
+        return this;
       }
-      
+
       // optional uint32 port = 2;
       private int port_ ;
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
       public boolean hasPort() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
       public int getPort() {
         return port_;
       }
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
       public Builder setPort(int value) {
         bitField0_ |= 0x00000002;
         port_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
       public Builder clearPort() {
         bitField0_ = (bitField0_ & ~0x00000002);
         port_ = 0;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.ServerConnectSettings)
     }
-    
+
     static {
       defaultInstance = new ServerConnectSettings(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.ServerConnectSettings)
   }
-  
+
   public interface ModemConfigurationCommandOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
     boolean hasNetworkOperatorSettings();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
     com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
     com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder();
-    
+
     // optional .openxc.NetworkDataSettings networkDataSettings = 2;
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
     boolean hasNetworkDataSettings();
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
     com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings();
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
     com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder();
-    
+
     // optional .openxc.ServerConnectSettings serverConnectSettings = 3;
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
     boolean hasServerConnectSettings();
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
     com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings();
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
     com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder();
   }
+  /**
+   * Protobuf type {@code openxc.ModemConfigurationCommand}
+   */
   public static final class ModemConfigurationCommand extends
       com.google.protobuf.GeneratedMessage
       implements ModemConfigurationCommandOrBuilder {
     // Use ModemConfigurationCommand.newBuilder() to construct.
-    private ModemConfigurationCommand(Builder builder) {
+    private ModemConfigurationCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private ModemConfigurationCommand(boolean noInit) {}
-    
+    private ModemConfigurationCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final ModemConfigurationCommand defaultInstance;
     public static ModemConfigurationCommand getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public ModemConfigurationCommand getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ModemConfigurationCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              com.openxc.BinaryMessages.NetworkOperatorSettings.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000001) == 0x00000001)) {
+                subBuilder = networkOperatorSettings_.toBuilder();
+              }
+              networkOperatorSettings_ = input.readMessage(com.openxc.BinaryMessages.NetworkOperatorSettings.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(networkOperatorSettings_);
+                networkOperatorSettings_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000001;
+              break;
+            }
+            case 18: {
+              com.openxc.BinaryMessages.NetworkDataSettings.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000002) == 0x00000002)) {
+                subBuilder = networkDataSettings_.toBuilder();
+              }
+              networkDataSettings_ = input.readMessage(com.openxc.BinaryMessages.NetworkDataSettings.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(networkDataSettings_);
+                networkDataSettings_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000002;
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.ServerConnectSettings.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = serverConnectSettings_.toBuilder();
+              }
+              serverConnectSettings_ = input.readMessage(com.openxc.BinaryMessages.ServerConnectSettings.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(serverConnectSettings_);
+                serverConnectSettings_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.ModemConfigurationCommand.class, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<ModemConfigurationCommand> PARSER =
+        new com.google.protobuf.AbstractParser<ModemConfigurationCommand>() {
+      public ModemConfigurationCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ModemConfigurationCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ModemConfigurationCommand> getParserForType() {
+      return PARSER;
+    }
+
     private int bitField0_;
     // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;
     public static final int NETWORKOPERATORSETTINGS_FIELD_NUMBER = 1;
     private com.openxc.BinaryMessages.NetworkOperatorSettings networkOperatorSettings_;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
     public boolean hasNetworkOperatorSettings() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
     public com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings() {
       return networkOperatorSettings_;
     }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
     public com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder() {
       return networkOperatorSettings_;
     }
-    
+
     // optional .openxc.NetworkDataSettings networkDataSettings = 2;
     public static final int NETWORKDATASETTINGS_FIELD_NUMBER = 2;
     private com.openxc.BinaryMessages.NetworkDataSettings networkDataSettings_;
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
     public boolean hasNetworkDataSettings() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
     public com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings() {
       return networkDataSettings_;
     }
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
     public com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder() {
       return networkDataSettings_;
     }
-    
+
     // optional .openxc.ServerConnectSettings serverConnectSettings = 3;
     public static final int SERVERCONNECTSETTINGS_FIELD_NUMBER = 3;
     private com.openxc.BinaryMessages.ServerConnectSettings serverConnectSettings_;
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
     public boolean hasServerConnectSettings() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
     public com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings() {
       return serverConnectSettings_;
     }
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
     public com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder() {
       return serverConnectSettings_;
     }
-    
+
     private void initFields() {
       networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
       networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
@@ -7190,11 +9352,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -7209,12 +9371,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -7232,94 +9394,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.ModemConfigurationCommand prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.ModemConfigurationCommand}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder {
@@ -7327,18 +9478,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.ModemConfigurationCommand.class, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.ModemConfigurationCommand.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -7352,7 +9506,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         if (networkOperatorSettingsBuilder_ == null) {
@@ -7375,20 +9529,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.ModemConfigurationCommand.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.ModemConfigurationCommand getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.ModemConfigurationCommand build() {
         com.openxc.BinaryMessages.ModemConfigurationCommand result = buildPartial();
         if (!result.isInitialized()) {
@@ -7396,17 +9550,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.ModemConfigurationCommand buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.ModemConfigurationCommand result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.ModemConfigurationCommand buildPartial() {
         com.openxc.BinaryMessages.ModemConfigurationCommand result = new com.openxc.BinaryMessages.ModemConfigurationCommand(this);
         int from_bitField0_ = bitField0_;
@@ -7439,7 +9583,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.ModemConfigurationCommand) {
           return mergeFrom((com.openxc.BinaryMessages.ModemConfigurationCommand)other);
@@ -7448,7 +9592,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.ModemConfigurationCommand other) {
         if (other == com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance()) return this;
         if (other.hasNetworkOperatorSettings()) {
@@ -7463,74 +9607,43 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              com.openxc.BinaryMessages.NetworkOperatorSettings.Builder subBuilder = com.openxc.BinaryMessages.NetworkOperatorSettings.newBuilder();
-              if (hasNetworkOperatorSettings()) {
-                subBuilder.mergeFrom(getNetworkOperatorSettings());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setNetworkOperatorSettings(subBuilder.buildPartial());
-              break;
-            }
-            case 18: {
-              com.openxc.BinaryMessages.NetworkDataSettings.Builder subBuilder = com.openxc.BinaryMessages.NetworkDataSettings.newBuilder();
-              if (hasNetworkDataSettings()) {
-                subBuilder.mergeFrom(getNetworkDataSettings());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setNetworkDataSettings(subBuilder.buildPartial());
-              break;
-            }
-            case 26: {
-              com.openxc.BinaryMessages.ServerConnectSettings.Builder subBuilder = com.openxc.BinaryMessages.ServerConnectSettings.newBuilder();
-              if (hasServerConnectSettings()) {
-                subBuilder.mergeFrom(getServerConnectSettings());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setServerConnectSettings(subBuilder.buildPartial());
-              break;
-            }
+        com.openxc.BinaryMessages.ModemConfigurationCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.ModemConfigurationCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;
       private com.openxc.BinaryMessages.NetworkOperatorSettings networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.NetworkOperatorSettings, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder, com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder> networkOperatorSettingsBuilder_;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public boolean hasNetworkOperatorSettings() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings() {
         if (networkOperatorSettingsBuilder_ == null) {
           return networkOperatorSettings_;
@@ -7538,6 +9651,9 @@ public final class BinaryMessages {
           return networkOperatorSettingsBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public Builder setNetworkOperatorSettings(com.openxc.BinaryMessages.NetworkOperatorSettings value) {
         if (networkOperatorSettingsBuilder_ == null) {
           if (value == null) {
@@ -7551,6 +9667,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000001;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public Builder setNetworkOperatorSettings(
           com.openxc.BinaryMessages.NetworkOperatorSettings.Builder builderForValue) {
         if (networkOperatorSettingsBuilder_ == null) {
@@ -7562,6 +9681,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000001;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public Builder mergeNetworkOperatorSettings(com.openxc.BinaryMessages.NetworkOperatorSettings value) {
         if (networkOperatorSettingsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
@@ -7578,6 +9700,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000001;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public Builder clearNetworkOperatorSettings() {
         if (networkOperatorSettingsBuilder_ == null) {
           networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
@@ -7588,11 +9713,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettings.Builder getNetworkOperatorSettingsBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getNetworkOperatorSettingsFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       public com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder() {
         if (networkOperatorSettingsBuilder_ != null) {
           return networkOperatorSettingsBuilder_.getMessageOrBuilder();
@@ -7600,6 +9731,9 @@ public final class BinaryMessages {
           return networkOperatorSettings_;
         }
       }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.NetworkOperatorSettings, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder, com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder> 
           getNetworkOperatorSettingsFieldBuilder() {
@@ -7613,14 +9747,20 @@ public final class BinaryMessages {
         }
         return networkOperatorSettingsBuilder_;
       }
-      
+
       // optional .openxc.NetworkDataSettings networkDataSettings = 2;
       private com.openxc.BinaryMessages.NetworkDataSettings networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.NetworkDataSettings, com.openxc.BinaryMessages.NetworkDataSettings.Builder, com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder> networkDataSettingsBuilder_;
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public boolean hasNetworkDataSettings() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings() {
         if (networkDataSettingsBuilder_ == null) {
           return networkDataSettings_;
@@ -7628,6 +9768,9 @@ public final class BinaryMessages {
           return networkDataSettingsBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public Builder setNetworkDataSettings(com.openxc.BinaryMessages.NetworkDataSettings value) {
         if (networkDataSettingsBuilder_ == null) {
           if (value == null) {
@@ -7641,6 +9784,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public Builder setNetworkDataSettings(
           com.openxc.BinaryMessages.NetworkDataSettings.Builder builderForValue) {
         if (networkDataSettingsBuilder_ == null) {
@@ -7652,6 +9798,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public Builder mergeNetworkDataSettings(com.openxc.BinaryMessages.NetworkDataSettings value) {
         if (networkDataSettingsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
@@ -7668,6 +9817,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public Builder clearNetworkDataSettings() {
         if (networkDataSettingsBuilder_ == null) {
           networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
@@ -7678,11 +9830,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public com.openxc.BinaryMessages.NetworkDataSettings.Builder getNetworkDataSettingsBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getNetworkDataSettingsFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       public com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder() {
         if (networkDataSettingsBuilder_ != null) {
           return networkDataSettingsBuilder_.getMessageOrBuilder();
@@ -7690,6 +9848,9 @@ public final class BinaryMessages {
           return networkDataSettings_;
         }
       }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.NetworkDataSettings, com.openxc.BinaryMessages.NetworkDataSettings.Builder, com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder> 
           getNetworkDataSettingsFieldBuilder() {
@@ -7703,14 +9864,20 @@ public final class BinaryMessages {
         }
         return networkDataSettingsBuilder_;
       }
-      
+
       // optional .openxc.ServerConnectSettings serverConnectSettings = 3;
       private com.openxc.BinaryMessages.ServerConnectSettings serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.ServerConnectSettings, com.openxc.BinaryMessages.ServerConnectSettings.Builder, com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder> serverConnectSettingsBuilder_;
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public boolean hasServerConnectSettings() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings() {
         if (serverConnectSettingsBuilder_ == null) {
           return serverConnectSettings_;
@@ -7718,6 +9885,9 @@ public final class BinaryMessages {
           return serverConnectSettingsBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public Builder setServerConnectSettings(com.openxc.BinaryMessages.ServerConnectSettings value) {
         if (serverConnectSettingsBuilder_ == null) {
           if (value == null) {
@@ -7731,6 +9901,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public Builder setServerConnectSettings(
           com.openxc.BinaryMessages.ServerConnectSettings.Builder builderForValue) {
         if (serverConnectSettingsBuilder_ == null) {
@@ -7742,6 +9915,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public Builder mergeServerConnectSettings(com.openxc.BinaryMessages.ServerConnectSettings value) {
         if (serverConnectSettingsBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -7758,6 +9934,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public Builder clearServerConnectSettings() {
         if (serverConnectSettingsBuilder_ == null) {
           serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
@@ -7768,11 +9947,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public com.openxc.BinaryMessages.ServerConnectSettings.Builder getServerConnectSettingsBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getServerConnectSettingsFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       public com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder() {
         if (serverConnectSettingsBuilder_ != null) {
           return serverConnectSettingsBuilder_.getMessageOrBuilder();
@@ -7780,6 +9965,9 @@ public final class BinaryMessages {
           return serverConnectSettings_;
         }
       }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.ServerConnectSettings, com.openxc.BinaryMessages.ServerConnectSettings.Builder, com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder> 
           getServerConnectSettingsFieldBuilder() {
@@ -7793,114 +9981,639 @@ public final class BinaryMessages {
         }
         return serverConnectSettingsBuilder_;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.ModemConfigurationCommand)
     }
-    
+
     static {
       defaultInstance = new ModemConfigurationCommand(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.ModemConfigurationCommand)
   }
-  
+
+  public interface RTCConfigurationCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional uint32 unix_time = 1;
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    boolean hasUnixTime();
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    int getUnixTime();
+  }
+  /**
+   * Protobuf type {@code openxc.RTCConfigurationCommand}
+   */
+  public static final class RTCConfigurationCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements RTCConfigurationCommandOrBuilder {
+    // Use RTCConfigurationCommand.newBuilder() to construct.
+    private RTCConfigurationCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private RTCConfigurationCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final RTCConfigurationCommand defaultInstance;
+    public static RTCConfigurationCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public RTCConfigurationCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private RTCConfigurationCommand(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              unixTime_ = input.readUInt32();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.RTCConfigurationCommand.class, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<RTCConfigurationCommand> PARSER =
+        new com.google.protobuf.AbstractParser<RTCConfigurationCommand>() {
+      public RTCConfigurationCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new RTCConfigurationCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<RTCConfigurationCommand> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional uint32 unix_time = 1;
+    public static final int UNIX_TIME_FIELD_NUMBER = 1;
+    private int unixTime_;
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    public boolean hasUnixTime() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    public int getUnixTime() {
+      return unixTime_;
+    }
+
+    private void initFields() {
+      unixTime_ = 0;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeUInt32(1, unixTime_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, unixTime_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(com.openxc.BinaryMessages.RTCConfigurationCommand prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code openxc.RTCConfigurationCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.RTCConfigurationCommand.class, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.RTCConfigurationCommand.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        unixTime_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.RTCConfigurationCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.RTCConfigurationCommand build() {
+        com.openxc.BinaryMessages.RTCConfigurationCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.RTCConfigurationCommand buildPartial() {
+        com.openxc.BinaryMessages.RTCConfigurationCommand result = new com.openxc.BinaryMessages.RTCConfigurationCommand(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.unixTime_ = unixTime_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.RTCConfigurationCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.RTCConfigurationCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.RTCConfigurationCommand other) {
+        if (other == com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance()) return this;
+        if (other.hasUnixTime()) {
+          setUnixTime(other.getUnixTime());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.openxc.BinaryMessages.RTCConfigurationCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.RTCConfigurationCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional uint32 unix_time = 1;
+      private int unixTime_ ;
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public boolean hasUnixTime() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public int getUnixTime() {
+        return unixTime_;
+      }
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public Builder setUnixTime(int value) {
+        bitField0_ |= 0x00000001;
+        unixTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public Builder clearUnixTime() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        unixTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.RTCConfigurationCommand)
+    }
+
+    static {
+      defaultInstance = new RTCConfigurationCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.RTCConfigurationCommand)
+  }
+
   public interface CommandResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional .openxc.ControlCommand.Type type = 1;
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     boolean hasType();
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     com.openxc.BinaryMessages.ControlCommand.Type getType();
-    
+
     // optional string message = 2;
+    /**
+     * <code>optional string message = 2;</code>
+     */
     boolean hasMessage();
-    String getMessage();
-    
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    java.lang.String getMessage();
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    com.google.protobuf.ByteString
+        getMessageBytes();
+
     // optional bool status = 3;
+    /**
+     * <code>optional bool status = 3;</code>
+     */
     boolean hasStatus();
+    /**
+     * <code>optional bool status = 3;</code>
+     */
     boolean getStatus();
   }
+  /**
+   * Protobuf type {@code openxc.CommandResponse}
+   */
   public static final class CommandResponse extends
       com.google.protobuf.GeneratedMessage
       implements CommandResponseOrBuilder {
     // Use CommandResponse.newBuilder() to construct.
-    private CommandResponse(Builder builder) {
+    private CommandResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private CommandResponse(boolean noInit) {}
-    
+    private CommandResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final CommandResponse defaultInstance;
     public static CommandResponse getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public CommandResponse getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private CommandResponse(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              message_ = input.readBytes();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              status_ = input.readBool();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<CommandResponse> PARSER =
+        new com.google.protobuf.AbstractParser<CommandResponse>() {
+      public CommandResponse parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new CommandResponse(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<CommandResponse> getParserForType() {
+      return PARSER;
+    }
+
     private int bitField0_;
     // optional .openxc.ControlCommand.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private com.openxc.BinaryMessages.ControlCommand.Type type_;
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
     public com.openxc.BinaryMessages.ControlCommand.Type getType() {
       return type_;
     }
-    
+
     // optional string message = 2;
     public static final int MESSAGE_FIELD_NUMBER = 2;
     private java.lang.Object message_;
+    /**
+     * <code>optional string message = 2;</code>
+     */
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public String getMessage() {
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    public java.lang.String getMessage() {
       java.lang.Object ref = message_;
-      if (ref instanceof String) {
-        return (String) ref;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           message_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getMessageBytes() {
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getMessageBytes() {
       java.lang.Object ref = message_;
-      if (ref instanceof String) {
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         message_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-    
+
     // optional bool status = 3;
     public static final int STATUS_FIELD_NUMBER = 3;
     private boolean status_;
+    /**
+     * <code>optional bool status = 3;</code>
+     */
     public boolean hasStatus() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional bool status = 3;</code>
+     */
     public boolean getStatus() {
       return status_;
     }
-    
+
     private void initFields() {
       type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
       message_ = "";
@@ -7910,11 +10623,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -7929,12 +10642,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -7952,94 +10665,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.CommandResponse prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.CommandResponse}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.CommandResponseOrBuilder {
@@ -8047,18 +10749,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.CommandResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -8069,7 +10774,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
@@ -8080,20 +10785,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.CommandResponse.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.CommandResponse getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.CommandResponse build() {
         com.openxc.BinaryMessages.CommandResponse result = buildPartial();
         if (!result.isInitialized()) {
@@ -8101,17 +10806,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.CommandResponse buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.CommandResponse result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.CommandResponse buildPartial() {
         com.openxc.BinaryMessages.CommandResponse result = new com.openxc.BinaryMessages.CommandResponse(this);
         int from_bitField0_ = bitField0_;
@@ -8132,7 +10827,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.CommandResponse) {
           return mergeFrom((com.openxc.BinaryMessages.CommandResponse)other);
@@ -8141,14 +10836,16 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.CommandResponse other) {
         if (other == com.openxc.BinaryMessages.CommandResponse.getDefaultInstance()) return this;
         if (other.hasType()) {
           setType(other.getType());
         }
         if (other.hasMessage()) {
-          setMessage(other.getMessage());
+          bitField0_ |= 0x00000002;
+          message_ = other.message_;
+          onChanged();
         }
         if (other.hasStatus()) {
           setStatus(other.getStatus());
@@ -8156,69 +10853,47 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = value;
-              }
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              message_ = input.readBytes();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              status_ = input.readBool();
-              break;
-            }
+        com.openxc.BinaryMessages.CommandResponse parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.CommandResponse) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional .openxc.ControlCommand.Type type = 1;
       private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public com.openxc.BinaryMessages.ControlCommand.Type getType() {
         return type_;
       }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) {
         if (value == null) {
           throw new NullPointerException();
@@ -8228,29 +10903,59 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
         type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
         onChanged();
         return this;
       }
-      
+
       // optional string message = 2;
       private java.lang.Object message_ = "";
+      /**
+       * <code>optional string message = 2;</code>
+       */
       public boolean hasMessage() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      public String getMessage() {
+      /**
+       * <code>optional string message = 2;</code>
+       */
+      public java.lang.String getMessage() {
         java.lang.Object ref = message_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
           message_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
-      public Builder setMessage(String value) {
+      /**
+       * <code>optional string message = 2;</code>
+       */
+      public com.google.protobuf.ByteString
+          getMessageBytes() {
+        java.lang.Object ref = message_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          message_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string message = 2;</code>
+       */
+      public Builder setMessage(
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8259,129 +10964,349 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional string message = 2;</code>
+       */
       public Builder clearMessage() {
         bitField0_ = (bitField0_ & ~0x00000002);
         message_ = getDefaultInstance().getMessage();
         onChanged();
         return this;
       }
-      void setMessage(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000002;
+      /**
+       * <code>optional string message = 2;</code>
+       */
+      public Builder setMessageBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
         message_ = value;
         onChanged();
+        return this;
       }
-      
+
       // optional bool status = 3;
       private boolean status_ ;
+      /**
+       * <code>optional bool status = 3;</code>
+       */
       public boolean hasStatus() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional bool status = 3;</code>
+       */
       public boolean getStatus() {
         return status_;
       }
+      /**
+       * <code>optional bool status = 3;</code>
+       */
       public Builder setStatus(boolean value) {
         bitField0_ |= 0x00000004;
         status_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool status = 3;</code>
+       */
       public Builder clearStatus() {
         bitField0_ = (bitField0_ & ~0x00000004);
         status_ = false;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.CommandResponse)
     }
-    
+
     static {
       defaultInstance = new CommandResponse(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.CommandResponse)
   }
-  
+
   public interface DiagnosticRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     int getBus();
-    
+
     // optional uint32 message_id = 2;
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     boolean hasMessageId();
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     int getMessageId();
-    
+
     // optional uint32 mode = 3;
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     boolean hasMode();
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     int getMode();
-    
+
     // optional uint32 pid = 4;
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     boolean hasPid();
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     int getPid();
-    
+
     // optional bytes payload = 5;
+    /**
+     * <code>optional bytes payload = 5;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     boolean hasPayload();
+    /**
+     * <code>optional bytes payload = 5;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     com.google.protobuf.ByteString getPayload();
-    
+
     // optional bool multiple_responses = 6;
+    /**
+     * <code>optional bool multiple_responses = 6;</code>
+     */
     boolean hasMultipleResponses();
+    /**
+     * <code>optional bool multiple_responses = 6;</code>
+     */
     boolean getMultipleResponses();
-    
+
     // optional double frequency = 7;
+    /**
+     * <code>optional double frequency = 7;</code>
+     */
     boolean hasFrequency();
+    /**
+     * <code>optional double frequency = 7;</code>
+     */
     double getFrequency();
-    
+
     // optional string name = 8;
+    /**
+     * <code>optional string name = 8;</code>
+     */
     boolean hasName();
-    String getName();
-    
+    /**
+     * <code>optional string name = 8;</code>
+     */
+    java.lang.String getName();
+    /**
+     * <code>optional string name = 8;</code>
+     */
+    com.google.protobuf.ByteString
+        getNameBytes();
+
     // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+    /**
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+     */
     boolean hasDecodedType();
+    /**
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+     */
     com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType();
   }
+  /**
+   * Protobuf type {@code openxc.DiagnosticRequest}
+   */
   public static final class DiagnosticRequest extends
       com.google.protobuf.GeneratedMessage
       implements DiagnosticRequestOrBuilder {
     // Use DiagnosticRequest.newBuilder() to construct.
-    private DiagnosticRequest(Builder builder) {
+    private DiagnosticRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private DiagnosticRequest(boolean noInit) {}
-    
+    private DiagnosticRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final DiagnosticRequest defaultInstance;
     public static DiagnosticRequest getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public DiagnosticRequest getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DiagnosticRequest(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              messageId_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              mode_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              pid_ = input.readUInt32();
+              break;
+            }
+            case 42: {
+              bitField0_ |= 0x00000010;
+              payload_ = input.readBytes();
+              break;
+            }
+            case 48: {
+              bitField0_ |= 0x00000020;
+              multipleResponses_ = input.readBool();
+              break;
+            }
+            case 57: {
+              bitField0_ |= 0x00000040;
+              frequency_ = input.readDouble();
+              break;
+            }
+            case 66: {
+              bitField0_ |= 0x00000080;
+              name_ = input.readBytes();
+              break;
+            }
+            case 72: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(9, rawValue);
+              } else {
+                bitField0_ |= 0x00000100;
+                decodedType_ = value;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<DiagnosticRequest> PARSER =
+        new com.google.protobuf.AbstractParser<DiagnosticRequest>() {
+      public DiagnosticRequest parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DiagnosticRequest(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DiagnosticRequest> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.DiagnosticRequest.DecodedType}
+     */
     public enum DecodedType
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>NONE = 1;</code>
+       */
       NONE(0, 1),
+      /**
+       * <code>OBD2 = 2;</code>
+       */
       OBD2(1, 2),
       ;
-      
+
+      /**
+       * <code>NONE = 1;</code>
+       */
       public static final int NONE_VALUE = 1;
+      /**
+       * <code>OBD2 = 2;</code>
+       */
       public static final int OBD2_VALUE = 2;
-      
-      
+
+
       public final int getNumber() { return value; }
-      
+
       public static DecodedType valueOf(int value) {
         switch (value) {
           case 1: return NONE;
@@ -8389,7 +11314,7 @@ public final class BinaryMessages {
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<DecodedType>
           internalGetValueMap() {
         return internalValueMap;
@@ -8401,7 +11326,7 @@ public final class BinaryMessages {
                 return DecodedType.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -8414,11 +11339,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.DiagnosticRequest.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final DecodedType[] VALUES = {
-        NONE, OBD2, 
-      };
-      
+
+      private static final DecodedType[] VALUES = values();
+
       public static DecodedType valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -8427,131 +11350,200 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private DecodedType(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.DiagnosticRequest.DecodedType)
     }
-    
+
     private int bitField0_;
     // optional int32 bus = 1;
     public static final int BUS_FIELD_NUMBER = 1;
     private int bus_;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public boolean hasBus() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public int getBus() {
       return bus_;
     }
-    
+
     // optional uint32 message_id = 2;
     public static final int MESSAGE_ID_FIELD_NUMBER = 2;
     private int messageId_;
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     public boolean hasMessageId() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     public int getMessageId() {
       return messageId_;
     }
-    
+
     // optional uint32 mode = 3;
     public static final int MODE_FIELD_NUMBER = 3;
     private int mode_;
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     public boolean hasMode() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     public int getMode() {
       return mode_;
     }
-    
+
     // optional uint32 pid = 4;
     public static final int PID_FIELD_NUMBER = 4;
     private int pid_;
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     public boolean hasPid() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     public int getPid() {
       return pid_;
     }
-    
+
     // optional bytes payload = 5;
     public static final int PAYLOAD_FIELD_NUMBER = 5;
     private com.google.protobuf.ByteString payload_;
+    /**
+     * <code>optional bytes payload = 5;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
+    /**
+     * <code>optional bytes payload = 5;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     public com.google.protobuf.ByteString getPayload() {
       return payload_;
     }
-    
+
     // optional bool multiple_responses = 6;
     public static final int MULTIPLE_RESPONSES_FIELD_NUMBER = 6;
     private boolean multipleResponses_;
+    /**
+     * <code>optional bool multiple_responses = 6;</code>
+     */
     public boolean hasMultipleResponses() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
+    /**
+     * <code>optional bool multiple_responses = 6;</code>
+     */
     public boolean getMultipleResponses() {
       return multipleResponses_;
     }
-    
+
     // optional double frequency = 7;
     public static final int FREQUENCY_FIELD_NUMBER = 7;
     private double frequency_;
+    /**
+     * <code>optional double frequency = 7;</code>
+     */
     public boolean hasFrequency() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
+    /**
+     * <code>optional double frequency = 7;</code>
+     */
     public double getFrequency() {
       return frequency_;
     }
-    
+
     // optional string name = 8;
     public static final int NAME_FIELD_NUMBER = 8;
     private java.lang.Object name_;
+    /**
+     * <code>optional string name = 8;</code>
+     */
     public boolean hasName() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
-    public String getName() {
+    /**
+     * <code>optional string name = 8;</code>
+     */
+    public java.lang.String getName() {
       java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        return (String) ref;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           name_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getNameBytes() {
+    /**
+     * <code>optional string name = 8;</code>
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
       java.lang.Object ref = name_;
-      if (ref instanceof String) {
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-    
+
     // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
     public static final int DECODED_TYPE_FIELD_NUMBER = 9;
     private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_;
+    /**
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+     */
     public boolean hasDecodedType() {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
+    /**
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+     */
     public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() {
       return decodedType_;
     }
-    
+
     private void initFields() {
       bus_ = 0;
       messageId_ = 0;
@@ -8567,11 +11559,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -8604,12 +11596,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -8651,94 +11643,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticRequest prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.DiagnosticRequest}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.DiagnosticRequestOrBuilder {
@@ -8746,18 +11727,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.DiagnosticRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -8768,7 +11752,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         bus_ = 0;
@@ -8791,20 +11775,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.DiagnosticRequest.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.DiagnosticRequest getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.DiagnosticRequest build() {
         com.openxc.BinaryMessages.DiagnosticRequest result = buildPartial();
         if (!result.isInitialized()) {
@@ -8812,17 +11796,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.DiagnosticRequest buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.DiagnosticRequest result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.DiagnosticRequest buildPartial() {
         com.openxc.BinaryMessages.DiagnosticRequest result = new com.openxc.BinaryMessages.DiagnosticRequest(this);
         int from_bitField0_ = bitField0_;
@@ -8867,7 +11841,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.DiagnosticRequest) {
           return mergeFrom((com.openxc.BinaryMessages.DiagnosticRequest)other);
@@ -8876,7 +11850,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticRequest other) {
         if (other == com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) return this;
         if (other.hasBus()) {
@@ -8901,7 +11875,9 @@ public final class BinaryMessages {
           setFrequency(other.getFrequency());
         }
         if (other.hasName()) {
-          setName(other.getName());
+          bitField0_ |= 0x00000080;
+          name_ = other.name_;
+          onChanged();
         }
         if (other.hasDecodedType()) {
           setDecodedType(other.getDecodedType());
@@ -8909,183 +11885,194 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              bus_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              messageId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              mode_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              pid_ = input.readUInt32();
-              break;
-            }
-            case 42: {
-              bitField0_ |= 0x00000010;
-              payload_ = input.readBytes();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              multipleResponses_ = input.readBool();
-              break;
-            }
-            case 57: {
-              bitField0_ |= 0x00000040;
-              frequency_ = input.readDouble();
-              break;
-            }
-            case 66: {
-              bitField0_ |= 0x00000080;
-              name_ = input.readBytes();
-              break;
-            }
-            case 72: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(9, rawValue);
-              } else {
-                bitField0_ |= 0x00000100;
-                decodedType_ = value;
-              }
-              break;
-            }
+        com.openxc.BinaryMessages.DiagnosticRequest parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.DiagnosticRequest) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional int32 bus = 1;
       private int bus_ ;
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public boolean hasBus() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public int getBus() {
         return bus_;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder setBus(int value) {
         bitField0_ |= 0x00000001;
         bus_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder clearBus() {
         bitField0_ = (bitField0_ & ~0x00000001);
         bus_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 message_id = 2;
       private int messageId_ ;
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public boolean hasMessageId() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public int getMessageId() {
         return messageId_;
       }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public Builder setMessageId(int value) {
         bitField0_ |= 0x00000002;
         messageId_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public Builder clearMessageId() {
         bitField0_ = (bitField0_ & ~0x00000002);
         messageId_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 mode = 3;
       private int mode_ ;
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public boolean hasMode() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public int getMode() {
         return mode_;
       }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public Builder setMode(int value) {
         bitField0_ |= 0x00000004;
         mode_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public Builder clearMode() {
         bitField0_ = (bitField0_ & ~0x00000004);
         mode_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 pid = 4;
       private int pid_ ;
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public boolean hasPid() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public int getPid() {
         return pid_;
       }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public Builder setPid(int value) {
         bitField0_ |= 0x00000008;
         pid_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public Builder clearPid() {
         bitField0_ = (bitField0_ & ~0x00000008);
         pid_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional bytes payload = 5;
       private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes payload = 5;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public boolean hasPayload() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
+      /**
+       * <code>optional bytes payload = 5;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public com.google.protobuf.ByteString getPayload() {
         return payload_;
       }
+      /**
+       * <code>optional bytes payload = 5;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public Builder setPayload(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -9095,71 +12082,130 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bytes payload = 5;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public Builder clearPayload() {
         bitField0_ = (bitField0_ & ~0x00000010);
         payload_ = getDefaultInstance().getPayload();
         onChanged();
         return this;
       }
-      
+
       // optional bool multiple_responses = 6;
       private boolean multipleResponses_ ;
+      /**
+       * <code>optional bool multiple_responses = 6;</code>
+       */
       public boolean hasMultipleResponses() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
+      /**
+       * <code>optional bool multiple_responses = 6;</code>
+       */
       public boolean getMultipleResponses() {
         return multipleResponses_;
       }
+      /**
+       * <code>optional bool multiple_responses = 6;</code>
+       */
       public Builder setMultipleResponses(boolean value) {
         bitField0_ |= 0x00000020;
         multipleResponses_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool multiple_responses = 6;</code>
+       */
       public Builder clearMultipleResponses() {
         bitField0_ = (bitField0_ & ~0x00000020);
         multipleResponses_ = false;
         onChanged();
         return this;
       }
-      
+
       // optional double frequency = 7;
       private double frequency_ ;
+      /**
+       * <code>optional double frequency = 7;</code>
+       */
       public boolean hasFrequency() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
+      /**
+       * <code>optional double frequency = 7;</code>
+       */
       public double getFrequency() {
         return frequency_;
       }
+      /**
+       * <code>optional double frequency = 7;</code>
+       */
       public Builder setFrequency(double value) {
         bitField0_ |= 0x00000040;
         frequency_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional double frequency = 7;</code>
+       */
       public Builder clearFrequency() {
         bitField0_ = (bitField0_ & ~0x00000040);
         frequency_ = 0D;
         onChanged();
         return this;
       }
-      
+
       // optional string name = 8;
       private java.lang.Object name_ = "";
+      /**
+       * <code>optional string name = 8;</code>
+       */
       public boolean hasName() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
-      public String getName() {
+      /**
+       * <code>optional string name = 8;</code>
+       */
+      public java.lang.String getName() {
         java.lang.Object ref = name_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
           name_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string name = 8;</code>
+       */
+      public com.google.protobuf.ByteString
+          getNameBytes() {
+        java.lang.Object ref = name_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          name_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
         }
       }
-      public Builder setName(String value) {
+      /**
+       * <code>optional string name = 8;</code>
+       */
+      public Builder setName(
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -9168,26 +12214,46 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional string name = 8;</code>
+       */
       public Builder clearName() {
         bitField0_ = (bitField0_ & ~0x00000080);
         name_ = getDefaultInstance().getName();
         onChanged();
         return this;
       }
-      void setName(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000080;
+      /**
+       * <code>optional string name = 8;</code>
+       */
+      public Builder setNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000080;
         name_ = value;
         onChanged();
+        return this;
       }
-      
+
       // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
       private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
+      /**
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+       */
       public boolean hasDecodedType() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+       */
       public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() {
         return decodedType_;
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+       */
       public Builder setDecodedType(com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value) {
         if (value == null) {
           throw new NullPointerException();
@@ -9197,168 +12263,389 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+       */
       public Builder clearDecodedType() {
         bitField0_ = (bitField0_ & ~0x00000100);
         decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest)
     }
-    
+
     static {
       defaultInstance = new DiagnosticRequest(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest)
   }
-  
+
   public interface DiagnosticResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     int getBus();
-    
+
     // optional uint32 message_id = 2;
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     boolean hasMessageId();
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     int getMessageId();
-    
+
     // optional uint32 mode = 3;
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     boolean hasMode();
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     int getMode();
-    
+
     // optional uint32 pid = 4;
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     boolean hasPid();
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     int getPid();
-    
+
     // optional bool success = 5;
+    /**
+     * <code>optional bool success = 5;</code>
+     */
     boolean hasSuccess();
+    /**
+     * <code>optional bool success = 5;</code>
+     */
     boolean getSuccess();
-    
+
     // optional uint32 negative_response_code = 6;
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
     boolean hasNegativeResponseCode();
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
     int getNegativeResponseCode();
-    
+
     // optional bytes payload = 7;
+    /**
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     boolean hasPayload();
+    /**
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     com.google.protobuf.ByteString getPayload();
-    
+
     // optional double value = 8;
+    /**
+     * <code>optional double value = 8;</code>
+     */
     boolean hasValue();
+    /**
+     * <code>optional double value = 8;</code>
+     */
     double getValue();
   }
+  /**
+   * Protobuf type {@code openxc.DiagnosticResponse}
+   */
   public static final class DiagnosticResponse extends
       com.google.protobuf.GeneratedMessage
       implements DiagnosticResponseOrBuilder {
     // Use DiagnosticResponse.newBuilder() to construct.
-    private DiagnosticResponse(Builder builder) {
+    private DiagnosticResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private DiagnosticResponse(boolean noInit) {}
-    
+    private DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final DiagnosticResponse defaultInstance;
     public static DiagnosticResponse getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public DiagnosticResponse getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DiagnosticResponse(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              messageId_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              mode_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              pid_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+              bitField0_ |= 0x00000010;
+              success_ = input.readBool();
+              break;
+            }
+            case 48: {
+              bitField0_ |= 0x00000020;
+              negativeResponseCode_ = input.readUInt32();
+              break;
+            }
+            case 58: {
+              bitField0_ |= 0x00000040;
+              payload_ = input.readBytes();
+              break;
+            }
+            case 65: {
+              bitField0_ |= 0x00000080;
+              value_ = input.readDouble();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<DiagnosticResponse> PARSER =
+        new com.google.protobuf.AbstractParser<DiagnosticResponse>() {
+      public DiagnosticResponse parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DiagnosticResponse(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DiagnosticResponse> getParserForType() {
+      return PARSER;
     }
-    
+
     private int bitField0_;
     // optional int32 bus = 1;
     public static final int BUS_FIELD_NUMBER = 1;
     private int bus_;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public boolean hasBus() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
     public int getBus() {
       return bus_;
     }
-    
+
     // optional uint32 message_id = 2;
     public static final int MESSAGE_ID_FIELD_NUMBER = 2;
     private int messageId_;
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     public boolean hasMessageId() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
     public int getMessageId() {
       return messageId_;
     }
-    
+
     // optional uint32 mode = 3;
     public static final int MODE_FIELD_NUMBER = 3;
     private int mode_;
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     public boolean hasMode() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
     public int getMode() {
       return mode_;
     }
-    
+
     // optional uint32 pid = 4;
     public static final int PID_FIELD_NUMBER = 4;
     private int pid_;
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     public boolean hasPid() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
     public int getPid() {
       return pid_;
     }
-    
+
     // optional bool success = 5;
     public static final int SUCCESS_FIELD_NUMBER = 5;
     private boolean success_;
+    /**
+     * <code>optional bool success = 5;</code>
+     */
     public boolean hasSuccess() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
+    /**
+     * <code>optional bool success = 5;</code>
+     */
     public boolean getSuccess() {
       return success_;
     }
-    
+
     // optional uint32 negative_response_code = 6;
     public static final int NEGATIVE_RESPONSE_CODE_FIELD_NUMBER = 6;
     private int negativeResponseCode_;
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
     public boolean hasNegativeResponseCode() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
     public int getNegativeResponseCode() {
       return negativeResponseCode_;
     }
-    
+
     // optional bytes payload = 7;
     public static final int PAYLOAD_FIELD_NUMBER = 7;
     private com.google.protobuf.ByteString payload_;
+    /**
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
+    /**
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
     public com.google.protobuf.ByteString getPayload() {
       return payload_;
     }
-    
+
     // optional double value = 8;
     public static final int VALUE_FIELD_NUMBER = 8;
     private double value_;
+    /**
+     * <code>optional double value = 8;</code>
+     */
     public boolean hasValue() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
+    /**
+     * <code>optional double value = 8;</code>
+     */
     public double getValue() {
       return value_;
     }
-    
+
     private void initFields() {
       bus_ = 0;
       messageId_ = 0;
@@ -9373,11 +12660,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -9407,12 +12694,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -9450,94 +12737,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticResponse prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.DiagnosticResponse}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.DiagnosticResponseOrBuilder {
@@ -9545,18 +12821,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.DiagnosticResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -9567,7 +12846,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         bus_ = 0;
@@ -9588,20 +12867,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.DiagnosticResponse.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.DiagnosticResponse getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.DiagnosticResponse build() {
         com.openxc.BinaryMessages.DiagnosticResponse result = buildPartial();
         if (!result.isInitialized()) {
@@ -9609,17 +12888,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.DiagnosticResponse buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.DiagnosticResponse result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.DiagnosticResponse buildPartial() {
         com.openxc.BinaryMessages.DiagnosticResponse result = new com.openxc.BinaryMessages.DiagnosticResponse(this);
         int from_bitField0_ = bitField0_;
@@ -9660,7 +12929,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.DiagnosticResponse) {
           return mergeFrom((com.openxc.BinaryMessages.DiagnosticResponse)other);
@@ -9669,7 +12938,7 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticResponse other) {
         if (other == com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance()) return this;
         if (other.hasBus()) {
@@ -9699,214 +12968,260 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              bus_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              messageId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              mode_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              pid_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              success_ = input.readBool();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              negativeResponseCode_ = input.readUInt32();
-              break;
-            }
-            case 58: {
-              bitField0_ |= 0x00000040;
-              payload_ = input.readBytes();
-              break;
-            }
-            case 65: {
-              bitField0_ |= 0x00000080;
-              value_ = input.readDouble();
-              break;
-            }
+        com.openxc.BinaryMessages.DiagnosticResponse parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.DiagnosticResponse) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional int32 bus = 1;
       private int bus_ ;
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public boolean hasBus() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public int getBus() {
         return bus_;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder setBus(int value) {
         bitField0_ |= 0x00000001;
         bus_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
       public Builder clearBus() {
         bitField0_ = (bitField0_ & ~0x00000001);
         bus_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 message_id = 2;
       private int messageId_ ;
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public boolean hasMessageId() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public int getMessageId() {
         return messageId_;
       }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public Builder setMessageId(int value) {
         bitField0_ |= 0x00000002;
         messageId_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
       public Builder clearMessageId() {
         bitField0_ = (bitField0_ & ~0x00000002);
         messageId_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 mode = 3;
       private int mode_ ;
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public boolean hasMode() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public int getMode() {
         return mode_;
       }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public Builder setMode(int value) {
         bitField0_ |= 0x00000004;
         mode_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
       public Builder clearMode() {
         bitField0_ = (bitField0_ & ~0x00000004);
         mode_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 pid = 4;
       private int pid_ ;
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public boolean hasPid() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public int getPid() {
         return pid_;
       }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public Builder setPid(int value) {
         bitField0_ |= 0x00000008;
         pid_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
       public Builder clearPid() {
         bitField0_ = (bitField0_ & ~0x00000008);
         pid_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional bool success = 5;
       private boolean success_ ;
+      /**
+       * <code>optional bool success = 5;</code>
+       */
       public boolean hasSuccess() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
+      /**
+       * <code>optional bool success = 5;</code>
+       */
       public boolean getSuccess() {
         return success_;
       }
+      /**
+       * <code>optional bool success = 5;</code>
+       */
       public Builder setSuccess(boolean value) {
         bitField0_ |= 0x00000010;
         success_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool success = 5;</code>
+       */
       public Builder clearSuccess() {
         bitField0_ = (bitField0_ & ~0x00000010);
         success_ = false;
         onChanged();
         return this;
       }
-      
+
       // optional uint32 negative_response_code = 6;
       private int negativeResponseCode_ ;
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
       public boolean hasNegativeResponseCode() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
       public int getNegativeResponseCode() {
         return negativeResponseCode_;
       }
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
       public Builder setNegativeResponseCode(int value) {
         bitField0_ |= 0x00000020;
         negativeResponseCode_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
       public Builder clearNegativeResponseCode() {
         bitField0_ = (bitField0_ & ~0x00000020);
         negativeResponseCode_ = 0;
         onChanged();
         return this;
       }
-      
+
       // optional bytes payload = 7;
       private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public boolean hasPayload() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public com.google.protobuf.ByteString getPayload() {
         return payload_;
       }
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public Builder setPayload(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -9916,106 +13231,264 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
       public Builder clearPayload() {
         bitField0_ = (bitField0_ & ~0x00000040);
         payload_ = getDefaultInstance().getPayload();
         onChanged();
         return this;
       }
-      
+
       // optional double value = 8;
       private double value_ ;
+      /**
+       * <code>optional double value = 8;</code>
+       */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
+      /**
+       * <code>optional double value = 8;</code>
+       */
       public double getValue() {
         return value_;
       }
+      /**
+       * <code>optional double value = 8;</code>
+       */
       public Builder setValue(double value) {
         bitField0_ |= 0x00000080;
         value_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional double value = 8;</code>
+       */
       public Builder clearValue() {
         bitField0_ = (bitField0_ & ~0x00000080);
         value_ = 0D;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse)
     }
-    
+
     static {
       defaultInstance = new DiagnosticResponse(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse)
   }
-  
+
   public interface DynamicFieldOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional .openxc.DynamicField.Type type = 1;
+    /**
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
+     */
     boolean hasType();
+    /**
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
+     */
     com.openxc.BinaryMessages.DynamicField.Type getType();
-    
+
     // optional string string_value = 2;
+    /**
+     * <code>optional string string_value = 2;</code>
+     */
     boolean hasStringValue();
-    String getStringValue();
-    
+    /**
+     * <code>optional string string_value = 2;</code>
+     */
+    java.lang.String getStringValue();
+    /**
+     * <code>optional string string_value = 2;</code>
+     */
+    com.google.protobuf.ByteString
+        getStringValueBytes();
+
     // optional double numeric_value = 3;
+    /**
+     * <code>optional double numeric_value = 3;</code>
+     */
     boolean hasNumericValue();
+    /**
+     * <code>optional double numeric_value = 3;</code>
+     */
     double getNumericValue();
-    
+
     // optional bool boolean_value = 4;
+    /**
+     * <code>optional bool boolean_value = 4;</code>
+     */
     boolean hasBooleanValue();
+    /**
+     * <code>optional bool boolean_value = 4;</code>
+     */
     boolean getBooleanValue();
   }
+  /**
+   * Protobuf type {@code openxc.DynamicField}
+   */
   public static final class DynamicField extends
       com.google.protobuf.GeneratedMessage
       implements DynamicFieldOrBuilder {
     // Use DynamicField.newBuilder() to construct.
-    private DynamicField(Builder builder) {
+    private DynamicField(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private DynamicField(boolean noInit) {}
-    
+    private DynamicField(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final DynamicField defaultInstance;
     public static DynamicField getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public DynamicField getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DynamicField(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.DynamicField.Type value = com.openxc.BinaryMessages.DynamicField.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              stringValue_ = input.readBytes();
+              break;
+            }
+            case 25: {
+              bitField0_ |= 0x00000004;
+              numericValue_ = input.readDouble();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              booleanValue_ = input.readBool();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<DynamicField> PARSER =
+        new com.google.protobuf.AbstractParser<DynamicField>() {
+      public DynamicField parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DynamicField(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DynamicField> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.DynamicField.Type}
+     */
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>STRING = 1;</code>
+       */
       STRING(0, 1),
+      /**
+       * <code>NUM = 2;</code>
+       */
       NUM(1, 2),
+      /**
+       * <code>BOOL = 3;</code>
+       */
       BOOL(2, 3),
       ;
-      
+
+      /**
+       * <code>STRING = 1;</code>
+       */
       public static final int STRING_VALUE = 1;
+      /**
+       * <code>NUM = 2;</code>
+       */
       public static final int NUM_VALUE = 2;
+      /**
+       * <code>BOOL = 3;</code>
+       */
       public static final int BOOL_VALUE = 3;
-      
-      
+
+
       public final int getNumber() { return value; }
-      
+
       public static Type valueOf(int value) {
         switch (value) {
           case 1: return STRING;
@@ -10024,7 +13497,7 @@ public final class BinaryMessages {
           default: return null;
         }
       }
-      
+
       public static com.google.protobuf.Internal.EnumLiteMap<Type>
           internalGetValueMap() {
         return internalValueMap;
@@ -10036,7 +13509,7 @@ public final class BinaryMessages {
                 return Type.valueOf(number);
               }
             };
-      
+
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -10049,11 +13522,9 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.DynamicField.getDescriptor().getEnumTypes().get(0);
       }
-      
-      private static final Type[] VALUES = {
-        STRING, NUM, BOOL, 
-      };
-      
+
+      private static final Type[] VALUES = values();
+
       public static Type valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -10062,81 +13533,110 @@ public final class BinaryMessages {
         }
         return VALUES[desc.getIndex()];
       }
-      
+
       private final int index;
       private final int value;
-      
+
       private Type(int index, int value) {
         this.index = index;
         this.value = value;
       }
-      
+
       // @@protoc_insertion_point(enum_scope:openxc.DynamicField.Type)
     }
-    
+
     private int bitField0_;
     // optional .openxc.DynamicField.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private com.openxc.BinaryMessages.DynamicField.Type type_;
+    /**
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
+     */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
+    /**
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
+     */
     public com.openxc.BinaryMessages.DynamicField.Type getType() {
       return type_;
     }
-    
+
     // optional string string_value = 2;
     public static final int STRING_VALUE_FIELD_NUMBER = 2;
     private java.lang.Object stringValue_;
+    /**
+     * <code>optional string string_value = 2;</code>
+     */
     public boolean hasStringValue() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public String getStringValue() {
+    /**
+     * <code>optional string string_value = 2;</code>
+     */
+    public java.lang.String getStringValue() {
       java.lang.Object ref = stringValue_;
-      if (ref instanceof String) {
-        return (String) ref;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           stringValue_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getStringValueBytes() {
+    /**
+     * <code>optional string string_value = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getStringValueBytes() {
       java.lang.Object ref = stringValue_;
-      if (ref instanceof String) {
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         stringValue_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-    
+
     // optional double numeric_value = 3;
     public static final int NUMERIC_VALUE_FIELD_NUMBER = 3;
     private double numericValue_;
+    /**
+     * <code>optional double numeric_value = 3;</code>
+     */
     public boolean hasNumericValue() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional double numeric_value = 3;</code>
+     */
     public double getNumericValue() {
       return numericValue_;
     }
-    
+
     // optional bool boolean_value = 4;
     public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4;
     private boolean booleanValue_;
+    /**
+     * <code>optional bool boolean_value = 4;</code>
+     */
     public boolean hasBooleanValue() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
+    /**
+     * <code>optional bool boolean_value = 4;</code>
+     */
     public boolean getBooleanValue() {
       return booleanValue_;
     }
-    
+
     private void initFields() {
       type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
       stringValue_ = "";
@@ -10147,11 +13647,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -10169,12 +13669,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -10196,94 +13696,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.DynamicField parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DynamicField parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DynamicField parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.DynamicField parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DynamicField parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DynamicField parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DynamicField parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.DynamicField parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.DynamicField parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.DynamicField parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.DynamicField prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.DynamicField}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.DynamicFieldOrBuilder {
@@ -10291,18 +13780,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.DynamicField.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -10313,7 +13805,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
@@ -10326,20 +13818,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.DynamicField.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.DynamicField getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.DynamicField build() {
         com.openxc.BinaryMessages.DynamicField result = buildPartial();
         if (!result.isInitialized()) {
@@ -10347,17 +13839,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.DynamicField buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.DynamicField result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.DynamicField buildPartial() {
         com.openxc.BinaryMessages.DynamicField result = new com.openxc.BinaryMessages.DynamicField(this);
         int from_bitField0_ = bitField0_;
@@ -10382,7 +13864,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.DynamicField) {
           return mergeFrom((com.openxc.BinaryMessages.DynamicField)other);
@@ -10391,14 +13873,16 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.DynamicField other) {
         if (other == com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) return this;
         if (other.hasType()) {
           setType(other.getType());
         }
         if (other.hasStringValue()) {
-          setStringValue(other.getStringValue());
+          bitField0_ |= 0x00000002;
+          stringValue_ = other.stringValue_;
+          onChanged();
         }
         if (other.hasNumericValue()) {
           setNumericValue(other.getNumericValue());
@@ -10409,74 +13893,47 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.DynamicField.Type value = com.openxc.BinaryMessages.DynamicField.Type.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = value;
-              }
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              stringValue_ = input.readBytes();
-              break;
-            }
-            case 25: {
-              bitField0_ |= 0x00000004;
-              numericValue_ = input.readDouble();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              booleanValue_ = input.readBool();
-              break;
-            }
+        com.openxc.BinaryMessages.DynamicField parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.DynamicField) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional .openxc.DynamicField.Type type = 1;
       private com.openxc.BinaryMessages.DynamicField.Type type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
+      /**
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
+       */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
+      /**
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
+       */
       public com.openxc.BinaryMessages.DynamicField.Type getType() {
         return type_;
       }
+      /**
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
+       */
       public Builder setType(com.openxc.BinaryMessages.DynamicField.Type value) {
         if (value == null) {
           throw new NullPointerException();
@@ -10486,29 +13943,59 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
+       */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
         type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
         onChanged();
         return this;
       }
-      
+
       // optional string string_value = 2;
       private java.lang.Object stringValue_ = "";
+      /**
+       * <code>optional string string_value = 2;</code>
+       */
       public boolean hasStringValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      public String getStringValue() {
+      /**
+       * <code>optional string string_value = 2;</code>
+       */
+      public java.lang.String getStringValue() {
         java.lang.Object ref = stringValue_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
           stringValue_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string string_value = 2;</code>
+       */
+      public com.google.protobuf.ByteString
+          getStringValueBytes() {
+        java.lang.Object ref = stringValue_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          stringValue_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
         }
       }
-      public Builder setStringValue(String value) {
+      /**
+       * <code>optional string string_value = 2;</code>
+       */
+      public Builder setStringValue(
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -10517,175 +14004,361 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional string string_value = 2;</code>
+       */
       public Builder clearStringValue() {
         bitField0_ = (bitField0_ & ~0x00000002);
         stringValue_ = getDefaultInstance().getStringValue();
         onChanged();
         return this;
       }
-      void setStringValue(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000002;
+      /**
+       * <code>optional string string_value = 2;</code>
+       */
+      public Builder setStringValueBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
         stringValue_ = value;
         onChanged();
+        return this;
       }
-      
+
       // optional double numeric_value = 3;
       private double numericValue_ ;
+      /**
+       * <code>optional double numeric_value = 3;</code>
+       */
       public boolean hasNumericValue() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional double numeric_value = 3;</code>
+       */
       public double getNumericValue() {
         return numericValue_;
       }
+      /**
+       * <code>optional double numeric_value = 3;</code>
+       */
       public Builder setNumericValue(double value) {
         bitField0_ |= 0x00000004;
         numericValue_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional double numeric_value = 3;</code>
+       */
       public Builder clearNumericValue() {
         bitField0_ = (bitField0_ & ~0x00000004);
         numericValue_ = 0D;
         onChanged();
         return this;
       }
-      
+
       // optional bool boolean_value = 4;
       private boolean booleanValue_ ;
+      /**
+       * <code>optional bool boolean_value = 4;</code>
+       */
       public boolean hasBooleanValue() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
+      /**
+       * <code>optional bool boolean_value = 4;</code>
+       */
       public boolean getBooleanValue() {
         return booleanValue_;
       }
+      /**
+       * <code>optional bool boolean_value = 4;</code>
+       */
       public Builder setBooleanValue(boolean value) {
         bitField0_ |= 0x00000008;
         booleanValue_ = value;
         onChanged();
         return this;
       }
+      /**
+       * <code>optional bool boolean_value = 4;</code>
+       */
       public Builder clearBooleanValue() {
         bitField0_ = (bitField0_ & ~0x00000008);
         booleanValue_ = false;
         onChanged();
         return this;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.DynamicField)
     }
-    
+
     static {
       defaultInstance = new DynamicField(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.DynamicField)
   }
-  
+
   public interface SimpleMessageOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-    
+
     // optional string name = 1;
+    /**
+     * <code>optional string name = 1;</code>
+     */
     boolean hasName();
-    String getName();
-    
+    /**
+     * <code>optional string name = 1;</code>
+     */
+    java.lang.String getName();
+    /**
+     * <code>optional string name = 1;</code>
+     */
+    com.google.protobuf.ByteString
+        getNameBytes();
+
     // optional .openxc.DynamicField value = 2;
+    /**
+     * <code>optional .openxc.DynamicField value = 2;</code>
+     */
     boolean hasValue();
+    /**
+     * <code>optional .openxc.DynamicField value = 2;</code>
+     */
     com.openxc.BinaryMessages.DynamicField getValue();
+    /**
+     * <code>optional .openxc.DynamicField value = 2;</code>
+     */
     com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder();
-    
+
     // optional .openxc.DynamicField event = 3;
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
     boolean hasEvent();
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
     com.openxc.BinaryMessages.DynamicField getEvent();
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
     com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder();
   }
+  /**
+   * Protobuf type {@code openxc.SimpleMessage}
+   */
   public static final class SimpleMessage extends
       com.google.protobuf.GeneratedMessage
       implements SimpleMessageOrBuilder {
     // Use SimpleMessage.newBuilder() to construct.
-    private SimpleMessage(Builder builder) {
+    private SimpleMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
+      this.unknownFields = builder.getUnknownFields();
     }
-    private SimpleMessage(boolean noInit) {}
-    
+    private SimpleMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
     private static final SimpleMessage defaultInstance;
     public static SimpleMessage getDefaultInstance() {
       return defaultInstance;
     }
-    
+
     public SimpleMessage getDefaultInstanceForType() {
       return defaultInstance;
     }
-    
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private SimpleMessage(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              name_ = input.readBytes();
+              break;
+            }
+            case 18: {
+              com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000002) == 0x00000002)) {
+                subBuilder = value_.toBuilder();
+              }
+              value_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(value_);
+                value_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000002;
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = event_.toBuilder();
+              }
+              event_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(event_);
+                event_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor;
     }
-    
+
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable;
+      return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.SimpleMessage.class, com.openxc.BinaryMessages.SimpleMessage.Builder.class);
     }
-    
+
+    public static com.google.protobuf.Parser<SimpleMessage> PARSER =
+        new com.google.protobuf.AbstractParser<SimpleMessage>() {
+      public SimpleMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new SimpleMessage(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<SimpleMessage> getParserForType() {
+      return PARSER;
+    }
+
     private int bitField0_;
     // optional string name = 1;
     public static final int NAME_FIELD_NUMBER = 1;
     private java.lang.Object name_;
+    /**
+     * <code>optional string name = 1;</code>
+     */
     public boolean hasName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public String getName() {
+    /**
+     * <code>optional string name = 1;</code>
+     */
+    public java.lang.String getName() {
       java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        return (String) ref;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           name_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getNameBytes() {
+    /**
+     * <code>optional string name = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
       java.lang.Object ref = name_;
-      if (ref instanceof String) {
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-    
+
     // optional .openxc.DynamicField value = 2;
     public static final int VALUE_FIELD_NUMBER = 2;
     private com.openxc.BinaryMessages.DynamicField value_;
+    /**
+     * <code>optional .openxc.DynamicField value = 2;</code>
+     */
     public boolean hasValue() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
+    /**
+     * <code>optional .openxc.DynamicField value = 2;</code>
+     */
     public com.openxc.BinaryMessages.DynamicField getValue() {
       return value_;
     }
+    /**
+     * <code>optional .openxc.DynamicField value = 2;</code>
+     */
     public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() {
       return value_;
     }
-    
+
     // optional .openxc.DynamicField event = 3;
     public static final int EVENT_FIELD_NUMBER = 3;
     private com.openxc.BinaryMessages.DynamicField event_;
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
     public boolean hasEvent() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
     public com.openxc.BinaryMessages.DynamicField getEvent() {
       return event_;
     }
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
     public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() {
       return event_;
     }
-    
+
     private void initFields() {
       name_ = "";
       value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
@@ -10695,11 +14368,11 @@ public final class BinaryMessages {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-      
+
       memoizedIsInitialized = 1;
       return true;
     }
-    
+
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -10714,12 +14387,12 @@ public final class BinaryMessages {
       }
       getUnknownFields().writeTo(output);
     }
-    
+
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-    
+
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -10737,94 +14410,83 @@ public final class BinaryMessages {
       memoizedSerializedSize = size;
       return size;
     }
-    
+
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-    
+
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
+      return PARSER.parseFrom(data);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
+      return PARSER.parseFrom(input);
     }
     public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
+      return PARSER.parseFrom(input, extensionRegistry);
     }
-    
+
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(com.openxc.BinaryMessages.SimpleMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-    
+
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
+    /**
+     * Protobuf type {@code openxc.SimpleMessage}
+     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements com.openxc.BinaryMessages.SimpleMessageOrBuilder {
@@ -10832,18 +14494,21 @@ public final class BinaryMessages {
           getDescriptor() {
         return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor;
       }
-      
+
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable;
+        return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.SimpleMessage.class, com.openxc.BinaryMessages.SimpleMessage.Builder.class);
       }
-      
+
       // Construct using com.openxc.BinaryMessages.SimpleMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-      
-      private Builder(BuilderParent parent) {
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -10856,7 +14521,7 @@ public final class BinaryMessages {
       private static Builder create() {
         return new Builder();
       }
-      
+
       public Builder clear() {
         super.clear();
         name_ = "";
@@ -10875,20 +14540,20 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
-      
+
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-      
+
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.SimpleMessage.getDescriptor();
+        return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor;
       }
-      
+
       public com.openxc.BinaryMessages.SimpleMessage getDefaultInstanceForType() {
         return com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
       }
-      
+
       public com.openxc.BinaryMessages.SimpleMessage build() {
         com.openxc.BinaryMessages.SimpleMessage result = buildPartial();
         if (!result.isInitialized()) {
@@ -10896,17 +14561,7 @@ public final class BinaryMessages {
         }
         return result;
       }
-      
-      private com.openxc.BinaryMessages.SimpleMessage buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        com.openxc.BinaryMessages.SimpleMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
+
       public com.openxc.BinaryMessages.SimpleMessage buildPartial() {
         com.openxc.BinaryMessages.SimpleMessage result = new com.openxc.BinaryMessages.SimpleMessage(this);
         int from_bitField0_ = bitField0_;
@@ -10935,7 +14590,7 @@ public final class BinaryMessages {
         onBuilt();
         return result;
       }
-      
+
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.openxc.BinaryMessages.SimpleMessage) {
           return mergeFrom((com.openxc.BinaryMessages.SimpleMessage)other);
@@ -10944,11 +14599,13 @@ public final class BinaryMessages {
           return this;
         }
       }
-      
+
       public Builder mergeFrom(com.openxc.BinaryMessages.SimpleMessage other) {
         if (other == com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance()) return this;
         if (other.hasName()) {
-          setName(other.getName());
+          bitField0_ |= 0x00000001;
+          name_ = other.name_;
+          onChanged();
         }
         if (other.hasValue()) {
           mergeValue(other.getValue());
@@ -10959,79 +14616,73 @@ public final class BinaryMessages {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      
+
       public final boolean isInitialized() {
         return true;
       }
-      
+
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              name_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              com.openxc.BinaryMessages.DynamicField.Builder subBuilder = com.openxc.BinaryMessages.DynamicField.newBuilder();
-              if (hasValue()) {
-                subBuilder.mergeFrom(getValue());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setValue(subBuilder.buildPartial());
-              break;
-            }
-            case 26: {
-              com.openxc.BinaryMessages.DynamicField.Builder subBuilder = com.openxc.BinaryMessages.DynamicField.newBuilder();
-              if (hasEvent()) {
-                subBuilder.mergeFrom(getEvent());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setEvent(subBuilder.buildPartial());
-              break;
-            }
+        com.openxc.BinaryMessages.SimpleMessage parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.SimpleMessage) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
           }
         }
+        return this;
       }
-      
       private int bitField0_;
-      
+
       // optional string name = 1;
       private java.lang.Object name_ = "";
+      /**
+       * <code>optional string name = 1;</code>
+       */
       public boolean hasName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public String getName() {
+      /**
+       * <code>optional string name = 1;</code>
+       */
+      public java.lang.String getName() {
         java.lang.Object ref = name_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
           name_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string name = 1;</code>
+       */
+      public com.google.protobuf.ByteString
+          getNameBytes() {
+        java.lang.Object ref = name_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          name_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
         }
       }
-      public Builder setName(String value) {
+      /**
+       * <code>optional string name = 1;</code>
+       */
+      public Builder setName(
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -11040,25 +14691,42 @@ public final class BinaryMessages {
         onChanged();
         return this;
       }
+      /**
+       * <code>optional string name = 1;</code>
+       */
       public Builder clearName() {
         bitField0_ = (bitField0_ & ~0x00000001);
         name_ = getDefaultInstance().getName();
         onChanged();
         return this;
       }
-      void setName(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
+      /**
+       * <code>optional string name = 1;</code>
+       */
+      public Builder setNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
         name_ = value;
         onChanged();
+        return this;
       }
-      
+
       // optional .openxc.DynamicField value = 2;
       private com.openxc.BinaryMessages.DynamicField value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> valueBuilder_;
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public com.openxc.BinaryMessages.DynamicField getValue() {
         if (valueBuilder_ == null) {
           return value_;
@@ -11066,6 +14734,9 @@ public final class BinaryMessages {
           return valueBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public Builder setValue(com.openxc.BinaryMessages.DynamicField value) {
         if (valueBuilder_ == null) {
           if (value == null) {
@@ -11079,6 +14750,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public Builder setValue(
           com.openxc.BinaryMessages.DynamicField.Builder builderForValue) {
         if (valueBuilder_ == null) {
@@ -11090,6 +14764,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public Builder mergeValue(com.openxc.BinaryMessages.DynamicField value) {
         if (valueBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
@@ -11106,6 +14783,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000002;
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public Builder clearValue() {
         if (valueBuilder_ == null) {
           value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
@@ -11116,11 +14796,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public com.openxc.BinaryMessages.DynamicField.Builder getValueBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getValueFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() {
         if (valueBuilder_ != null) {
           return valueBuilder_.getMessageOrBuilder();
@@ -11128,6 +14814,9 @@ public final class BinaryMessages {
           return value_;
         }
       }
+      /**
+       * <code>optional .openxc.DynamicField value = 2;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> 
           getValueFieldBuilder() {
@@ -11141,14 +14830,20 @@ public final class BinaryMessages {
         }
         return valueBuilder_;
       }
-      
+
       // optional .openxc.DynamicField event = 3;
       private com.openxc.BinaryMessages.DynamicField event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> eventBuilder_;
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public boolean hasEvent() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public com.openxc.BinaryMessages.DynamicField getEvent() {
         if (eventBuilder_ == null) {
           return event_;
@@ -11156,6 +14851,9 @@ public final class BinaryMessages {
           return eventBuilder_.getMessage();
         }
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public Builder setEvent(com.openxc.BinaryMessages.DynamicField value) {
         if (eventBuilder_ == null) {
           if (value == null) {
@@ -11169,6 +14867,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public Builder setEvent(
           com.openxc.BinaryMessages.DynamicField.Builder builderForValue) {
         if (eventBuilder_ == null) {
@@ -11180,6 +14881,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public Builder mergeEvent(com.openxc.BinaryMessages.DynamicField value) {
         if (eventBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -11196,6 +14900,9 @@ public final class BinaryMessages {
         bitField0_ |= 0x00000004;
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public Builder clearEvent() {
         if (eventBuilder_ == null) {
           event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
@@ -11206,11 +14913,17 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public com.openxc.BinaryMessages.DynamicField.Builder getEventBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getEventFieldBuilder().getBuilder();
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() {
         if (eventBuilder_ != null) {
           return eventBuilder_.getMessageOrBuilder();
@@ -11218,6 +14931,9 @@ public final class BinaryMessages {
           return event_;
         }
       }
+      /**
+       * <code>optional .openxc.DynamicField event = 3;</code>
+       */
       private com.google.protobuf.SingleFieldBuilder<
           com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> 
           getEventFieldBuilder() {
@@ -11231,18 +14947,18 @@ public final class BinaryMessages {
         }
         return eventBuilder_;
       }
-      
+
       // @@protoc_insertion_point(builder_scope:openxc.SimpleMessage)
     }
-    
+
     static {
       defaultInstance = new SimpleMessage(true);
       defaultInstance.initFields();
     }
-    
+
     // @@protoc_insertion_point(class_scope:openxc.SimpleMessage)
   }
-  
+
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_openxc_VehicleMessage_descriptor;
   private static
@@ -11309,6 +15025,11 @@ public final class BinaryMessages {
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_RTCConfigurationCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_openxc_CommandResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -11333,7 +15054,7 @@ public final class BinaryMessages {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_openxc_SimpleMessage_fieldAccessorTable;
-  
+
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
@@ -11342,7 +15063,7 @@ public final class BinaryMessages {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\014openxc.proto\022\006openxc\"\230\003\n\016VehicleMessag" +
+      "\n\014openxc.proto\022\006openxc\"\233\003\n\016VehicleMessag" +
       "e\022)\n\004type\030\001 \001(\0162\033.openxc.VehicleMessage." +
       "Type\022\'\n\013can_message\030\002 \001(\0132\022.openxc.CanMe" +
       "ssage\022-\n\016simple_message\030\003 \001(\0132\025.openxc.S" +
@@ -11350,81 +15071,85 @@ public final class BinaryMessages {
       "\0132\032.openxc.DiagnosticResponse\022/\n\017control" +
       "_command\030\005 \001(\0132\026.openxc.ControlCommand\0221" +
       "\n\020command_response\030\006 \001(\0132\027.openxc.Comman" +
-      "dResponse\022\016\n\006uptime\030\007 \001(\r\"V\n\004Type\022\007\n\003CAN" +
-      "\020\001\022\n\n\006SIMPLE\020\002\022\016\n\nDIAGNOSTIC\020\003\022\023\n\017CONTRO",
-      "L_COMMAND\020\004\022\024\n\020COMMAND_RESPONSE\020\005\"\224\001\n\nCa" +
-      "nMessage\022\013\n\003bus\030\001 \001(\005\022\n\n\002id\030\002 \001(\r\022\014\n\004dat" +
-      "a\030\003 \001(\014\0224\n\014frame_format\030\004 \001(\0162\036.openxc.C" +
-      "anMessage.FrameFormat\")\n\013FrameFormat\022\014\n\010" +
-      "STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\231\005\n\016ControlComm" +
-      "and\022)\n\004type\030\001 \001(\0162\033.openxc.ControlComman" +
-      "d.Type\022<\n\022diagnostic_request\030\002 \001(\0132 .ope" +
-      "nxc.DiagnosticControlCommand\022G\n\030passthro" +
-      "ugh_mode_request\030\003 \001(\0132%.openxc.Passthro" +
-      "ughModeControlCommand\022O\n acceptance_filt",
-      "er_bypass_command\030\004 \001(\0132%.openxc.Accepta" +
-      "nceFilterBypassCommand\022<\n\026payload_format" +
-      "_command\030\005 \001(\0132\034.openxc.PayloadFormatCom" +
-      "mand\022O\n predefined_obd2_requests_command" +
-      "\030\006 \001(\0132%.openxc.PredefinedObd2RequestsCo" +
-      "mmand\022F\n\033modem_configuration_command\030\007 \001" +
-      "(\0132!.openxc.ModemConfigurationCommand\"\254\001" +
-      "\n\004Type\022\013\n\007VERSION\020\001\022\r\n\tDEVICE_ID\020\002\022\016\n\nDI" +
-      "AGNOSTIC\020\003\022\017\n\013PASSTHROUGH\020\004\022\034\n\030ACCEPTANC" +
-      "E_FILTER_BYPASS\020\005\022\022\n\016PAYLOAD_FORMAT\020\006\022\034\n",
-      "\030PREDEFINED_OBD2_REQUESTS\020\007\022\027\n\023MODEM_CON" +
-      "FIGURATION\020\010\"\236\001\n\030DiagnosticControlComman" +
-      "d\022*\n\007request\030\001 \001(\0132\031.openxc.DiagnosticRe" +
-      "quest\0227\n\006action\030\002 \001(\0162\'.openxc.Diagnosti" +
-      "cControlCommand.Action\"\035\n\006Action\022\007\n\003ADD\020" +
-      "\001\022\n\n\006CANCEL\020\002\"=\n\035PassthroughModeControlC" +
-      "ommand\022\013\n\003bus\030\001 \001(\005\022\017\n\007enabled\030\002 \001(\010\"<\n\035" +
-      "AcceptanceFilterBypassCommand\022\013\n\003bus\030\001 \001" +
-      "(\005\022\016\n\006bypass\030\002 \001(\010\"{\n\024PayloadFormatComma" +
-      "nd\022:\n\006format\030\001 \001(\0162*.openxc.PayloadForma",
-      "tCommand.PayloadFormat\"\'\n\rPayloadFormat\022" +
-      "\010\n\004JSON\020\001\022\014\n\010PROTOBUF\020\002\"0\n\035PredefinedObd" +
-      "2RequestsCommand\022\017\n\007enabled\030\001 \001(\010\"\321\003\n\027Ne" +
-      "tworkOperatorSettings\022\030\n\020allowDataRoamin" +
-      "g\030\001 \001(\010\022N\n\022operatorSelectMode\030\002 \001(\01622.op" +
-      "enxc.NetworkOperatorSettings.OperatorSel" +
-      "ectMode\022L\n\021networkDescriptor\030\003 \001(\01321.ope" +
-      "nxc.NetworkOperatorSettings.NetworkDescr" +
-      "iptor\032\230\001\n\021NetworkDescriptor\022\014\n\004PLMN\030\001 \001(" +
-      "\r\022R\n\013networkType\030\002 \001(\0162=.openxc.NetworkO",
-      "peratorSettings.NetworkDescriptor.Networ" +
-      "kType\"!\n\013NetworkType\022\007\n\003GSM\020\000\022\t\n\005UTRAN\020\002" +
-      "\"c\n\022OperatorSelectMode\022\r\n\tAUTOMATIC\020\000\022\n\n" +
-      "\006MANUAL\020\001\022\016\n\nDEREGISTER\020\002\022\014\n\010SET_ONLY\020\003\022" +
-      "\024\n\020MANUAL_AUTOMATIC\020\004\"\"\n\023NetworkDataSett" +
-      "ings\022\013\n\003APN\030\001 \001(\t\"3\n\025ServerConnectSettin" +
-      "gs\022\014\n\004host\030\001 \001(\t\022\014\n\004port\030\002 \001(\r\"\325\001\n\031Modem" +
-      "ConfigurationCommand\022@\n\027networkOperatorS" +
-      "ettings\030\001 \001(\0132\037.openxc.NetworkOperatorSe" +
-      "ttings\0228\n\023networkDataSettings\030\002 \001(\0132\033.op",
-      "enxc.NetworkDataSettings\022<\n\025serverConnec" +
-      "tSettings\030\003 \001(\0132\035.openxc.ServerConnectSe" +
-      "ttings\"]\n\017CommandResponse\022)\n\004type\030\001 \001(\0162" +
-      "\033.openxc.ControlCommand.Type\022\017\n\007message\030" +
-      "\002 \001(\t\022\016\n\006status\030\003 \001(\010\"\375\001\n\021DiagnosticRequ" +
-      "est\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004" +
-      "mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007payload\030\005 \001(\014" +
-      "\022\032\n\022multiple_responses\030\006 \001(\010\022\021\n\tfrequenc" +
-      "y\030\007 \001(\001\022\014\n\004name\030\010 \001(\t\022;\n\014decoded_type\030\t " +
-      "\001(\0162%.openxc.DiagnosticRequest.DecodedTy",
-      "pe\"!\n\013DecodedType\022\010\n\004NONE\020\001\022\010\n\004OBD2\020\002\"\241\001" +
-      "\n\022DiagnosticResponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nmes" +
-      "sage_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r" +
-      "\022\017\n\007success\030\005 \001(\010\022\036\n\026negative_response_c" +
-      "ode\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022\r\n\005value\030\010 \001(" +
-      "\001\"\242\001\n\014DynamicField\022\'\n\004type\030\001 \001(\0162\031.openx" +
-      "c.DynamicField.Type\022\024\n\014string_value\030\002 \001(" +
-      "\t\022\025\n\rnumeric_value\030\003 \001(\001\022\025\n\rboolean_valu" +
-      "e\030\004 \001(\010\"%\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004" +
-      "BOOL\020\003\"g\n\rSimpleMessage\022\014\n\004name\030\001 \001(\t\022#\n",
-      "\005value\030\002 \001(\0132\024.openxc.DynamicField\022#\n\005ev" +
-      "ent\030\003 \001(\0132\024.openxc.DynamicFieldB\034\n\ncom.o" +
-      "penxcB\016BinaryMessages"
+      "dResponse\022\021\n\ttimestamp\030\007 \001(\004\"V\n\004Type\022\007\n\003" +
+      "CAN\020\001\022\n\n\006SIMPLE\020\002\022\016\n\nDIAGNOSTIC\020\003\022\023\n\017CON",
+      "TROL_COMMAND\020\004\022\024\n\020COMMAND_RESPONSE\020\005\"\224\001\n" +
+      "\nCanMessage\022\013\n\003bus\030\001 \001(\005\022\n\n\002id\030\002 \001(\r\022\014\n\004" +
+      "data\030\003 \001(\014\0224\n\014frame_format\030\004 \001(\0162\036.openx" +
+      "c.CanMessage.FrameFormat\")\n\013FrameFormat\022" +
+      "\014\n\010STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\211\006\n\016ControlC" +
+      "ommand\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCom" +
+      "mand.Type\022<\n\022diagnostic_request\030\002 \001(\0132 ." +
+      "openxc.DiagnosticControlCommand\022G\n\030passt" +
+      "hrough_mode_request\030\003 \001(\0132%.openxc.Passt" +
+      "hroughModeControlCommand\022O\n acceptance_f",
+      "ilter_bypass_command\030\004 \001(\0132%.openxc.Acce" +
+      "ptanceFilterBypassCommand\022<\n\026payload_for" +
+      "mat_command\030\005 \001(\0132\034.openxc.PayloadFormat" +
+      "Command\022O\n predefined_obd2_requests_comm" +
+      "and\030\006 \001(\0132%.openxc.PredefinedObd2Request" +
+      "sCommand\022F\n\033modem_configuration_command\030" +
+      "\007 \001(\0132!.openxc.ModemConfigurationCommand" +
+      "\022B\n\031rtc_configuration_command\030\010 \001(\0132\037.op" +
+      "enxc.RTCConfigurationCommand\"\330\001\n\004Type\022\013\n" +
+      "\007VERSION\020\001\022\r\n\tDEVICE_ID\020\002\022\016\n\nDIAGNOSTIC\020",
+      "\003\022\017\n\013PASSTHROUGH\020\004\022\034\n\030ACCEPTANCE_FILTER_" +
+      "BYPASS\020\005\022\022\n\016PAYLOAD_FORMAT\020\006\022\034\n\030PREDEFIN" +
+      "ED_OBD2_REQUESTS\020\007\022\027\n\023MODEM_CONFIGURATIO" +
+      "N\020\010\022\025\n\021RTC_CONFIGURATION\020\t\022\023\n\017SD_MOUNT_S" +
+      "TATUS\020\n\"\236\001\n\030DiagnosticControlCommand\022*\n\007" +
+      "request\030\001 \001(\0132\031.openxc.DiagnosticRequest" +
+      "\0227\n\006action\030\002 \001(\0162\'.openxc.DiagnosticCont" +
+      "rolCommand.Action\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006" +
+      "CANCEL\020\002\"=\n\035PassthroughModeControlComman" +
+      "d\022\013\n\003bus\030\001 \001(\005\022\017\n\007enabled\030\002 \001(\010\"<\n\035Accep",
+      "tanceFilterBypassCommand\022\013\n\003bus\030\001 \001(\005\022\016\n" +
+      "\006bypass\030\002 \001(\010\"\214\001\n\024PayloadFormatCommand\022:" +
+      "\n\006format\030\001 \001(\0162*.openxc.PayloadFormatCom" +
+      "mand.PayloadFormat\"8\n\rPayloadFormat\022\010\n\004J" +
+      "SON\020\001\022\014\n\010PROTOBUF\020\002\022\017\n\013MESSAGEPACK\020\003\"0\n\035" +
+      "PredefinedObd2RequestsCommand\022\017\n\007enabled" +
+      "\030\001 \001(\010\"\321\003\n\027NetworkOperatorSettings\022\030\n\020al" +
+      "lowDataRoaming\030\001 \001(\010\022N\n\022operatorSelectMo" +
+      "de\030\002 \001(\01622.openxc.NetworkOperatorSetting" +
+      "s.OperatorSelectMode\022L\n\021networkDescripto",
+      "r\030\003 \001(\01321.openxc.NetworkOperatorSettings" +
+      ".NetworkDescriptor\032\230\001\n\021NetworkDescriptor" +
+      "\022\014\n\004PLMN\030\001 \001(\r\022R\n\013networkType\030\002 \001(\0162=.op" +
+      "enxc.NetworkOperatorSettings.NetworkDesc" +
+      "riptor.NetworkType\"!\n\013NetworkType\022\007\n\003GSM" +
+      "\020\000\022\t\n\005UTRAN\020\002\"c\n\022OperatorSelectMode\022\r\n\tA" +
+      "UTOMATIC\020\000\022\n\n\006MANUAL\020\001\022\016\n\nDEREGISTER\020\002\022\014" +
+      "\n\010SET_ONLY\020\003\022\024\n\020MANUAL_AUTOMATIC\020\004\"\"\n\023Ne" +
+      "tworkDataSettings\022\013\n\003APN\030\001 \001(\t\"3\n\025Server" +
+      "ConnectSettings\022\014\n\004host\030\001 \001(\t\022\014\n\004port\030\002 ",
+      "\001(\r\"\325\001\n\031ModemConfigurationCommand\022@\n\027net" +
+      "workOperatorSettings\030\001 \001(\0132\037.openxc.Netw" +
+      "orkOperatorSettings\0228\n\023networkDataSettin" +
+      "gs\030\002 \001(\0132\033.openxc.NetworkDataSettings\022<\n" +
+      "\025serverConnectSettings\030\003 \001(\0132\035.openxc.Se" +
+      "rverConnectSettings\",\n\027RTCConfigurationC" +
+      "ommand\022\021\n\tunix_time\030\001 \001(\r\"]\n\017CommandResp" +
+      "onse\022)\n\004type\030\001 \001(\0162\033.openxc.ControlComma" +
+      "nd.Type\022\017\n\007message\030\002 \001(\t\022\016\n\006status\030\003 \001(\010" +
+      "\"\375\001\n\021DiagnosticRequest\022\013\n\003bus\030\001 \001(\005\022\022\n\nm",
+      "essage_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001" +
+      "(\r\022\017\n\007payload\030\005 \001(\014\022\032\n\022multiple_response" +
+      "s\030\006 \001(\010\022\021\n\tfrequency\030\007 \001(\001\022\014\n\004name\030\010 \001(\t" +
+      "\022;\n\014decoded_type\030\t \001(\0162%.openxc.Diagnost" +
+      "icRequest.DecodedType\"!\n\013DecodedType\022\010\n\004" +
+      "NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022DiagnosticResponse\022" +
+      "\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mode" +
+      "\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007success\030\005 \001(\010\022\036\n\026" +
+      "negative_response_code\030\006 \001(\r\022\017\n\007payload\030" +
+      "\007 \001(\014\022\r\n\005value\030\010 \001(\001\"\242\001\n\014DynamicField\022\'\n",
+      "\004type\030\001 \001(\0162\031.openxc.DynamicField.Type\022\024" +
+      "\n\014string_value\030\002 \001(\t\022\025\n\rnumeric_value\030\003 " +
+      "\001(\001\022\025\n\rboolean_value\030\004 \001(\010\"%\n\004Type\022\n\n\006ST" +
+      "RING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"g\n\rSimpleMessa" +
+      "ge\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.openxc" +
+      ".DynamicField\022#\n\005event\030\003 \001(\0132\024.openxc.Dy" +
+      "namicFieldB\034\n\ncom.openxcB\016BinaryMessages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -11436,145 +15161,115 @@ public final class BinaryMessages {
           internal_static_openxc_VehicleMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_VehicleMessage_descriptor,
-              new java.lang.String[] { "Type", "CanMessage", "SimpleMessage", "DiagnosticResponse", "ControlCommand", "CommandResponse", "Uptime", },
-              com.openxc.BinaryMessages.VehicleMessage.class,
-              com.openxc.BinaryMessages.VehicleMessage.Builder.class);
+              new java.lang.String[] { "Type", "CanMessage", "SimpleMessage", "DiagnosticResponse", "ControlCommand", "CommandResponse", "Timestamp", });
           internal_static_openxc_CanMessage_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_openxc_CanMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_CanMessage_descriptor,
-              new java.lang.String[] { "Bus", "Id", "Data", "FrameFormat", },
-              com.openxc.BinaryMessages.CanMessage.class,
-              com.openxc.BinaryMessages.CanMessage.Builder.class);
+              new java.lang.String[] { "Bus", "Id", "Data", "FrameFormat", });
           internal_static_openxc_ControlCommand_descriptor =
             getDescriptor().getMessageTypes().get(2);
           internal_static_openxc_ControlCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_ControlCommand_descriptor,
-              new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "PayloadFormatCommand", "PredefinedObd2RequestsCommand", "ModemConfigurationCommand", },
-              com.openxc.BinaryMessages.ControlCommand.class,
-              com.openxc.BinaryMessages.ControlCommand.Builder.class);
+              new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "PayloadFormatCommand", "PredefinedObd2RequestsCommand", "ModemConfigurationCommand", "RtcConfigurationCommand", });
           internal_static_openxc_DiagnosticControlCommand_descriptor =
             getDescriptor().getMessageTypes().get(3);
           internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_DiagnosticControlCommand_descriptor,
-              new java.lang.String[] { "Request", "Action", },
-              com.openxc.BinaryMessages.DiagnosticControlCommand.class,
-              com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class);
+              new java.lang.String[] { "Request", "Action", });
           internal_static_openxc_PassthroughModeControlCommand_descriptor =
             getDescriptor().getMessageTypes().get(4);
           internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_PassthroughModeControlCommand_descriptor,
-              new java.lang.String[] { "Bus", "Enabled", },
-              com.openxc.BinaryMessages.PassthroughModeControlCommand.class,
-              com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class);
+              new java.lang.String[] { "Bus", "Enabled", });
           internal_static_openxc_AcceptanceFilterBypassCommand_descriptor =
             getDescriptor().getMessageTypes().get(5);
           internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_AcceptanceFilterBypassCommand_descriptor,
-              new java.lang.String[] { "Bus", "Bypass", },
-              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class,
-              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class);
+              new java.lang.String[] { "Bus", "Bypass", });
           internal_static_openxc_PayloadFormatCommand_descriptor =
             getDescriptor().getMessageTypes().get(6);
           internal_static_openxc_PayloadFormatCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_PayloadFormatCommand_descriptor,
-              new java.lang.String[] { "Format", },
-              com.openxc.BinaryMessages.PayloadFormatCommand.class,
-              com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class);
+              new java.lang.String[] { "Format", });
           internal_static_openxc_PredefinedObd2RequestsCommand_descriptor =
             getDescriptor().getMessageTypes().get(7);
           internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_PredefinedObd2RequestsCommand_descriptor,
-              new java.lang.String[] { "Enabled", },
-              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class,
-              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class);
+              new java.lang.String[] { "Enabled", });
           internal_static_openxc_NetworkOperatorSettings_descriptor =
             getDescriptor().getMessageTypes().get(8);
           internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_NetworkOperatorSettings_descriptor,
-              new java.lang.String[] { "AllowDataRoaming", "OperatorSelectMode", "NetworkDescriptor", },
-              com.openxc.BinaryMessages.NetworkOperatorSettings.class,
-              com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class);
+              new java.lang.String[] { "AllowDataRoaming", "OperatorSelectMode", "NetworkDescriptor", });
           internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor =
             internal_static_openxc_NetworkOperatorSettings_descriptor.getNestedTypes().get(0);
           internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor,
-              new java.lang.String[] { "PLMN", "NetworkType", },
-              com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class,
-              com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class);
+              new java.lang.String[] { "PLMN", "NetworkType", });
           internal_static_openxc_NetworkDataSettings_descriptor =
             getDescriptor().getMessageTypes().get(9);
           internal_static_openxc_NetworkDataSettings_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_NetworkDataSettings_descriptor,
-              new java.lang.String[] { "APN", },
-              com.openxc.BinaryMessages.NetworkDataSettings.class,
-              com.openxc.BinaryMessages.NetworkDataSettings.Builder.class);
+              new java.lang.String[] { "APN", });
           internal_static_openxc_ServerConnectSettings_descriptor =
             getDescriptor().getMessageTypes().get(10);
           internal_static_openxc_ServerConnectSettings_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_ServerConnectSettings_descriptor,
-              new java.lang.String[] { "Host", "Port", },
-              com.openxc.BinaryMessages.ServerConnectSettings.class,
-              com.openxc.BinaryMessages.ServerConnectSettings.Builder.class);
+              new java.lang.String[] { "Host", "Port", });
           internal_static_openxc_ModemConfigurationCommand_descriptor =
             getDescriptor().getMessageTypes().get(11);
           internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_ModemConfigurationCommand_descriptor,
-              new java.lang.String[] { "NetworkOperatorSettings", "NetworkDataSettings", "ServerConnectSettings", },
-              com.openxc.BinaryMessages.ModemConfigurationCommand.class,
-              com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class);
-          internal_static_openxc_CommandResponse_descriptor =
+              new java.lang.String[] { "NetworkOperatorSettings", "NetworkDataSettings", "ServerConnectSettings", });
+          internal_static_openxc_RTCConfigurationCommand_descriptor =
             getDescriptor().getMessageTypes().get(12);
+          internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_RTCConfigurationCommand_descriptor,
+              new java.lang.String[] { "UnixTime", });
+          internal_static_openxc_CommandResponse_descriptor =
+            getDescriptor().getMessageTypes().get(13);
           internal_static_openxc_CommandResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_CommandResponse_descriptor,
-              new java.lang.String[] { "Type", "Message", "Status", },
-              com.openxc.BinaryMessages.CommandResponse.class,
-              com.openxc.BinaryMessages.CommandResponse.Builder.class);
+              new java.lang.String[] { "Type", "Message", "Status", });
           internal_static_openxc_DiagnosticRequest_descriptor =
-            getDescriptor().getMessageTypes().get(13);
+            getDescriptor().getMessageTypes().get(14);
           internal_static_openxc_DiagnosticRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_DiagnosticRequest_descriptor,
-              new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "MultipleResponses", "Frequency", "Name", "DecodedType", },
-              com.openxc.BinaryMessages.DiagnosticRequest.class,
-              com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
+              new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "MultipleResponses", "Frequency", "Name", "DecodedType", });
           internal_static_openxc_DiagnosticResponse_descriptor =
-            getDescriptor().getMessageTypes().get(14);
+            getDescriptor().getMessageTypes().get(15);
           internal_static_openxc_DiagnosticResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_DiagnosticResponse_descriptor,
-              new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Success", "NegativeResponseCode", "Payload", "Value", },
-              com.openxc.BinaryMessages.DiagnosticResponse.class,
-              com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
+              new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Success", "NegativeResponseCode", "Payload", "Value", });
           internal_static_openxc_DynamicField_descriptor =
-            getDescriptor().getMessageTypes().get(15);
+            getDescriptor().getMessageTypes().get(16);
           internal_static_openxc_DynamicField_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_DynamicField_descriptor,
-              new java.lang.String[] { "Type", "StringValue", "NumericValue", "BooleanValue", },
-              com.openxc.BinaryMessages.DynamicField.class,
-              com.openxc.BinaryMessages.DynamicField.Builder.class);
+              new java.lang.String[] { "Type", "StringValue", "NumericValue", "BooleanValue", });
           internal_static_openxc_SimpleMessage_descriptor =
-            getDescriptor().getMessageTypes().get(16);
+            getDescriptor().getMessageTypes().get(17);
           internal_static_openxc_SimpleMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_SimpleMessage_descriptor,
-              new java.lang.String[] { "Name", "Value", "Event", },
-              com.openxc.BinaryMessages.SimpleMessage.class,
-              com.openxc.BinaryMessages.SimpleMessage.Builder.class);
+              new java.lang.String[] { "Name", "Value", "Event", });
           return null;
         }
       };
@@ -11583,6 +15278,6 @@ public final class BinaryMessages {
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         }, assigner);
   }
-  
+
   // @@protoc_insertion_point(outer_class_scope)
 }
diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py
index b63c713f..023379de 100644
--- a/gen/python/openxc_pb2.py
+++ b/gen/python/openxc_pb2.py
@@ -1,314 +1,328 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: openxc.proto
 
-from google.protobuf import descriptor
-from google.protobuf import message
-from google.protobuf import reflection
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 
 
-DESCRIPTOR = descriptor.FileDescriptor(
+
+DESCRIPTOR = _descriptor.FileDescriptor(
   name='openxc.proto',
   package='openxc',
-  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x98\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0b\x63\x61n_message\x18\x02 \x01(\x0b\x32\x12.openxc.CanMessage\x12-\n\x0esimple_message\x18\x03 \x01(\x0b\x32\x15.openxc.SimpleMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\x12\x0e\n\x06uptime\x18\x07 \x01(\r\"V\n\x04Type\x12\x07\n\x03\x43\x41N\x10\x01\x12\n\n\x06SIMPLE\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x94\x01\n\nCanMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.CanMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\x99\x05\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\x12\x46\n\x1bmodem_configuration_command\x18\x07 \x01(\x0b\x32!.openxc.ModemConfigurationCommand\"\xac\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\x12\x17\n\x13MODEM_CONFIGURATION\x10\x08\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"{\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"\'\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"\xd1\x03\n\x17NetworkOperatorSettings\x12\x18\n\x10\x61llowDataRoaming\x18\x01 \x01(\x08\x12N\n\x12operatorSelectMode\x18\x02 \x01(\x0e\x32\x32.openxc.NetworkOperatorSettings.OperatorSelectMode\x12L\n\x11networkDescriptor\x18\x03 \x01(\x0b\x32\x31.openxc.NetworkOperatorSettings.NetworkDescriptor\x1a\x98\x01\n\x11NetworkDescriptor\x12\x0c\n\x04PLMN\x18\x01 \x01(\r\x12R\n\x0bnetworkType\x18\x02 \x01(\x0e\x32=.openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType\"!\n\x0bNetworkType\x12\x07\n\x03GSM\x10\x00\x12\t\n\x05UTRAN\x10\x02\"c\n\x12OperatorSelectMode\x12\r\n\tAUTOMATIC\x10\x00\x12\n\n\x06MANUAL\x10\x01\x12\x0e\n\nDEREGISTER\x10\x02\x12\x0c\n\x08SET_ONLY\x10\x03\x12\x14\n\x10MANUAL_AUTOMATIC\x10\x04\"\"\n\x13NetworkDataSettings\x12\x0b\n\x03\x41PN\x18\x01 \x01(\t\"3\n\x15ServerConnectSettings\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\"\xd5\x01\n\x19ModemConfigurationCommand\x12@\n\x17networkOperatorSettings\x18\x01 \x01(\x0b\x32\x1f.openxc.NetworkOperatorSettings\x12\x38\n\x13networkDataSettings\x18\x02 \x01(\x0b\x32\x1b.openxc.NetworkDataSettings\x12<\n\x15serverConnectSettings\x18\x03 \x01(\x0b\x32\x1d.openxc.ServerConnectSettings\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"g\n\rSimpleMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicFieldB\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
+  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x9b\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0b\x63\x61n_message\x18\x02 \x01(\x0b\x32\x12.openxc.CanMessage\x12-\n\x0esimple_message\x18\x03 \x01(\x0b\x32\x15.openxc.SimpleMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\x12\x11\n\ttimestamp\x18\x07 \x01(\x04\"V\n\x04Type\x12\x07\n\x03\x43\x41N\x10\x01\x12\n\n\x06SIMPLE\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x94\x01\n\nCanMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.CanMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\x89\x06\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\x12\x46\n\x1bmodem_configuration_command\x18\x07 \x01(\x0b\x32!.openxc.ModemConfigurationCommand\x12\x42\n\x19rtc_configuration_command\x18\x08 \x01(\x0b\x32\x1f.openxc.RTCConfigurationCommand\"\xd8\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\x12\x17\n\x13MODEM_CONFIGURATION\x10\x08\x12\x15\n\x11RTC_CONFIGURATION\x10\t\x12\x13\n\x0fSD_MOUNT_STATUS\x10\n\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"\x8c\x01\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"8\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\x12\x0f\n\x0bMESSAGEPACK\x10\x03\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"\xd1\x03\n\x17NetworkOperatorSettings\x12\x18\n\x10\x61llowDataRoaming\x18\x01 \x01(\x08\x12N\n\x12operatorSelectMode\x18\x02 \x01(\x0e\x32\x32.openxc.NetworkOperatorSettings.OperatorSelectMode\x12L\n\x11networkDescriptor\x18\x03 \x01(\x0b\x32\x31.openxc.NetworkOperatorSettings.NetworkDescriptor\x1a\x98\x01\n\x11NetworkDescriptor\x12\x0c\n\x04PLMN\x18\x01 \x01(\r\x12R\n\x0bnetworkType\x18\x02 \x01(\x0e\x32=.openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType\"!\n\x0bNetworkType\x12\x07\n\x03GSM\x10\x00\x12\t\n\x05UTRAN\x10\x02\"c\n\x12OperatorSelectMode\x12\r\n\tAUTOMATIC\x10\x00\x12\n\n\x06MANUAL\x10\x01\x12\x0e\n\nDEREGISTER\x10\x02\x12\x0c\n\x08SET_ONLY\x10\x03\x12\x14\n\x10MANUAL_AUTOMATIC\x10\x04\"\"\n\x13NetworkDataSettings\x12\x0b\n\x03\x41PN\x18\x01 \x01(\t\"3\n\x15ServerConnectSettings\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\"\xd5\x01\n\x19ModemConfigurationCommand\x12@\n\x17networkOperatorSettings\x18\x01 \x01(\x0b\x32\x1f.openxc.NetworkOperatorSettings\x12\x38\n\x13networkDataSettings\x18\x02 \x01(\x0b\x32\x1b.openxc.NetworkDataSettings\x12<\n\x15serverConnectSettings\x18\x03 \x01(\x0b\x32\x1d.openxc.ServerConnectSettings\",\n\x17RTCConfigurationCommand\x12\x11\n\tunix_time\x18\x01 \x01(\r\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"g\n\rSimpleMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicFieldB\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
 
 
 
-_VEHICLEMESSAGE_TYPE = descriptor.EnumDescriptor(
+_VEHICLEMESSAGE_TYPE = _descriptor.EnumDescriptor(
   name='Type',
   full_name='openxc.VehicleMessage.Type',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='CAN', index=0, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='SIMPLE', index=1, number=2,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='DIAGNOSTIC', index=2, number=3,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='CONTROL_COMMAND', index=3, number=4,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='COMMAND_RESPONSE', index=4, number=5,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=347,
-  serialized_end=433,
+  serialized_start=350,
+  serialized_end=436,
 )
 
-_CANMESSAGE_FRAMEFORMAT = descriptor.EnumDescriptor(
+_CANMESSAGE_FRAMEFORMAT = _descriptor.EnumDescriptor(
   name='FrameFormat',
   full_name='openxc.CanMessage.FrameFormat',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='STANDARD', index=0, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='EXTENDED', index=1, number=2,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=543,
-  serialized_end=584,
+  serialized_start=546,
+  serialized_end=587,
 )
 
-_CONTROLCOMMAND_TYPE = descriptor.EnumDescriptor(
+_CONTROLCOMMAND_TYPE = _descriptor.EnumDescriptor(
   name='Type',
   full_name='openxc.ControlCommand.Type',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='VERSION', index=0, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='DEVICE_ID', index=1, number=2,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='DIAGNOSTIC', index=2, number=3,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='PASSTHROUGH', index=3, number=4,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='ACCEPTANCE_FILTER_BYPASS', index=4, number=5,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='PAYLOAD_FORMAT', index=5, number=6,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='PREDEFINED_OBD2_REQUESTS', index=6, number=7,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='MODEM_CONFIGURATION', index=7, number=8,
       options=None,
       type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RTC_CONFIGURATION', index=8, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SD_MOUNT_STATUS', index=9, number=10,
+      options=None,
+      type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=1080,
-  serialized_end=1252,
+  serialized_start=1151,
+  serialized_end=1367,
 )
 
-_DIAGNOSTICCONTROLCOMMAND_ACTION = descriptor.EnumDescriptor(
+_DIAGNOSTICCONTROLCOMMAND_ACTION = _descriptor.EnumDescriptor(
   name='Action',
   full_name='openxc.DiagnosticControlCommand.Action',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='ADD', index=0, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='CANCEL', index=1, number=2,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=1384,
-  serialized_end=1413,
+  serialized_start=1499,
+  serialized_end=1528,
 )
 
-_PAYLOADFORMATCOMMAND_PAYLOADFORMAT = descriptor.EnumDescriptor(
+_PAYLOADFORMATCOMMAND_PAYLOADFORMAT = _descriptor.EnumDescriptor(
   name='PayloadFormat',
   full_name='openxc.PayloadFormatCommand.PayloadFormat',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='JSON', index=0, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='PROTOBUF', index=1, number=2,
       options=None,
       type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MESSAGEPACK', index=2, number=3,
+      options=None,
+      type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=1624,
-  serialized_end=1663,
+  serialized_start=1740,
+  serialized_end=1796,
 )
 
-_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = descriptor.EnumDescriptor(
+_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = _descriptor.EnumDescriptor(
   name='NetworkType',
   full_name='openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='GSM', index=0, number=0,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='UTRAN', index=1, number=2,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=2047,
-  serialized_end=2080,
+  serialized_start=2180,
+  serialized_end=2213,
 )
 
-_NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = descriptor.EnumDescriptor(
+_NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = _descriptor.EnumDescriptor(
   name='OperatorSelectMode',
   full_name='openxc.NetworkOperatorSettings.OperatorSelectMode',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='AUTOMATIC', index=0, number=0,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='MANUAL', index=1, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='DEREGISTER', index=2, number=2,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='SET_ONLY', index=3, number=3,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='MANUAL_AUTOMATIC', index=4, number=4,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=2082,
-  serialized_end=2181,
+  serialized_start=2215,
+  serialized_end=2314,
 )
 
-_DIAGNOSTICREQUEST_DECODEDTYPE = descriptor.EnumDescriptor(
+_DIAGNOSTICREQUEST_DECODEDTYPE = _descriptor.EnumDescriptor(
   name='DecodedType',
   full_name='openxc.DiagnosticRequest.DecodedType',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='NONE', index=0, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='OBD2', index=1, number=2,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=2804,
-  serialized_end=2837,
+  serialized_start=2983,
+  serialized_end=3016,
 )
 
-_DYNAMICFIELD_TYPE = descriptor.EnumDescriptor(
+_DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor(
   name='Type',
   full_name='openxc.DynamicField.Type',
   filename=None,
   file=DESCRIPTOR,
   values=[
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='STRING', index=0, number=1,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='NUM', index=1, number=2,
       options=None,
       type=None),
-    descriptor.EnumValueDescriptor(
+    _descriptor.EnumValueDescriptor(
       name='BOOL', index=2, number=3,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=3129,
-  serialized_end=3166,
+  serialized_start=3308,
+  serialized_end=3345,
 )
 
 
-_VEHICLEMESSAGE = descriptor.Descriptor(
+_VEHICLEMESSAGE = _descriptor.Descriptor(
   name='VehicleMessage',
   full_name='openxc.VehicleMessage',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='type', full_name='openxc.VehicleMessage.type', index=0,
       number=1, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='can_message', full_name='openxc.VehicleMessage.can_message', index=1,
       number=2, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='simple_message', full_name='openxc.VehicleMessage.simple_message', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='diagnostic_response', full_name='openxc.VehicleMessage.diagnostic_response', index=3,
       number=4, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='control_command', full_name='openxc.VehicleMessage.control_command', index=4,
       number=5, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='command_response', full_name='openxc.VehicleMessage.command_response', index=5,
       number=6, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
-      name='uptime', full_name='openxc.VehicleMessage.uptime', index=6,
-      number=7, type=13, cpp_type=3, label=1,
+    _descriptor.FieldDescriptor(
+      name='timestamp', full_name='openxc.VehicleMessage.timestamp', index=6,
+      number=7, type=4, cpp_type=4, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
@@ -324,39 +338,39 @@ _VEHICLEMESSAGE = descriptor.Descriptor(
   is_extendable=False,
   extension_ranges=[],
   serialized_start=25,
-  serialized_end=433,
+  serialized_end=436,
 )
 
 
-_CANMESSAGE = descriptor.Descriptor(
+_CANMESSAGE = _descriptor.Descriptor(
   name='CanMessage',
   full_name='openxc.CanMessage',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='bus', full_name='openxc.CanMessage.bus', index=0,
       number=1, type=5, cpp_type=1, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='id', full_name='openxc.CanMessage.id', index=1,
       number=2, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='data', full_name='openxc.CanMessage.data', index=2,
       number=3, type=12, cpp_type=9, label=1,
       has_default_value=False, default_value="",
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='frame_format', full_name='openxc.CanMessage.frame_format', index=3,
       number=4, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
@@ -373,67 +387,74 @@ _CANMESSAGE = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=436,
-  serialized_end=584,
+  serialized_start=439,
+  serialized_end=587,
 )
 
 
-_CONTROLCOMMAND = descriptor.Descriptor(
+_CONTROLCOMMAND = _descriptor.Descriptor(
   name='ControlCommand',
   full_name='openxc.ControlCommand',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='type', full_name='openxc.ControlCommand.type', index=0,
       number=1, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='diagnostic_request', full_name='openxc.ControlCommand.diagnostic_request', index=1,
       number=2, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='passthrough_mode_request', full_name='openxc.ControlCommand.passthrough_mode_request', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='acceptance_filter_bypass_command', full_name='openxc.ControlCommand.acceptance_filter_bypass_command', index=3,
       number=4, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='payload_format_command', full_name='openxc.ControlCommand.payload_format_command', index=4,
       number=5, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='predefined_obd2_requests_command', full_name='openxc.ControlCommand.predefined_obd2_requests_command', index=5,
       number=6, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='modem_configuration_command', full_name='openxc.ControlCommand.modem_configuration_command', index=6,
       number=7, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
+    _descriptor.FieldDescriptor(
+      name='rtc_configuration_command', full_name='openxc.ControlCommand.rtc_configuration_command', index=7,
+      number=8, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
   ],
   extensions=[
   ],
@@ -444,26 +465,26 @@ _CONTROLCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=587,
-  serialized_end=1252,
+  serialized_start=590,
+  serialized_end=1367,
 )
 
 
-_DIAGNOSTICCONTROLCOMMAND = descriptor.Descriptor(
+_DIAGNOSTICCONTROLCOMMAND = _descriptor.Descriptor(
   name='DiagnosticControlCommand',
   full_name='openxc.DiagnosticControlCommand',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='request', full_name='openxc.DiagnosticControlCommand.request', index=0,
       number=1, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='action', full_name='openxc.DiagnosticControlCommand.action', index=1,
       number=2, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
@@ -480,26 +501,26 @@ _DIAGNOSTICCONTROLCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1255,
-  serialized_end=1413,
+  serialized_start=1370,
+  serialized_end=1528,
 )
 
 
-_PASSTHROUGHMODECONTROLCOMMAND = descriptor.Descriptor(
+_PASSTHROUGHMODECONTROLCOMMAND = _descriptor.Descriptor(
   name='PassthroughModeControlCommand',
   full_name='openxc.PassthroughModeControlCommand',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='bus', full_name='openxc.PassthroughModeControlCommand.bus', index=0,
       number=1, type=5, cpp_type=1, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='enabled', full_name='openxc.PassthroughModeControlCommand.enabled', index=1,
       number=2, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
@@ -515,26 +536,26 @@ _PASSTHROUGHMODECONTROLCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1415,
-  serialized_end=1476,
+  serialized_start=1530,
+  serialized_end=1591,
 )
 
 
-_ACCEPTANCEFILTERBYPASSCOMMAND = descriptor.Descriptor(
+_ACCEPTANCEFILTERBYPASSCOMMAND = _descriptor.Descriptor(
   name='AcceptanceFilterBypassCommand',
   full_name='openxc.AcceptanceFilterBypassCommand',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='bus', full_name='openxc.AcceptanceFilterBypassCommand.bus', index=0,
       number=1, type=5, cpp_type=1, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='bypass', full_name='openxc.AcceptanceFilterBypassCommand.bypass', index=1,
       number=2, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
@@ -550,19 +571,19 @@ _ACCEPTANCEFILTERBYPASSCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1478,
-  serialized_end=1538,
+  serialized_start=1593,
+  serialized_end=1653,
 )
 
 
-_PAYLOADFORMATCOMMAND = descriptor.Descriptor(
+_PAYLOADFORMATCOMMAND = _descriptor.Descriptor(
   name='PayloadFormatCommand',
   full_name='openxc.PayloadFormatCommand',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='format', full_name='openxc.PayloadFormatCommand.format', index=0,
       number=1, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
@@ -579,19 +600,19 @@ _PAYLOADFORMATCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1540,
-  serialized_end=1663,
+  serialized_start=1656,
+  serialized_end=1796,
 )
 
 
-_PREDEFINEDOBD2REQUESTSCOMMAND = descriptor.Descriptor(
+_PREDEFINEDOBD2REQUESTSCOMMAND = _descriptor.Descriptor(
   name='PredefinedObd2RequestsCommand',
   full_name='openxc.PredefinedObd2RequestsCommand',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='enabled', full_name='openxc.PredefinedObd2RequestsCommand.enabled', index=0,
       number=1, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
@@ -607,26 +628,26 @@ _PREDEFINEDOBD2REQUESTSCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1665,
-  serialized_end=1713,
+  serialized_start=1798,
+  serialized_end=1846,
 )
 
 
-_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = descriptor.Descriptor(
+_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = _descriptor.Descriptor(
   name='NetworkDescriptor',
   full_name='openxc.NetworkOperatorSettings.NetworkDescriptor',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='PLMN', full_name='openxc.NetworkOperatorSettings.NetworkDescriptor.PLMN', index=0,
       number=1, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='networkType', full_name='openxc.NetworkOperatorSettings.NetworkDescriptor.networkType', index=1,
       number=2, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=0,
@@ -643,32 +664,32 @@ _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1928,
-  serialized_end=2080,
+  serialized_start=2061,
+  serialized_end=2213,
 )
 
-_NETWORKOPERATORSETTINGS = descriptor.Descriptor(
+_NETWORKOPERATORSETTINGS = _descriptor.Descriptor(
   name='NetworkOperatorSettings',
   full_name='openxc.NetworkOperatorSettings',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='allowDataRoaming', full_name='openxc.NetworkOperatorSettings.allowDataRoaming', index=0,
       number=1, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='operatorSelectMode', full_name='openxc.NetworkOperatorSettings.operatorSelectMode', index=1,
       number=2, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='networkDescriptor', full_name='openxc.NetworkOperatorSettings.networkDescriptor', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
@@ -685,19 +706,19 @@ _NETWORKOPERATORSETTINGS = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1716,
-  serialized_end=2181,
+  serialized_start=1849,
+  serialized_end=2314,
 )
 
 
-_NETWORKDATASETTINGS = descriptor.Descriptor(
+_NETWORKDATASETTINGS = _descriptor.Descriptor(
   name='NetworkDataSettings',
   full_name='openxc.NetworkDataSettings',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='APN', full_name='openxc.NetworkDataSettings.APN', index=0,
       number=1, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
@@ -713,26 +734,26 @@ _NETWORKDATASETTINGS = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2183,
-  serialized_end=2217,
+  serialized_start=2316,
+  serialized_end=2350,
 )
 
 
-_SERVERCONNECTSETTINGS = descriptor.Descriptor(
+_SERVERCONNECTSETTINGS = _descriptor.Descriptor(
   name='ServerConnectSettings',
   full_name='openxc.ServerConnectSettings',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='host', full_name='openxc.ServerConnectSettings.host', index=0,
       number=1, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='port', full_name='openxc.ServerConnectSettings.port', index=1,
       number=2, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
@@ -748,33 +769,33 @@ _SERVERCONNECTSETTINGS = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2219,
-  serialized_end=2270,
+  serialized_start=2352,
+  serialized_end=2403,
 )
 
 
-_MODEMCONFIGURATIONCOMMAND = descriptor.Descriptor(
+_MODEMCONFIGURATIONCOMMAND = _descriptor.Descriptor(
   name='ModemConfigurationCommand',
   full_name='openxc.ModemConfigurationCommand',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='networkOperatorSettings', full_name='openxc.ModemConfigurationCommand.networkOperatorSettings', index=0,
       number=1, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='networkDataSettings', full_name='openxc.ModemConfigurationCommand.networkDataSettings', index=1,
       number=2, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='serverConnectSettings', full_name='openxc.ModemConfigurationCommand.serverConnectSettings', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
@@ -790,33 +811,61 @@ _MODEMCONFIGURATIONCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2273,
-  serialized_end=2486,
+  serialized_start=2406,
+  serialized_end=2619,
+)
+
+
+_RTCCONFIGURATIONCOMMAND = _descriptor.Descriptor(
+  name='RTCConfigurationCommand',
+  full_name='openxc.RTCConfigurationCommand',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='unix_time', full_name='openxc.RTCConfigurationCommand.unix_time', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=2621,
+  serialized_end=2665,
 )
 
 
-_COMMANDRESPONSE = descriptor.Descriptor(
+_COMMANDRESPONSE = _descriptor.Descriptor(
   name='CommandResponse',
   full_name='openxc.CommandResponse',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='type', full_name='openxc.CommandResponse.type', index=0,
       number=1, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='message', full_name='openxc.CommandResponse.message', index=1,
       number=2, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='status', full_name='openxc.CommandResponse.status', index=2,
       number=3, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
@@ -832,75 +881,75 @@ _COMMANDRESPONSE = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2488,
-  serialized_end=2581,
+  serialized_start=2667,
+  serialized_end=2760,
 )
 
 
-_DIAGNOSTICREQUEST = descriptor.Descriptor(
+_DIAGNOSTICREQUEST = _descriptor.Descriptor(
   name='DiagnosticRequest',
   full_name='openxc.DiagnosticRequest',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='bus', full_name='openxc.DiagnosticRequest.bus', index=0,
       number=1, type=5, cpp_type=1, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='message_id', full_name='openxc.DiagnosticRequest.message_id', index=1,
       number=2, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='mode', full_name='openxc.DiagnosticRequest.mode', index=2,
       number=3, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='pid', full_name='openxc.DiagnosticRequest.pid', index=3,
       number=4, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='payload', full_name='openxc.DiagnosticRequest.payload', index=4,
       number=5, type=12, cpp_type=9, label=1,
       has_default_value=False, default_value="",
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='multiple_responses', full_name='openxc.DiagnosticRequest.multiple_responses', index=5,
       number=6, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='frequency', full_name='openxc.DiagnosticRequest.frequency', index=6,
       number=7, type=1, cpp_type=5, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='name', full_name='openxc.DiagnosticRequest.name', index=7,
       number=8, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='decoded_type', full_name='openxc.DiagnosticRequest.decoded_type', index=8,
       number=9, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
@@ -917,68 +966,68 @@ _DIAGNOSTICREQUEST = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2584,
-  serialized_end=2837,
+  serialized_start=2763,
+  serialized_end=3016,
 )
 
 
-_DIAGNOSTICRESPONSE = descriptor.Descriptor(
+_DIAGNOSTICRESPONSE = _descriptor.Descriptor(
   name='DiagnosticResponse',
   full_name='openxc.DiagnosticResponse',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='bus', full_name='openxc.DiagnosticResponse.bus', index=0,
       number=1, type=5, cpp_type=1, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='message_id', full_name='openxc.DiagnosticResponse.message_id', index=1,
       number=2, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='mode', full_name='openxc.DiagnosticResponse.mode', index=2,
       number=3, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='pid', full_name='openxc.DiagnosticResponse.pid', index=3,
       number=4, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='success', full_name='openxc.DiagnosticResponse.success', index=4,
       number=5, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='negative_response_code', full_name='openxc.DiagnosticResponse.negative_response_code', index=5,
       number=6, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='payload', full_name='openxc.DiagnosticResponse.payload', index=6,
       number=7, type=12, cpp_type=9, label=1,
       has_default_value=False, default_value="",
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='value', full_name='openxc.DiagnosticResponse.value', index=7,
       number=8, type=1, cpp_type=5, label=1,
       has_default_value=False, default_value=0,
@@ -994,40 +1043,40 @@ _DIAGNOSTICRESPONSE = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2840,
-  serialized_end=3001,
+  serialized_start=3019,
+  serialized_end=3180,
 )
 
 
-_DYNAMICFIELD = descriptor.Descriptor(
+_DYNAMICFIELD = _descriptor.Descriptor(
   name='DynamicField',
   full_name='openxc.DynamicField',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='type', full_name='openxc.DynamicField.type', index=0,
       number=1, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='string_value', full_name='openxc.DynamicField.string_value', index=1,
       number=2, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='numeric_value', full_name='openxc.DynamicField.numeric_value', index=2,
       number=3, type=1, cpp_type=5, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='boolean_value', full_name='openxc.DynamicField.boolean_value', index=3,
       number=4, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
@@ -1044,33 +1093,33 @@ _DYNAMICFIELD = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=3004,
-  serialized_end=3166,
+  serialized_start=3183,
+  serialized_end=3345,
 )
 
 
-_SIMPLEMESSAGE = descriptor.Descriptor(
+_SIMPLEMESSAGE = _descriptor.Descriptor(
   name='SimpleMessage',
   full_name='openxc.SimpleMessage',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='name', full_name='openxc.SimpleMessage.name', index=0,
       number=1, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='value', full_name='openxc.SimpleMessage.value', index=1,
       number=2, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
-    descriptor.FieldDescriptor(
+    _descriptor.FieldDescriptor(
       name='event', full_name='openxc.SimpleMessage.event', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
@@ -1086,8 +1135,8 @@ _SIMPLEMESSAGE = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=3168,
-  serialized_end=3271,
+  serialized_start=3347,
+  serialized_end=3450,
 )
 
 _VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE
@@ -1106,6 +1155,7 @@ _CONTROLCOMMAND.fields_by_name['acceptance_filter_bypass_command'].message_type
 _CONTROLCOMMAND.fields_by_name['payload_format_command'].message_type = _PAYLOADFORMATCOMMAND
 _CONTROLCOMMAND.fields_by_name['predefined_obd2_requests_command'].message_type = _PREDEFINEDOBD2REQUESTSCOMMAND
 _CONTROLCOMMAND.fields_by_name['modem_configuration_command'].message_type = _MODEMCONFIGURATIONCOMMAND
+_CONTROLCOMMAND.fields_by_name['rtc_configuration_command'].message_type = _RTCCONFIGURATIONCOMMAND
 _CONTROLCOMMAND_TYPE.containing_type = _CONTROLCOMMAND;
 _DIAGNOSTICCONTROLCOMMAND.fields_by_name['request'].message_type = _DIAGNOSTICREQUEST
 _DIAGNOSTICCONTROLCOMMAND.fields_by_name['action'].enum_type = _DIAGNOSTICCONTROLCOMMAND_ACTION
@@ -1140,118 +1190,128 @@ DESCRIPTOR.message_types_by_name['NetworkOperatorSettings'] = _NETWORKOPERATORSE
 DESCRIPTOR.message_types_by_name['NetworkDataSettings'] = _NETWORKDATASETTINGS
 DESCRIPTOR.message_types_by_name['ServerConnectSettings'] = _SERVERCONNECTSETTINGS
 DESCRIPTOR.message_types_by_name['ModemConfigurationCommand'] = _MODEMCONFIGURATIONCOMMAND
+DESCRIPTOR.message_types_by_name['RTCConfigurationCommand'] = _RTCCONFIGURATIONCOMMAND
 DESCRIPTOR.message_types_by_name['CommandResponse'] = _COMMANDRESPONSE
 DESCRIPTOR.message_types_by_name['DiagnosticRequest'] = _DIAGNOSTICREQUEST
 DESCRIPTOR.message_types_by_name['DiagnosticResponse'] = _DIAGNOSTICRESPONSE
 DESCRIPTOR.message_types_by_name['DynamicField'] = _DYNAMICFIELD
 DESCRIPTOR.message_types_by_name['SimpleMessage'] = _SIMPLEMESSAGE
 
-class VehicleMessage(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class VehicleMessage(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _VEHICLEMESSAGE
-  
+
   # @@protoc_insertion_point(class_scope:openxc.VehicleMessage)
 
-class CanMessage(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class CanMessage(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _CANMESSAGE
-  
+
   # @@protoc_insertion_point(class_scope:openxc.CanMessage)
 
-class ControlCommand(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class ControlCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _CONTROLCOMMAND
-  
+
   # @@protoc_insertion_point(class_scope:openxc.ControlCommand)
 
-class DiagnosticControlCommand(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class DiagnosticControlCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _DIAGNOSTICCONTROLCOMMAND
-  
+
   # @@protoc_insertion_point(class_scope:openxc.DiagnosticControlCommand)
 
-class PassthroughModeControlCommand(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class PassthroughModeControlCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _PASSTHROUGHMODECONTROLCOMMAND
-  
+
   # @@protoc_insertion_point(class_scope:openxc.PassthroughModeControlCommand)
 
-class AcceptanceFilterBypassCommand(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class AcceptanceFilterBypassCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _ACCEPTANCEFILTERBYPASSCOMMAND
-  
+
   # @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand)
 
-class PayloadFormatCommand(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class PayloadFormatCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _PAYLOADFORMATCOMMAND
-  
+
   # @@protoc_insertion_point(class_scope:openxc.PayloadFormatCommand)
 
-class PredefinedObd2RequestsCommand(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class PredefinedObd2RequestsCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _PREDEFINEDOBD2REQUESTSCOMMAND
-  
+
   # @@protoc_insertion_point(class_scope:openxc.PredefinedObd2RequestsCommand)
 
-class NetworkOperatorSettings(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  
-  class NetworkDescriptor(message.Message):
-    __metaclass__ = reflection.GeneratedProtocolMessageType
+class NetworkOperatorSettings(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+
+  class NetworkDescriptor(_message.Message):
+    __metaclass__ = _reflection.GeneratedProtocolMessageType
     DESCRIPTOR = _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR
-    
+
     # @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings.NetworkDescriptor)
   DESCRIPTOR = _NETWORKOPERATORSETTINGS
-  
+
   # @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings)
 
-class NetworkDataSettings(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class NetworkDataSettings(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _NETWORKDATASETTINGS
-  
+
   # @@protoc_insertion_point(class_scope:openxc.NetworkDataSettings)
 
-class ServerConnectSettings(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class ServerConnectSettings(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _SERVERCONNECTSETTINGS
-  
+
   # @@protoc_insertion_point(class_scope:openxc.ServerConnectSettings)
 
-class ModemConfigurationCommand(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class ModemConfigurationCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _MODEMCONFIGURATIONCOMMAND
-  
+
   # @@protoc_insertion_point(class_scope:openxc.ModemConfigurationCommand)
 
-class CommandResponse(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class RTCConfigurationCommand(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _RTCCONFIGURATIONCOMMAND
+
+  # @@protoc_insertion_point(class_scope:openxc.RTCConfigurationCommand)
+
+class CommandResponse(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _COMMANDRESPONSE
-  
+
   # @@protoc_insertion_point(class_scope:openxc.CommandResponse)
 
-class DiagnosticRequest(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class DiagnosticRequest(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _DIAGNOSTICREQUEST
-  
+
   # @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest)
 
-class DiagnosticResponse(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class DiagnosticResponse(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _DIAGNOSTICRESPONSE
-  
+
   # @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse)
 
-class DynamicField(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class DynamicField(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _DYNAMICFIELD
-  
+
   # @@protoc_insertion_point(class_scope:openxc.DynamicField)
 
-class SimpleMessage(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
+class SimpleMessage(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _SIMPLEMESSAGE
-  
+
   # @@protoc_insertion_point(class_scope:openxc.SimpleMessage)
 
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), '\n\ncom.openxcB\016BinaryMessages')
 # @@protoc_insertion_point(module_scope)
diff --git a/openxc.proto b/openxc.proto
index bb54c770..6d41325b 100644
--- a/openxc.proto
+++ b/openxc.proto
@@ -13,7 +13,7 @@ message VehicleMessage {
     optional DiagnosticResponse diagnostic_response = 4;
     optional ControlCommand control_command = 5;
     optional CommandResponse command_response = 6;
-	optional uint32 uptime = 7;
+	optional uint64 timestamp = 7;
 }
 
 message CanMessage {
@@ -37,6 +37,8 @@ message ControlCommand {
         PAYLOAD_FORMAT = 6;
         PREDEFINED_OBD2_REQUESTS = 7;
 		MODEM_CONFIGURATION = 8;
+		RTC_CONFIGURATION = 9;
+		SD_MOUNT_STATUS = 10;
     }
 
     optional Type type = 1;
@@ -46,6 +48,7 @@ message ControlCommand {
     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 {
@@ -69,6 +72,7 @@ message PayloadFormatCommand {
     enum PayloadFormat {
         JSON = 1;
         PROTOBUF = 2;
+		MESSAGEPACK = 3;
     }
 
     optional PayloadFormat format = 1;
@@ -114,6 +118,10 @@ message ModemConfigurationCommand {
 	optional ServerConnectSettings serverConnectSettings = 3;
 }
 
+message RTCConfigurationCommand {
+	optional uint32 unix_time = 1;
+}
+
 message CommandResponse {
     optional ControlCommand.Type type = 1;
     optional string message = 2;