/* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.1 at Mon Oct 6 22:07:24 2014. */
+/* Generated by nanopb-0.3.1 at Fri Nov 7 08:56:52 2014. */
#ifndef PB_OPENXC_PB_H_INCLUDED
#define PB_OPENXC_PB_H_INCLUDED
/* Enum definitions */
typedef enum _openxc_VehicleMessage_Type {
- openxc_VehicleMessage_Type_RAW = 1,
- openxc_VehicleMessage_Type_TRANSLATED = 2,
+ openxc_VehicleMessage_Type_CAN = 1,
+ openxc_VehicleMessage_Type_SIMPLE = 2,
openxc_VehicleMessage_Type_DIAGNOSTIC = 3,
openxc_VehicleMessage_Type_CONTROL_COMMAND = 4,
openxc_VehicleMessage_Type_COMMAND_RESPONSE = 5
} openxc_VehicleMessage_Type;
-typedef enum _openxc_RawMessage_FrameFormat {
- openxc_RawMessage_FrameFormat_STANDARD = 1,
- openxc_RawMessage_FrameFormat_EXTENDED = 2
-} openxc_RawMessage_FrameFormat;
+typedef enum _openxc_CanMessage_FrameFormat {
+ openxc_CanMessage_FrameFormat_STANDARD = 1,
+ openxc_CanMessage_FrameFormat_EXTENDED = 2
+} openxc_CanMessage_FrameFormat;
typedef enum _openxc_ControlCommand_Type {
openxc_ControlCommand_Type_VERSION = 1,
openxc_DynamicField_Type_BOOL = 3
} openxc_DynamicField_Type;
-typedef enum _openxc_TranslatedMessage_Type {
- openxc_TranslatedMessage_Type_STRING = 1,
- openxc_TranslatedMessage_Type_NUM = 2,
- openxc_TranslatedMessage_Type_BOOL = 3,
- openxc_TranslatedMessage_Type_EVENTED_STRING = 4,
- openxc_TranslatedMessage_Type_EVENTED_NUM = 5,
- openxc_TranslatedMessage_Type_EVENTED_BOOL = 6
-} openxc_TranslatedMessage_Type;
-
/* Struct definitions */
typedef struct _openxc_AcceptanceFilterBypassCommand {
bool has_bus;
bool bypass;
} openxc_AcceptanceFilterBypassCommand;
+typedef PB_BYTES_ARRAY_T(8) openxc_CanMessage_data_t;
+
+typedef struct _openxc_CanMessage {
+ bool has_bus;
+ int32_t bus;
+ bool has_id;
+ uint32_t id;
+ bool has_data;
+ openxc_CanMessage_data_t data;
+ bool has_frame_format;
+ openxc_CanMessage_FrameFormat frame_format;
+} openxc_CanMessage;
+
typedef struct _openxc_CommandResponse {
bool has_type;
openxc_ControlCommand_Type type;
bool enabled;
} openxc_PredefinedObd2RequestsCommand;
-typedef PB_BYTES_ARRAY_T(8) openxc_RawMessage_data_t;
-
-typedef struct _openxc_RawMessage {
- bool has_bus;
- int32_t bus;
- bool has_message_id;
- uint32_t message_id;
- bool has_data;
- openxc_RawMessage_data_t data;
- bool has_frame_format;
- openxc_RawMessage_FrameFormat frame_format;
-} openxc_RawMessage;
-
typedef struct _openxc_DiagnosticControlCommand {
bool has_request;
openxc_DiagnosticRequest request;
openxc_DiagnosticControlCommand_Action action;
} openxc_DiagnosticControlCommand;
-typedef struct _openxc_TranslatedMessage {
- bool has_type;
- openxc_TranslatedMessage_Type type;
+typedef struct _openxc_SimpleMessage {
bool has_name;
char name[100];
bool has_value;
openxc_DynamicField value;
bool has_event;
openxc_DynamicField event;
-} openxc_TranslatedMessage;
+} openxc_SimpleMessage;
typedef struct _openxc_ControlCommand {
bool has_type;
typedef struct _openxc_VehicleMessage {
bool has_type;
openxc_VehicleMessage_Type type;
- bool has_raw_message;
- openxc_RawMessage raw_message;
- bool has_translated_message;
- openxc_TranslatedMessage translated_message;
+ bool has_can_message;
+ openxc_CanMessage can_message;
+ bool has_simple_message;
+ openxc_SimpleMessage simple_message;
bool has_diagnostic_response;
openxc_DiagnosticResponse diagnostic_response;
bool has_control_command;
/* Default values for struct fields */
/* Initializer values for message structs */
-#define openxc_VehicleMessage_init_default {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_default, false, openxc_TranslatedMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
-#define openxc_RawMessage_init_default {false, 0, false, 0, false, {0, {0}}, false, (openxc_RawMessage_FrameFormat)0}
+#define openxc_VehicleMessage_init_default {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_default, false, openxc_SimpleMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
+#define openxc_CanMessage_init_default {false, 0, false, 0, false, {0, {0}}, false, (openxc_CanMessage_FrameFormat)0}
#define openxc_ControlCommand_init_default {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_PayloadFormatCommand_init_default, false, openxc_PredefinedObd2RequestsCommand_init_default}
#define openxc_DiagnosticControlCommand_init_default {false, openxc_DiagnosticRequest_init_default, false, (openxc_DiagnosticControlCommand_Action)0}
#define openxc_PassthroughModeControlCommand_init_default {false, 0, false, 0}
#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_TranslatedMessage_init_default {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
-#define openxc_VehicleMessage_init_zero {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_zero, false, openxc_TranslatedMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
-#define openxc_RawMessage_init_zero {false, 0, false, 0, false, {0, {0}}, false, (openxc_RawMessage_FrameFormat)0}
+#define openxc_SimpleMessage_init_default {false, "", 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, false, {0, {0}}, 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}
#define openxc_DiagnosticControlCommand_init_zero {false, openxc_DiagnosticRequest_init_zero, false, (openxc_DiagnosticControlCommand_Action)0}
#define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, 0}
#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_TranslatedMessage_init_zero {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
+#define openxc_SimpleMessage_init_zero {false, "", false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
/* Field tags (for use in manual encoding/decoding) */
#define openxc_AcceptanceFilterBypassCommand_bus_tag 1
#define openxc_AcceptanceFilterBypassCommand_bypass_tag 2
+#define openxc_CanMessage_bus_tag 1
+#define openxc_CanMessage_id_tag 2
+#define openxc_CanMessage_data_tag 3
+#define openxc_CanMessage_frame_format_tag 4
#define openxc_CommandResponse_type_tag 1
#define openxc_CommandResponse_message_tag 2
#define openxc_CommandResponse_status_tag 3
#define openxc_PassthroughModeControlCommand_enabled_tag 2
#define openxc_PayloadFormatCommand_format_tag 1
#define openxc_PredefinedObd2RequestsCommand_enabled_tag 1
-#define openxc_RawMessage_bus_tag 1
-#define openxc_RawMessage_message_id_tag 2
-#define openxc_RawMessage_data_tag 3
-#define openxc_RawMessage_frame_format_tag 4
#define openxc_DiagnosticControlCommand_request_tag 1
#define openxc_DiagnosticControlCommand_action_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_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
#define openxc_ControlCommand_payload_format_command_tag 5
#define openxc_ControlCommand_predefined_obd2_requests_command_tag 6
#define openxc_VehicleMessage_type_tag 1
-#define openxc_VehicleMessage_raw_message_tag 2
-#define openxc_VehicleMessage_translated_message_tag 3
+#define openxc_VehicleMessage_can_message_tag 2
+#define openxc_VehicleMessage_simple_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[7];
-extern const pb_field_t openxc_RawMessage_fields[5];
+extern const pb_field_t openxc_CanMessage_fields[5];
extern const pb_field_t openxc_ControlCommand_fields[7];
extern const pb_field_t openxc_DiagnosticControlCommand_fields[3];
extern const pb_field_t openxc_PassthroughModeControlCommand_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];
+extern const pb_field_t openxc_SimpleMessage_fields[4];
/* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size 722
-#define openxc_RawMessage_size 33
+#define openxc_VehicleMessage_size 716
+#define openxc_CanMessage_size 33
#define openxc_ControlCommand_size 126
#define openxc_DiagnosticControlCommand_size 76
#define openxc_PassthroughModeControlCommand_size 13
#define openxc_DiagnosticRequest_size 68
#define openxc_DiagnosticResponse_size 56
#define openxc_DynamicField_size 119
-#define openxc_TranslatedMessage_size 350
+#define openxc_SimpleMessage_size 344
#ifdef __cplusplus
} /* extern "C" */