summaryrefslogtreecommitdiffstats
path: root/gen/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gen/cpp')
-rw-r--r--gen/cpp/openxc.pb25
-rw-r--r--gen/cpp/openxc.pb.c8
-rw-r--r--gen/cpp/openxc.pb.h24
3 files changed, 28 insertions, 29 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index e74bf809..e2d67115 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
-¤
+¡
openxc.protoopenxc"”
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
@@ -21,19 +21,24 @@ RawMessage
bus (
message_id ( 
-data ( "¦
+data ( "ô
ControlCommand)
type (2.openxc.ControlCommand.Type5
-diagnostic_request ( 2.openxc.DiagnosticRequest"2
+diagnostic_request ( 2.openxc.DiagnosticRequest-
+action (2.openxc.ControlCommand.Action"2
Type
VERSION
DEVICE_ID
-DIAGNOSTIC"]
+DIAGNOSTIC"
+Action
+ADD
+
+CANCEL"]
CommandResponse)
type (2.openxc.ControlCommand.Type
message ( 
-status ("Î
+status ("ý
DiagnosticRequest
bus (
@@ -44,16 +49,10 @@ message_id ( 
multiple_responses (
frequency (
name ( ;
- decoded_type (2%.openxc.DiagnosticRequest.DecodedType0
-action
- (2 .openxc.DiagnosticRequest.Action"!
+ decoded_type (2%.openxc.DiagnosticRequest.DecodedType"!
DecodedType
NONE
-OBD2"
-Action
-ADD
-
-CANCEL"¡
+OBD2"¡
DiagnosticResponse
bus (
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index e7fac5b5..5895ffc1 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.2.5 at Sun Aug 10 22:03:53 2014. */
+/* Generated by nanopb-0.2.5 at Mon Aug 11 23:26:24 2014. */
#include "openxc.pb.h"
@@ -22,9 +22,10 @@ const pb_field_t openxc_RawMessage_fields[4] = {
PB_LAST_FIELD
};
-const pb_field_t openxc_ControlCommand_fields[3] = {
+const pb_field_t openxc_ControlCommand_fields[4] = {
PB_FIELD2( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_ControlCommand, type, type, 0),
PB_FIELD2( 2, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_ControlCommand, diagnostic_request, type, &openxc_DiagnosticRequest_fields),
+ PB_FIELD2( 3, ENUM , OPTIONAL, STATIC , OTHER, openxc_ControlCommand, action, diagnostic_request, 0),
PB_LAST_FIELD
};
@@ -35,7 +36,7 @@ const pb_field_t openxc_CommandResponse_fields[4] = {
PB_LAST_FIELD
};
-const pb_field_t openxc_DiagnosticRequest_fields[11] = {
+const pb_field_t openxc_DiagnosticRequest_fields[10] = {
PB_FIELD2( 1, INT32 , OPTIONAL, STATIC , FIRST, openxc_DiagnosticRequest, bus, bus, 0),
PB_FIELD2( 2, UINT32 , OPTIONAL, STATIC , OTHER, openxc_DiagnosticRequest, message_id, bus, 0),
PB_FIELD2( 3, UINT32 , OPTIONAL, STATIC , OTHER, openxc_DiagnosticRequest, mode, message_id, 0),
@@ -45,7 +46,6 @@ const pb_field_t openxc_DiagnosticRequest_fields[11] = {
PB_FIELD2( 7, DOUBLE , OPTIONAL, STATIC , OTHER, openxc_DiagnosticRequest, frequency, multiple_responses, 0),
PB_FIELD2( 8, STRING , OPTIONAL, STATIC , OTHER, openxc_DiagnosticRequest, name, frequency, 0),
PB_FIELD2( 9, ENUM , OPTIONAL, STATIC , OTHER, openxc_DiagnosticRequest, decoded_type, name, 0),
- PB_FIELD2( 10, ENUM , OPTIONAL, STATIC , OTHER, openxc_DiagnosticRequest, action, decoded_type, 0),
PB_LAST_FIELD
};
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 40993335..b8b60574 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.2.5 at Sun Aug 10 22:03:53 2014. */
+/* Generated by nanopb-0.2.5 at Mon Aug 11 23:26:24 2014. */
#ifndef _PB_OPENXC_PB_H_
#define _PB_OPENXC_PB_H_
@@ -24,16 +24,16 @@ typedef enum _openxc_ControlCommand_Type {
openxc_ControlCommand_Type_DIAGNOSTIC = 3
} openxc_ControlCommand_Type;
+typedef enum _openxc_ControlCommand_Action {
+ openxc_ControlCommand_Action_ADD = 1,
+ openxc_ControlCommand_Action_CANCEL = 2
+} openxc_ControlCommand_Action;
+
typedef enum _openxc_DiagnosticRequest_DecodedType {
openxc_DiagnosticRequest_DecodedType_NONE = 1,
openxc_DiagnosticRequest_DecodedType_OBD2 = 2
} openxc_DiagnosticRequest_DecodedType;
-typedef enum _openxc_DiagnosticRequest_Action {
- openxc_DiagnosticRequest_Action_ADD = 1,
- openxc_DiagnosticRequest_Action_CANCEL = 3
-} openxc_DiagnosticRequest_Action;
-
typedef enum _openxc_DynamicField_Type {
openxc_DynamicField_Type_STRING = 1,
openxc_DynamicField_Type_NUM = 2,
@@ -83,8 +83,6 @@ typedef struct _openxc_DiagnosticRequest {
char name[10];
bool has_decoded_type;
openxc_DiagnosticRequest_DecodedType decoded_type;
- bool has_action;
- openxc_DiagnosticRequest_Action action;
} openxc_DiagnosticRequest;
typedef struct {
@@ -141,6 +139,8 @@ typedef struct _openxc_ControlCommand {
openxc_ControlCommand_Type type;
bool has_diagnostic_request;
openxc_DiagnosticRequest diagnostic_request;
+ bool has_action;
+ openxc_ControlCommand_Action action;
} openxc_ControlCommand;
typedef struct _openxc_TranslatedMessage {
@@ -184,7 +184,6 @@ typedef struct _openxc_VehicleMessage {
#define openxc_DiagnosticRequest_frequency_tag 7
#define openxc_DiagnosticRequest_name_tag 8
#define openxc_DiagnosticRequest_decoded_type_tag 9
-#define openxc_DiagnosticRequest_action_tag 10
#define openxc_DiagnosticResponse_bus_tag 1
#define openxc_DiagnosticResponse_message_id_tag 2
#define openxc_DiagnosticResponse_mode_tag 3
@@ -202,6 +201,7 @@ typedef struct _openxc_VehicleMessage {
#define openxc_RawMessage_data_tag 3
#define openxc_ControlCommand_type_tag 1
#define openxc_ControlCommand_diagnostic_request_tag 2
+#define openxc_ControlCommand_action_tag 3
#define openxc_TranslatedMessage_type_tag 1
#define openxc_TranslatedMessage_name_tag 2
#define openxc_TranslatedMessage_value_tag 3
@@ -216,9 +216,9 @@ 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_ControlCommand_fields[3];
+extern const pb_field_t openxc_ControlCommand_fields[4];
extern const pb_field_t openxc_CommandResponse_fields[4];
-extern const pb_field_t openxc_DiagnosticRequest_fields[11];
+extern const pb_field_t openxc_DiagnosticRequest_fields[10];
extern const pb_field_t openxc_DiagnosticResponse_fields[9];
extern const pb_field_t openxc_DynamicField_fields[5];
extern const pb_field_t openxc_TranslatedMessage_fields[5];
@@ -228,7 +228,7 @@ extern const pb_field_t openxc_TranslatedMessage_fields[5];
#define openxc_RawMessage_size 27
#define openxc_ControlCommand_size 82
#define openxc_CommandResponse_size 139
-#define openxc_DiagnosticRequest_size 74
+#define openxc_DiagnosticRequest_size 68
#define openxc_DiagnosticResponse_size 56
#define openxc_DynamicField_size 119
#define openxc_TranslatedMessage_size 350