From 1e8b40f719ac43ea53e414e311d9387757630de6 Mon Sep 17 00:00:00 2001 From: Christopher Peplin Date: Sat, 27 Sep 2014 20:40:22 -0400 Subject: Standardize names for payload format. --- gen/cpp/openxc.pb.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gen/cpp/openxc.pb.h') diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index 2091dfaf..2df9a94b 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 Sat Sep 27 20:17:56 2014. */ +/* Generated by nanopb-0.3.1 at Sat Sep 27 21:46:00 2014. */ #ifndef PB_OPENXC_PB_H_INCLUDED #define PB_OPENXC_PB_H_INCLUDED @@ -28,7 +28,7 @@ typedef enum _openxc_ControlCommand_Type { openxc_ControlCommand_Type_DIAGNOSTIC = 3, openxc_ControlCommand_Type_PASSTHROUGH = 4, openxc_ControlCommand_Type_ACCEPTANCE_FILTER_BYPASS = 5, - openxc_ControlCommand_Type_MESSAGE_FORMAT = 6 + openxc_ControlCommand_Type_PAYLOAD_FORMAT = 6 } openxc_ControlCommand_Type; typedef enum _openxc_DiagnosticControlCommand_Action { @@ -36,10 +36,10 @@ typedef enum _openxc_DiagnosticControlCommand_Action { openxc_DiagnosticControlCommand_Action_CANCEL = 2 } openxc_DiagnosticControlCommand_Action; -typedef enum _openxc_MessageFormatCommand_MessageFormat { - openxc_MessageFormatCommand_MessageFormat_JSON = 1, - openxc_MessageFormatCommand_MessageFormat_BINARY = 2 -} openxc_MessageFormatCommand_MessageFormat; +typedef enum _openxc_PayloadFormatCommand_PayloadFormat { + openxc_PayloadFormatCommand_PayloadFormat_JSON = 1, + openxc_PayloadFormatCommand_PayloadFormat_PROTOBUF = 2 +} openxc_PayloadFormatCommand_PayloadFormat; typedef enum _openxc_DiagnosticRequest_DecodedType { openxc_DiagnosticRequest_DecodedType_NONE = 1, @@ -133,11 +133,6 @@ typedef struct _openxc_DynamicField { bool boolean_value; } openxc_DynamicField; -typedef struct _openxc_MessageFormatCommand { - bool has_format; - openxc_MessageFormatCommand_MessageFormat format; -} openxc_MessageFormatCommand; - typedef struct _openxc_PassthroughModeControlCommand { bool has_bus; int32_t bus; @@ -145,6 +140,11 @@ typedef struct _openxc_PassthroughModeControlCommand { bool enabled; } openxc_PassthroughModeControlCommand; +typedef struct _openxc_PayloadFormatCommand { + bool has_format; + openxc_PayloadFormatCommand_PayloadFormat format; +} openxc_PayloadFormatCommand; + typedef PB_BYTES_ARRAY_T(8) openxc_RawMessage_data_t; typedef struct _openxc_RawMessage { @@ -183,8 +183,8 @@ typedef struct _openxc_ControlCommand { openxc_PassthroughModeControlCommand passthrough_mode_request; bool has_acceptance_filter_bypass_command; openxc_AcceptanceFilterBypassCommand acceptance_filter_bypass_command; - bool has_message_format_command; - openxc_MessageFormatCommand message_format_command; + bool has_payload_format_command; + openxc_PayloadFormatCommand payload_format_command; } openxc_ControlCommand; typedef struct _openxc_VehicleMessage { @@ -207,11 +207,11 @@ typedef struct _openxc_VehicleMessage { /* 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}}} -#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_MessageFormatCommand_init_default} +#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} #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_AcceptanceFilterBypassCommand_init_default {false, 0, false, 0} -#define openxc_MessageFormatCommand_init_default {false, (openxc_MessageFormatCommand_MessageFormat)0} +#define openxc_PayloadFormatCommand_init_default {false, (openxc_PayloadFormatCommand_PayloadFormat)0} #define openxc_CommandResponse_init_default {false, (openxc_ControlCommand_Type)0, false, "", 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} @@ -219,11 +219,11 @@ typedef struct _openxc_VehicleMessage { #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}}} -#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_MessageFormatCommand_init_zero} +#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} #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_AcceptanceFilterBypassCommand_init_zero {false, 0, false, 0} -#define openxc_MessageFormatCommand_init_zero {false, (openxc_MessageFormatCommand_MessageFormat)0} +#define openxc_PayloadFormatCommand_init_zero {false, (openxc_PayloadFormatCommand_PayloadFormat)0} #define openxc_CommandResponse_init_zero {false, (openxc_ControlCommand_Type)0, false, "", 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} @@ -257,9 +257,9 @@ typedef struct _openxc_VehicleMessage { #define openxc_DynamicField_string_value_tag 2 #define openxc_DynamicField_numeric_value_tag 3 #define openxc_DynamicField_boolean_value_tag 4 -#define openxc_MessageFormatCommand_format_tag 1 #define openxc_PassthroughModeControlCommand_bus_tag 1 #define openxc_PassthroughModeControlCommand_enabled_tag 2 +#define openxc_PayloadFormatCommand_format_tag 1 #define openxc_RawMessage_bus_tag 1 #define openxc_RawMessage_message_id_tag 2 #define openxc_RawMessage_data_tag 3 @@ -273,7 +273,7 @@ typedef struct _openxc_VehicleMessage { #define openxc_ControlCommand_diagnostic_request_tag 2 #define openxc_ControlCommand_passthrough_mode_request_tag 3 #define openxc_ControlCommand_acceptance_filter_bypass_command_tag 4 -#define openxc_ControlCommand_message_format_command_tag 5 +#define openxc_ControlCommand_payload_format_command_tag 5 #define openxc_VehicleMessage_type_tag 1 #define openxc_VehicleMessage_raw_message_tag 2 #define openxc_VehicleMessage_translated_message_tag 3 @@ -288,7 +288,7 @@ extern const pb_field_t openxc_ControlCommand_fields[6]; extern const pb_field_t openxc_DiagnosticControlCommand_fields[3]; extern const pb_field_t openxc_PassthroughModeControlCommand_fields[3]; extern const pb_field_t openxc_AcceptanceFilterBypassCommand_fields[3]; -extern const pb_field_t openxc_MessageFormatCommand_fields[2]; +extern const pb_field_t openxc_PayloadFormatCommand_fields[2]; 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]; @@ -302,7 +302,7 @@ extern const pb_field_t openxc_TranslatedMessage_fields[5]; #define openxc_DiagnosticControlCommand_size 76 #define openxc_PassthroughModeControlCommand_size 13 #define openxc_AcceptanceFilterBypassCommand_size 13 -#define openxc_MessageFormatCommand_size 6 +#define openxc_PayloadFormatCommand_size 6 #define openxc_CommandResponse_size 139 #define openxc_DiagnosticRequest_size 68 #define openxc_DiagnosticResponse_size 56 -- cgit 1.2.3-korg