Merge pull request #28 from openxc/next

Ready to release updates for C5 devices

1 files changed, 25 insertions, 9 deletions

diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 2975d4d9..11386e3e 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 Mon Feb 29 19:42:01 2016. */
 
 #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