summaryrefslogtreecommitdiffstats
path: root/gen/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gen/cpp')
-rw-r--r--gen/cpp/openxc.pb22
-rw-r--r--gen/cpp/openxc.pb.c48
-rw-r--r--gen/cpp/openxc.pb.h45
3 files changed, 87 insertions, 28 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 88cf91aa..9d6271d1 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,20 +1,32 @@
-è
- openxc.protoopenxc"¼
+Ã
+ openxc.protoopenxc"ƒ
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
raw_message ( 2.openxc.RawMessage5
-translated_message ( 2.openxc.TranslatedMessage"
+translated_message ( 2.openxc.TranslatedMessage5
+diagnostic_message ( 2.openxc.DiagnosticMessage"/
Type
RAW
-TRANSLATED";
+TRANSLATED
+
+DIAGNOSTIC";
RawMessage
bus (
message_id ( 
-data ("µ
+data ("‘
+DiagnosticMessage
+bus (
+
+message_id ( 
+mode ( 
+pid ( 
+success (
+negative_response_code ( 
+payload ( "µ
TranslatedMessage,
type (2.openxc.TranslatedMessage.Type
name ( 
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 1625254e..3c3958f1 100644
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,44 +1,56 @@
/* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.2.4-dev at Thu Oct 24 10:06:38 2013. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 14:40:08 2014. */
#include "openxc.pb.h"
-const pb_field_t openxc_VehicleMessage_fields[4] = {
- 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),
+const pb_field_t openxc_VehicleMessage_fields[5] = {
+ 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_message, translated_message, &openxc_DiagnosticMessage_fields),
PB_LAST_FIELD
};
const pb_field_t openxc_RawMessage_fields[4] = {
- PB_FIELD2( 1, INT32 , OPTIONAL, STATIC, FIRST, openxc_RawMessage, bus, bus, 0),
- PB_FIELD2( 2, UINT32 , OPTIONAL, STATIC, OTHER, openxc_RawMessage, message_id, bus, 0),
- PB_FIELD2( 3, UINT64 , OPTIONAL, STATIC, OTHER, openxc_RawMessage, data, message_id, 0),
+ PB_FIELD2( 1, INT32 , OPTIONAL, STATIC , FIRST, openxc_RawMessage, bus, bus, 0),
+ PB_FIELD2( 2, UINT32 , OPTIONAL, STATIC , OTHER, openxc_RawMessage, message_id, bus, 0),
+ PB_FIELD2( 3, UINT64 , OPTIONAL, STATIC , OTHER, openxc_RawMessage, data, message_id, 0),
+ PB_LAST_FIELD
+};
+
+const pb_field_t openxc_DiagnosticMessage_fields[8] = {
+ PB_FIELD2( 1, INT32 , OPTIONAL, STATIC , FIRST, openxc_DiagnosticMessage, bus, bus, 0),
+ PB_FIELD2( 2, UINT32 , OPTIONAL, STATIC , OTHER, openxc_DiagnosticMessage, message_id, bus, 0),
+ PB_FIELD2( 3, UINT32 , OPTIONAL, STATIC , OTHER, openxc_DiagnosticMessage, mode, message_id, 0),
+ PB_FIELD2( 4, UINT32 , OPTIONAL, STATIC , OTHER, openxc_DiagnosticMessage, pid, mode, 0),
+ PB_FIELD2( 5, BOOL , OPTIONAL, STATIC , OTHER, openxc_DiagnosticMessage, success, pid, 0),
+ PB_FIELD2( 6, UINT32 , OPTIONAL, STATIC , OTHER, openxc_DiagnosticMessage, negative_response_code, success, 0),
+ PB_FIELD2( 7, BYTES , OPTIONAL, STATIC , OTHER, openxc_DiagnosticMessage, payload, negative_response_code, 0),
PB_LAST_FIELD
};
const pb_field_t openxc_TranslatedMessage_fields[9] = {
- PB_FIELD2( 1, ENUM , OPTIONAL, STATIC, FIRST, openxc_TranslatedMessage, type, type, 0),
- PB_FIELD2( 2, STRING , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, name, type, 0),
- PB_FIELD2( 3, STRING , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, string_value, name, 0),
- PB_FIELD2( 4, DOUBLE , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, numeric_value, string_value, 0),
- PB_FIELD2( 5, BOOL , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, boolean_value, numeric_value, 0),
- PB_FIELD2( 6, STRING , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, string_event, boolean_value, 0),
- PB_FIELD2( 7, DOUBLE , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, numeric_event, string_event, 0),
- PB_FIELD2( 8, BOOL , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, boolean_event, numeric_event, 0),
+ PB_FIELD2( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_TranslatedMessage, type, type, 0),
+ PB_FIELD2( 2, STRING , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, name, type, 0),
+ PB_FIELD2( 3, STRING , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, string_value, name, 0),
+ PB_FIELD2( 4, DOUBLE , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, numeric_value, string_value, 0),
+ PB_FIELD2( 5, BOOL , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, boolean_value, numeric_value, 0),
+ PB_FIELD2( 6, STRING , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, string_event, boolean_value, 0),
+ PB_FIELD2( 7, DOUBLE , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, numeric_event, string_event, 0),
+ PB_FIELD2( 8, BOOL , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, boolean_event, numeric_event, 0),
PB_LAST_FIELD
};
/* 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), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_openxc_TranslatedMessage)
#endif
#if !defined(PB_FIELD_32BIT)
-STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_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 81a0779d..95276b45 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.4-dev at Thu Oct 24 10:06:38 2013. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 14:40:08 2014. */
#ifndef _PB_OPENXC_PB_H_
#define _PB_OPENXC_PB_H_
@@ -12,7 +12,8 @@ extern "C" {
/* Enum definitions */
typedef enum _openxc_VehicleMessage_Type {
openxc_VehicleMessage_Type_RAW = 1,
- openxc_VehicleMessage_Type_TRANSLATED = 2
+ openxc_VehicleMessage_Type_TRANSLATED = 2,
+ openxc_VehicleMessage_Type_DIAGNOSTIC = 3
} openxc_VehicleMessage_Type;
typedef enum _openxc_TranslatedMessage_Type {
@@ -25,6 +26,28 @@ typedef enum _openxc_TranslatedMessage_Type {
} openxc_TranslatedMessage_Type;
/* Struct definitions */
+typedef struct {
+ size_t size;
+ uint8_t bytes[8];
+} openxc_DiagnosticMessage_payload_t;
+
+typedef struct _openxc_DiagnosticMessage {
+ bool has_bus;
+ int32_t bus;
+ bool has_message_id;
+ uint32_t message_id;
+ bool has_mode;
+ uint32_t mode;
+ bool has_pid;
+ uint32_t pid;
+ bool has_success;
+ bool success;
+ bool has_negative_response_code;
+ uint32_t negative_response_code;
+ bool has_payload;
+ openxc_DiagnosticMessage_payload_t payload;
+} openxc_DiagnosticMessage;
+
typedef struct _openxc_RawMessage {
bool has_bus;
int32_t bus;
@@ -60,11 +83,20 @@ typedef struct _openxc_VehicleMessage {
openxc_RawMessage raw_message;
bool has_translated_message;
openxc_TranslatedMessage translated_message;
+ bool has_diagnostic_message;
+ openxc_DiagnosticMessage diagnostic_message;
} openxc_VehicleMessage;
/* Default values for struct fields */
/* Field tags (for use in manual encoding/decoding) */
+#define openxc_DiagnosticMessage_bus_tag 1
+#define openxc_DiagnosticMessage_message_id_tag 2
+#define openxc_DiagnosticMessage_mode_tag 3
+#define openxc_DiagnosticMessage_pid_tag 4
+#define openxc_DiagnosticMessage_success_tag 5
+#define openxc_DiagnosticMessage_negative_response_code_tag 6
+#define openxc_DiagnosticMessage_payload_tag 7
#define openxc_RawMessage_bus_tag 1
#define openxc_RawMessage_message_id_tag 2
#define openxc_RawMessage_data_tag 3
@@ -79,15 +111,18 @@ typedef struct _openxc_VehicleMessage {
#define openxc_VehicleMessage_type_tag 1
#define openxc_VehicleMessage_raw_message_tag 2
#define openxc_VehicleMessage_translated_message_tag 3
+#define openxc_VehicleMessage_diagnostic_message_tag 4
/* Struct field encoding specification for nanopb */
-extern const pb_field_t openxc_VehicleMessage_fields[4];
+extern const pb_field_t openxc_VehicleMessage_fields[5];
extern const pb_field_t openxc_RawMessage_fields[4];
+extern const pb_field_t openxc_DiagnosticMessage_fields[8];
extern const pb_field_t openxc_TranslatedMessage_fields[9];
/* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size 368
-#define openxc_RawMessage_size 23
+#define openxc_VehicleMessage_size 422
+#define openxc_RawMessage_size 28
+#define openxc_DiagnosticMessage_size 47
#define openxc_TranslatedMessage_size 334
#ifdef __cplusplus