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.c24
-rw-r--r--gen/cpp/openxc.pb.h73
3 files changed, 72 insertions, 50 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 50591abc..ada75a1f 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,6 @@
-ñ
+Ø
+
openxc.protoopenxc"Ë
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
@@ -48,16 +49,22 @@ message_id ( 
success (
negative_response_code ( 
payload ( 
-value ("µ
+value ("¢
+ DynamicField'
+type (2.openxc.DynamicField.Type
+ string_value ( 
+ numeric_value (
+ boolean_value ("%
+Type
+
+STRING
+NUM
+BOOL"÷
TranslatedMessage,
type (2.openxc.TranslatedMessage.Type
-name ( 
- string_value ( 
- numeric_value (
- boolean_value (
- string_event ( 
- numeric_event (
- boolean_event ("\
+name ( #
+value ( 2.openxc.DynamicField#
+event ( 2.openxc.DynamicField"\
Type
STRING
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 4f1fa5a3..72f1ce6a 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 Tue Mar 4 12:52:45 2014. */
+/* Generated by nanopb-0.2.5 at Tue Mar 4 15:25:22 2014. */
#include "openxc.pb.h"
@@ -52,26 +52,30 @@ const pb_field_t openxc_DiagnosticResponse_fields[9] = {
PB_LAST_FIELD
};
-const pb_field_t openxc_TranslatedMessage_fields[9] = {
+const pb_field_t openxc_DynamicField_fields[5] = {
+ PB_FIELD2( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_DynamicField, type, type, 0),
+ PB_FIELD2( 2, STRING , OPTIONAL, STATIC , OTHER, openxc_DynamicField, string_value, type, 0),
+ PB_FIELD2( 3, DOUBLE , OPTIONAL, STATIC , OTHER, openxc_DynamicField, numeric_value, string_value, 0),
+ PB_FIELD2( 4, BOOL , OPTIONAL, STATIC , OTHER, openxc_DynamicField, boolean_value, numeric_value, 0),
+ PB_LAST_FIELD
+};
+
+const pb_field_t openxc_TranslatedMessage_fields[5] = {
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( 3, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, value, name, &openxc_DynamicField_fields),
+ PB_FIELD2( 4, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_TranslatedMessage, event, value, &openxc_DynamicField_fields),
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 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 256 && pb_membersize(openxc_VehicleMessage, control_command) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticRequest_openxc_DiagnosticResponse_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_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)
#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), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticRequest_openxc_DiagnosticResponse_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_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)
#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 3363d474..e9c01935 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 12:52:45 2014. */
+/* Generated by nanopb-0.2.5 at Tue Mar 4 15:25:22 2014. */
#ifndef _PB_OPENXC_PB_H_
#define _PB_OPENXC_PB_H_
@@ -23,6 +23,12 @@ typedef enum _openxc_ControlCommand_Type {
openxc_ControlCommand_Type_DIAGNOSTIC = 3
} openxc_ControlCommand_Type;
+typedef enum _openxc_DynamicField_Type {
+ openxc_DynamicField_Type_STRING = 1,
+ openxc_DynamicField_Type_NUM = 2,
+ openxc_DynamicField_Type_BOOL = 3
+} openxc_DynamicField_Type;
+
typedef enum _openxc_TranslatedMessage_Type {
openxc_TranslatedMessage_Type_STRING = 1,
openxc_TranslatedMessage_Type_NUM = 2,
@@ -83,6 +89,17 @@ typedef struct _openxc_DiagnosticResponse {
double value;
} openxc_DiagnosticResponse;
+typedef struct _openxc_DynamicField {
+ bool has_type;
+ openxc_DynamicField_Type type;
+ bool has_string_value;
+ char string_value[100];
+ bool has_numeric_value;
+ double numeric_value;
+ bool has_boolean_value;
+ bool boolean_value;
+} openxc_DynamicField;
+
typedef struct {
size_t size;
uint8_t bytes[8];
@@ -97,25 +114,6 @@ typedef struct _openxc_RawMessage {
openxc_RawMessage_data_t data;
} openxc_RawMessage;
-typedef struct _openxc_TranslatedMessage {
- bool has_type;
- openxc_TranslatedMessage_Type type;
- bool has_name;
- char name[100];
- bool has_string_value;
- char string_value[100];
- bool has_numeric_value;
- double numeric_value;
- bool has_boolean_value;
- bool boolean_value;
- bool has_string_event;
- char string_event[100];
- bool has_numeric_event;
- double numeric_event;
- bool has_boolean_event;
- bool boolean_event;
-} openxc_TranslatedMessage;
-
typedef struct _openxc_ControlCommand {
bool has_type;
openxc_ControlCommand_Type type;
@@ -123,6 +121,17 @@ typedef struct _openxc_ControlCommand {
openxc_DiagnosticRequest diagnostic_request;
} openxc_ControlCommand;
+typedef struct _openxc_TranslatedMessage {
+ bool has_type;
+ openxc_TranslatedMessage_Type type;
+ bool has_name;
+ char name[100];
+ bool has_value;
+ openxc_DynamicField value;
+ bool has_event;
+ openxc_DynamicField event;
+} openxc_TranslatedMessage;
+
typedef struct _openxc_VehicleMessage {
bool has_type;
openxc_VehicleMessage_Type type;
@@ -156,19 +165,19 @@ typedef struct _openxc_VehicleMessage {
#define openxc_DiagnosticResponse_negative_response_code_tag 6
#define openxc_DiagnosticResponse_payload_tag 7
#define openxc_DiagnosticResponse_value_tag 8
+#define openxc_DynamicField_type_tag 1
+#define openxc_DynamicField_string_value_tag 2
+#define openxc_DynamicField_numeric_value_tag 3
+#define openxc_DynamicField_boolean_value_tag 4
#define openxc_RawMessage_bus_tag 1
#define openxc_RawMessage_message_id_tag 2
#define openxc_RawMessage_data_tag 3
-#define openxc_TranslatedMessage_type_tag 1
-#define openxc_TranslatedMessage_name_tag 2
-#define openxc_TranslatedMessage_string_value_tag 3
-#define openxc_TranslatedMessage_numeric_value_tag 4
-#define openxc_TranslatedMessage_boolean_value_tag 5
-#define openxc_TranslatedMessage_string_event_tag 6
-#define openxc_TranslatedMessage_numeric_event_tag 7
-#define openxc_TranslatedMessage_boolean_event_tag 8
#define openxc_ControlCommand_type_tag 1
#define openxc_ControlCommand_diagnostic_request_tag 2
+#define openxc_TranslatedMessage_type_tag 1
+#define openxc_TranslatedMessage_name_tag 2
+#define openxc_TranslatedMessage_value_tag 3
+#define openxc_TranslatedMessage_event_tag 4
#define openxc_VehicleMessage_type_tag 1
#define openxc_VehicleMessage_raw_message_tag 2
#define openxc_VehicleMessage_translated_message_tag 3
@@ -181,15 +190,17 @@ extern const pb_field_t openxc_RawMessage_fields[4];
extern const pb_field_t openxc_ControlCommand_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_TranslatedMessage_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 508
+#define openxc_VehicleMessage_size 524
#define openxc_RawMessage_size 27
#define openxc_ControlCommand_size 76
#define openxc_DiagnosticRequest_size 68
#define openxc_DiagnosticResponse_size 56
-#define openxc_TranslatedMessage_size 334
+#define openxc_DynamicField_size 119
+#define openxc_TranslatedMessage_size 350
#ifdef __cplusplus
} /* extern "C" */