summaryrefslogtreecommitdiffstats
path: root/gen/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gen/cpp')
-rw-r--r--gen/cpp/openxc.pb10
-rw-r--r--gen/cpp/openxc.pb.c5
-rw-r--r--gen/cpp/openxc.pb.h20
3 files changed, 24 insertions, 11 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index eef93e61..66f214fe 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
-²
+Ž
openxc.protoopenxc"”
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
@@ -15,13 +15,17 @@ TRANSLATED
DIAGNOSTIC
CONTROL_COMMAND
-COMMAND_RESPONSE";
+COMMAND_RESPONSE"–
RawMessage
bus (
message_id ( 
-data ( "¸
+data ( .
+format (2.openxc.RawMessage.FrameFormat")
+ FrameFormat
+STANDARD
+EXTENDED"¸
ControlCommand)
type (2.openxc.ControlCommand.Type<
diagnostic_request ( 2 .openxc.DiagnosticControlCommandG
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index ac31b7ec..3a5ca0ff 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 Mon Sep 29 21:53:25 2014. */
+/* Generated by nanopb-0.3.1 at Mon Oct 6 21:30:25 2014. */
#include "openxc.pb.h"
@@ -19,10 +19,11 @@ const pb_field_t openxc_VehicleMessage_fields[7] = {
PB_LAST_FIELD
};
-const pb_field_t openxc_RawMessage_fields[4] = {
+const pb_field_t openxc_RawMessage_fields[5] = {
PB_FIELD( 1, INT32 , OPTIONAL, STATIC , FIRST, openxc_RawMessage, bus, bus, 0),
PB_FIELD( 2, UINT32 , OPTIONAL, STATIC , OTHER, openxc_RawMessage, message_id, bus, 0),
PB_FIELD( 3, BYTES , OPTIONAL, STATIC , OTHER, openxc_RawMessage, data, message_id, 0),
+ PB_FIELD( 4, ENUM , OPTIONAL, STATIC , OTHER, openxc_RawMessage, format, data, 0),
PB_LAST_FIELD
};
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 4af15de9..5f11ec1b 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 Mon Sep 29 21:53:25 2014. */
+/* Generated by nanopb-0.3.1 at Mon Oct 6 21:30:25 2014. */
#ifndef PB_OPENXC_PB_H_INCLUDED
#define PB_OPENXC_PB_H_INCLUDED
@@ -22,6 +22,11 @@ typedef enum _openxc_VehicleMessage_Type {
openxc_VehicleMessage_Type_COMMAND_RESPONSE = 5
} openxc_VehicleMessage_Type;
+typedef enum _openxc_RawMessage_FrameFormat {
+ openxc_RawMessage_FrameFormat_STANDARD = 1,
+ openxc_RawMessage_FrameFormat_EXTENDED = 2
+} openxc_RawMessage_FrameFormat;
+
typedef enum _openxc_ControlCommand_Type {
openxc_ControlCommand_Type_VERSION = 1,
openxc_ControlCommand_Type_DEVICE_ID = 2,
@@ -160,6 +165,8 @@ typedef struct _openxc_RawMessage {
uint32_t message_id;
bool has_data;
openxc_RawMessage_data_t data;
+ bool has_format;
+ openxc_RawMessage_FrameFormat format;
} openxc_RawMessage;
typedef struct _openxc_DiagnosticControlCommand {
@@ -214,7 +221,7 @@ typedef struct _openxc_VehicleMessage {
/* Initializer values for message structs */
#define openxc_VehicleMessage_init_default {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_default, false, openxc_TranslatedMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
-#define openxc_RawMessage_init_default {false, 0, false, 0, false, {0, {0}}}
+#define openxc_RawMessage_init_default {false, 0, false, 0, false, {0, {0}}, false, (openxc_RawMessage_FrameFormat)0}
#define openxc_ControlCommand_init_default {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_PayloadFormatCommand_init_default, false, openxc_PredefinedObd2RequestsCommand_init_default}
#define openxc_DiagnosticControlCommand_init_default {false, openxc_DiagnosticRequest_init_default, false, (openxc_DiagnosticControlCommand_Action)0}
#define openxc_PassthroughModeControlCommand_init_default {false, 0, false, 0}
@@ -227,7 +234,7 @@ typedef struct _openxc_VehicleMessage {
#define openxc_DynamicField_init_default {false, (openxc_DynamicField_Type)0, false, "", false, 0, false, 0}
#define openxc_TranslatedMessage_init_default {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
#define openxc_VehicleMessage_init_zero {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_zero, false, openxc_TranslatedMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
-#define openxc_RawMessage_init_zero {false, 0, false, 0, false, {0, {0}}}
+#define openxc_RawMessage_init_zero {false, 0, false, 0, false, {0, {0}}, false, (openxc_RawMessage_FrameFormat)0}
#define openxc_ControlCommand_init_zero {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero, false, openxc_AcceptanceFilterBypassCommand_init_zero, false, openxc_PayloadFormatCommand_init_zero, false, openxc_PredefinedObd2RequestsCommand_init_zero}
#define openxc_DiagnosticControlCommand_init_zero {false, openxc_DiagnosticRequest_init_zero, false, (openxc_DiagnosticControlCommand_Action)0}
#define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, 0}
@@ -274,6 +281,7 @@ typedef struct _openxc_VehicleMessage {
#define openxc_RawMessage_bus_tag 1
#define openxc_RawMessage_message_id_tag 2
#define openxc_RawMessage_data_tag 3
+#define openxc_RawMessage_format_tag 4
#define openxc_DiagnosticControlCommand_request_tag 1
#define openxc_DiagnosticControlCommand_action_tag 2
#define openxc_TranslatedMessage_type_tag 1
@@ -295,7 +303,7 @@ typedef struct _openxc_VehicleMessage {
/* Struct field encoding specification for nanopb */
extern const pb_field_t openxc_VehicleMessage_fields[7];
-extern const pb_field_t openxc_RawMessage_fields[4];
+extern const pb_field_t openxc_RawMessage_fields[5];
extern const pb_field_t openxc_ControlCommand_fields[7];
extern const pb_field_t openxc_DiagnosticControlCommand_fields[3];
extern const pb_field_t openxc_PassthroughModeControlCommand_fields[3];
@@ -309,8 +317,8 @@ extern const pb_field_t openxc_DynamicField_fields[5];
extern const pb_field_t openxc_TranslatedMessage_fields[5];
/* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size 716
-#define openxc_RawMessage_size 27
+#define openxc_VehicleMessage_size 722
+#define openxc_RawMessage_size 33
#define openxc_ControlCommand_size 126
#define openxc_DiagnosticControlCommand_size 76
#define openxc_PassthroughModeControlCommand_size 13