aboutsummaryrefslogtreecommitdiffstats
path: root/gen/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gen/cpp')
-rw-r--r--gen/cpp/openxc.pb21
-rw-r--r--gen/cpp/openxc.pb.c11
-rw-r--r--gen/cpp/openxc.pb.h26
3 files changed, 18 insertions, 40 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 88993ab5..a4716cee 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
-€
+÷
openxc.protoopenxc"ˆ
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
@@ -99,19 +99,10 @@ message_id ( 
STRING
NUM
-BOOL"ï
- SimpleMessage(
-type (2.openxc.SimpleMessage.Type
-name ( #
-value ( 2.openxc.DynamicField#
-event ( 2.openxc.DynamicField"\
-Type
-
-STRING
-NUM
-BOOL
-EVENTED_STRING
- EVENTED_NUM
- EVENTED_BOOLB
+BOOL"g
+ SimpleMessage
+name ( #
+value ( 2.openxc.DynamicField#
+event ( 2.openxc.DynamicFieldB
com.openxcBBinaryMessages \ No newline at end of file
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index b9d6d955..ccde431b 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 Oct 6 23:12:27 2014. */
+/* Generated by nanopb-0.3.1 at Mon Oct 6 23:25:12 2014. */
#include "openxc.pb.h"
@@ -105,11 +105,10 @@ const pb_field_t openxc_DynamicField_fields[5] = {
PB_LAST_FIELD
};
-const pb_field_t openxc_SimpleMessage_fields[5] = {
- PB_FIELD( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_SimpleMessage, type, type, 0),
- PB_FIELD( 2, STRING , OPTIONAL, CALLBACK, OTHER, openxc_SimpleMessage, name, type, 0),
- PB_FIELD( 3, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_SimpleMessage, value, name, &openxc_DynamicField_fields),
- PB_FIELD( 4, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_SimpleMessage, event, value, &openxc_DynamicField_fields),
+const pb_field_t openxc_SimpleMessage_fields[4] = {
+ PB_FIELD( 1, STRING , OPTIONAL, CALLBACK, FIRST, openxc_SimpleMessage, name, name, 0),
+ PB_FIELD( 2, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_SimpleMessage, value, name, &openxc_DynamicField_fields),
+ PB_FIELD( 3, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_SimpleMessage, event, value, &openxc_DynamicField_fields),
PB_LAST_FIELD
};
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 38107b33..5b36bd4a 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 Oct 6 23:12:27 2014. */
+/* Generated by nanopb-0.3.1 at Mon Oct 6 23:25:12 2014. */
#ifndef PB_OPENXC_PB_H_INCLUDED
#define PB_OPENXC_PB_H_INCLUDED
@@ -58,15 +58,6 @@ typedef enum _openxc_DynamicField_Type {
openxc_DynamicField_Type_BOOL = 3
} openxc_DynamicField_Type;
-typedef enum _openxc_SimpleMessage_Type {
- openxc_SimpleMessage_Type_STRING = 1,
- openxc_SimpleMessage_Type_NUM = 2,
- openxc_SimpleMessage_Type_BOOL = 3,
- openxc_SimpleMessage_Type_EVENTED_STRING = 4,
- openxc_SimpleMessage_Type_EVENTED_NUM = 5,
- openxc_SimpleMessage_Type_EVENTED_BOOL = 6
-} openxc_SimpleMessage_Type;
-
/* Struct definitions */
typedef struct _openxc_AcceptanceFilterBypassCommand {
bool has_bus;
@@ -174,8 +165,6 @@ typedef struct _openxc_DiagnosticControlCommand {
} openxc_DiagnosticControlCommand;
typedef struct _openxc_SimpleMessage {
- bool has_type;
- openxc_SimpleMessage_Type type;
pb_callback_t name;
bool has_value;
openxc_DynamicField value;
@@ -228,7 +217,7 @@ typedef struct _openxc_VehicleMessage {
#define openxc_DiagnosticRequest_init_default {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
#define openxc_DiagnosticResponse_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
#define openxc_DynamicField_init_default {false, (openxc_DynamicField_Type)0, false, "", false, 0, false, 0}
-#define openxc_SimpleMessage_init_default {false, (openxc_SimpleMessage_Type)0, {{NULL}, NULL}, false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
+#define openxc_SimpleMessage_init_default {{{NULL}, NULL}, false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
#define openxc_VehicleMessage_init_zero {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_zero, false, openxc_SimpleMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
#define openxc_CanMessage_init_zero {false, 0, false, 0, {{NULL}, NULL}, false, (openxc_CanMessage_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}
@@ -241,7 +230,7 @@ typedef struct _openxc_VehicleMessage {
#define openxc_DiagnosticRequest_init_zero {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
#define openxc_DiagnosticResponse_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
#define openxc_DynamicField_init_zero {false, (openxc_DynamicField_Type)0, false, "", false, 0, false, 0}
-#define openxc_SimpleMessage_init_zero {false, (openxc_SimpleMessage_Type)0, {{NULL}, NULL}, false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
+#define openxc_SimpleMessage_init_zero {{{NULL}, NULL}, false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
/* Field tags (for use in manual encoding/decoding) */
#define openxc_AcceptanceFilterBypassCommand_bus_tag 1
@@ -280,10 +269,9 @@ typedef struct _openxc_VehicleMessage {
#define openxc_PredefinedObd2RequestsCommand_enabled_tag 1
#define openxc_DiagnosticControlCommand_request_tag 1
#define openxc_DiagnosticControlCommand_action_tag 2
-#define openxc_SimpleMessage_type_tag 1
-#define openxc_SimpleMessage_name_tag 2
-#define openxc_SimpleMessage_value_tag 3
-#define openxc_SimpleMessage_event_tag 4
+#define openxc_SimpleMessage_name_tag 1
+#define openxc_SimpleMessage_value_tag 2
+#define openxc_SimpleMessage_event_tag 3
#define openxc_ControlCommand_type_tag 1
#define openxc_ControlCommand_diagnostic_request_tag 2
#define openxc_ControlCommand_passthrough_mode_request_tag 3
@@ -310,7 +298,7 @@ extern const pb_field_t openxc_CommandResponse_fields[4];
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_SimpleMessage_fields[5];
+extern const pb_field_t openxc_SimpleMessage_fields[4];
/* Maximum encoded size of messages (where known) */
#define openxc_ControlCommand_size 126