aboutsummaryrefslogtreecommitdiffstats
path: root/gen/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gen/cpp')
-rw-r--r--gen/cpp/openxc.pb16
-rw-r--r--gen/cpp/openxc.pb.c15
-rw-r--r--gen/cpp/openxc.pb.h23
3 files changed, 40 insertions, 14 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index ada75a1f..929e6a2c 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,20 +1,21 @@
-Ø
-
- openxc.protoopenxc"Ë
+ð
+ openxc.protoopenxc"”
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
raw_message ( 2.openxc.RawMessage5
translated_message ( 2.openxc.TranslatedMessage7
diagnostic_response ( 2.openxc.DiagnosticResponse/
-control_command ( 2.openxc.ControlCommand"D
+control_command ( 2.openxc.ControlCommand1
+command_response ( 2.openxc.CommandResponse"Z
Type
RAW
TRANSLATED
DIAGNOSTIC
-CONTROL_COMMAND";
+CONTROL_COMMAND
+COMMAND_RESPONSE";
RawMessage
bus (
@@ -28,7 +29,10 @@ message_id ( 
VERSION
DEVICE_ID
-DIAGNOSTIC"ª
+DIAGNOSTIC"M
+CommandResponse)
+type (2.openxc.ControlCommand.Type
+message ( "ª
DiagnosticRequest
bus (
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 72f1ce6a..b4cace32 100644
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,16 +1,17 @@
/* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.2.5 at Tue Mar 4 15:25:22 2014. */
+/* Generated by nanopb-0.2.5 at Thu Mar 6 16:21:37 2014. */
#include "openxc.pb.h"
-const pb_field_t openxc_VehicleMessage_fields[6] = {
+const pb_field_t openxc_VehicleMessage_fields[7] = {
PB_FIELD2( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_VehicleMessage, type, type, 0),
PB_FIELD2( 2, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_VehicleMessage, raw_message, type, &openxc_RawMessage_fields),
PB_FIELD2( 3, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_VehicleMessage, translated_message, raw_message, &openxc_TranslatedMessage_fields),
PB_FIELD2( 4, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_VehicleMessage, diagnostic_response, translated_message, &openxc_DiagnosticResponse_fields),
PB_FIELD2( 5, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_VehicleMessage, control_command, diagnostic_response, &openxc_ControlCommand_fields),
+ PB_FIELD2( 6, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_VehicleMessage, command_response, control_command, &openxc_CommandResponse_fields),
PB_LAST_FIELD
};
@@ -27,6 +28,12 @@ const pb_field_t openxc_ControlCommand_fields[3] = {
PB_LAST_FIELD
};
+const pb_field_t openxc_CommandResponse_fields[3] = {
+ PB_FIELD2( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_CommandResponse, type, type, 0),
+ PB_FIELD2( 2, STRING , OPTIONAL, STATIC , OTHER, openxc_CommandResponse, message, type, 0),
+ PB_LAST_FIELD
+};
+
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),
@@ -71,11 +78,11 @@ const pb_field_t openxc_TranslatedMessage_fields[5] = {
/* Check that field information fits in pb_field_t */
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
-STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 256 && pb_membersize(openxc_VehicleMessage, control_command) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_TranslatedMessage, value) < 256 && pb_membersize(openxc_TranslatedMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_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_TranslatedMessage, value) < 256 && pb_membersize(openxc_TranslatedMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
#endif
#if !defined(PB_FIELD_32BIT)
-STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 65536 && pb_membersize(openxc_VehicleMessage, control_command) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_TranslatedMessage, value) < 65536 && pb_membersize(openxc_TranslatedMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_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_TranslatedMessage, value) < 65536 && pb_membersize(openxc_TranslatedMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
#endif
/* On some platforms (such as AVR), double is really float.
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index e9c01935..5db13577 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 Tue Mar 4 15:25:22 2014. */
+/* Generated by nanopb-0.2.5 at Thu Mar 6 16:21:37 2014. */
#ifndef _PB_OPENXC_PB_H_
#define _PB_OPENXC_PB_H_
@@ -14,7 +14,8 @@ typedef enum _openxc_VehicleMessage_Type {
openxc_VehicleMessage_Type_RAW = 1,
openxc_VehicleMessage_Type_TRANSLATED = 2,
openxc_VehicleMessage_Type_DIAGNOSTIC = 3,
- openxc_VehicleMessage_Type_CONTROL_COMMAND = 4
+ openxc_VehicleMessage_Type_CONTROL_COMMAND = 4,
+ openxc_VehicleMessage_Type_COMMAND_RESPONSE = 5
} openxc_VehicleMessage_Type;
typedef enum _openxc_ControlCommand_Type {
@@ -39,6 +40,13 @@ typedef enum _openxc_TranslatedMessage_Type {
} openxc_TranslatedMessage_Type;
/* Struct definitions */
+typedef struct _openxc_CommandResponse {
+ bool has_type;
+ openxc_ControlCommand_Type type;
+ bool has_message;
+ char message[128];
+} openxc_CommandResponse;
+
typedef struct {
size_t size;
uint8_t bytes[8];
@@ -143,11 +151,15 @@ typedef struct _openxc_VehicleMessage {
openxc_DiagnosticResponse diagnostic_response;
bool has_control_command;
openxc_ControlCommand control_command;
+ bool has_command_response;
+ openxc_CommandResponse command_response;
} openxc_VehicleMessage;
/* Default values for struct fields */
/* Field tags (for use in manual encoding/decoding) */
+#define openxc_CommandResponse_type_tag 1
+#define openxc_CommandResponse_message_tag 2
#define openxc_DiagnosticRequest_bus_tag 1
#define openxc_DiagnosticRequest_message_id_tag 2
#define openxc_DiagnosticRequest_mode_tag 3
@@ -183,20 +195,23 @@ typedef struct _openxc_VehicleMessage {
#define openxc_VehicleMessage_translated_message_tag 3
#define openxc_VehicleMessage_diagnostic_response_tag 4
#define openxc_VehicleMessage_control_command_tag 5
+#define openxc_VehicleMessage_command_response_tag 6
/* Struct field encoding specification for nanopb */
-extern const pb_field_t openxc_VehicleMessage_fields[6];
+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_CommandResponse_fields[3];
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];
/* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size 524
+#define openxc_VehicleMessage_size 664
#define openxc_RawMessage_size 27
#define openxc_ControlCommand_size 76
+#define openxc_CommandResponse_size 137
#define openxc_DiagnosticRequest_size 68
#define openxc_DiagnosticResponse_size 56
#define openxc_DynamicField_size 119