diff options
Diffstat (limited to 'gen/cpp/openxc.pb.h')
| -rw-r--r-- | gen/cpp/openxc.pb.h | 90 |
1 files changed, 72 insertions, 18 deletions
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index 9e4c3a27..cfb0ef74 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 Wed Feb 19 14:35:41 2014. */ +/* Generated by nanopb-0.2.5 at Mon Mar 3 15:48:39 2014. */ #ifndef _PB_OPENXC_PB_H_ #define _PB_OPENXC_PB_H_ @@ -16,6 +16,12 @@ typedef enum _openxc_VehicleMessage_Type { openxc_VehicleMessage_Type_DIAGNOSTIC = 3 } openxc_VehicleMessage_Type; +typedef enum _openxc_ControlCommand_Type { + openxc_ControlCommand_Type_VERSION = 1, + openxc_ControlCommand_Type_DEVICE_ID = 2, + openxc_ControlCommand_Type_DIAGNOSTIC = 3 +} openxc_ControlCommand_Type; + typedef enum _openxc_TranslatedMessage_Type { openxc_TranslatedMessage_Type_STRING = 1, openxc_TranslatedMessage_Type_NUM = 2, @@ -29,9 +35,35 @@ typedef enum _openxc_TranslatedMessage_Type { typedef struct { size_t size; uint8_t bytes[8]; -} openxc_DiagnosticMessage_payload_t; +} openxc_DiagnosticRequest_payload_t; -typedef struct _openxc_DiagnosticMessage { +typedef struct _openxc_DiagnosticRequest { + 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_payload; + openxc_DiagnosticRequest_payload_t payload; + bool has_parse_payload; + bool parse_payload; + bool has_factor; + double factor; + bool has_offset; + double offset; + bool has_frequency; + double frequency; +} openxc_DiagnosticRequest; + +typedef struct { + size_t size; + uint8_t bytes[8]; +} openxc_DiagnosticResponse_payload_t; + +typedef struct _openxc_DiagnosticResponse { bool has_bus; int32_t bus; bool has_message_id; @@ -45,10 +77,10 @@ typedef struct _openxc_DiagnosticMessage { bool has_negative_response_code; uint32_t negative_response_code; bool has_payload; - openxc_DiagnosticMessage_payload_t payload; + openxc_DiagnosticResponse_payload_t payload; bool has_value; double value; -} openxc_DiagnosticMessage; +} openxc_DiagnosticResponse; typedef struct { size_t size; @@ -83,6 +115,13 @@ typedef struct _openxc_TranslatedMessage { bool boolean_event; } openxc_TranslatedMessage; +typedef struct _openxc_ControlCommand { + bool has_type; + openxc_ControlCommand_Type type; + bool has_diagnostic_request; + openxc_DiagnosticRequest diagnostic_request; +} openxc_ControlCommand; + typedef struct _openxc_VehicleMessage { bool has_type; openxc_VehicleMessage_Type type; @@ -90,21 +129,30 @@ typedef struct _openxc_VehicleMessage { openxc_RawMessage raw_message; bool has_translated_message; openxc_TranslatedMessage translated_message; - bool has_diagnostic_message; - openxc_DiagnosticMessage diagnostic_message; + bool has_diagnostic_response; + openxc_DiagnosticResponse diagnostic_response; } 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_DiagnosticMessage_value_tag 8 +#define openxc_DiagnosticRequest_bus_tag 1 +#define openxc_DiagnosticRequest_message_id_tag 2 +#define openxc_DiagnosticRequest_mode_tag 3 +#define openxc_DiagnosticRequest_pid_tag 4 +#define openxc_DiagnosticRequest_payload_tag 5 +#define openxc_DiagnosticRequest_parse_payload_tag 6 +#define openxc_DiagnosticRequest_factor_tag 7 +#define openxc_DiagnosticRequest_offset_tag 8 +#define openxc_DiagnosticRequest_frequency_tag 9 +#define openxc_DiagnosticResponse_bus_tag 1 +#define openxc_DiagnosticResponse_message_id_tag 2 +#define openxc_DiagnosticResponse_mode_tag 3 +#define openxc_DiagnosticResponse_pid_tag 4 +#define openxc_DiagnosticResponse_success_tag 5 +#define openxc_DiagnosticResponse_negative_response_code_tag 6 +#define openxc_DiagnosticResponse_payload_tag 7 +#define openxc_DiagnosticResponse_value_tag 8 #define openxc_RawMessage_bus_tag 1 #define openxc_RawMessage_message_id_tag 2 #define openxc_RawMessage_data_tag 3 @@ -116,21 +164,27 @@ typedef struct _openxc_VehicleMessage { #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_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 +#define openxc_VehicleMessage_diagnostic_response_tag 4 /* Struct field encoding specification for nanopb */ 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[9]; +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]; /* Maximum encoded size of messages (where known) */ #define openxc_VehicleMessage_size 430 #define openxc_RawMessage_size 27 -#define openxc_DiagnosticMessage_size 56 +#define openxc_ControlCommand_size 76 +#define openxc_DiagnosticRequest_size 68 +#define openxc_DiagnosticResponse_size 56 #define openxc_TranslatedMessage_size 334 #ifdef __cplusplus |