X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=gen%2Fcpp%2Fopenxc.pb.h;h=09735ee7fff3e3959f028f041e679826a3d731f4;hb=d9f54f97578429773421abce98d5f6579717afcc;hp=38107b3358174ba01a237a2687f2d052126a9ed2;hpb=9e84f7713ab25ddb69e6f46cf34285a09ee9e28b;p=apps%2Fagl-service-can-low-level.git diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index 38107b33..09735ee7 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 Wed Sep 14 16:47:53 2016. */ #ifndef PB_OPENXC_PB_H_INCLUDED #define PB_OPENXC_PB_H_INCLUDED @@ -34,7 +34,11 @@ typedef enum _openxc_ControlCommand_Type { openxc_ControlCommand_Type_PASSTHROUGH = 4, openxc_ControlCommand_Type_ACCEPTANCE_FILTER_BYPASS = 5, openxc_ControlCommand_Type_PAYLOAD_FORMAT = 6, - openxc_ControlCommand_Type_PREDEFINED_OBD2_REQUESTS = 7 + openxc_ControlCommand_Type_PREDEFINED_OBD2_REQUESTS = 7, + openxc_ControlCommand_Type_MODEM_CONFIGURATION = 8, + openxc_ControlCommand_Type_RTC_CONFIGURATION = 9, + openxc_ControlCommand_Type_SD_MOUNT_STATUS = 10, + openxc_ControlCommand_Type_PLATFORM = 11 } openxc_ControlCommand_Type; typedef enum _openxc_DiagnosticControlCommand_Action { @@ -44,9 +48,23 @@ typedef enum _openxc_DiagnosticControlCommand_Action { typedef enum _openxc_PayloadFormatCommand_PayloadFormat { openxc_PayloadFormatCommand_PayloadFormat_JSON = 1, - openxc_PayloadFormatCommand_PayloadFormat_PROTOBUF = 2 + openxc_PayloadFormatCommand_PayloadFormat_PROTOBUF = 2, + openxc_PayloadFormatCommand_PayloadFormat_MESSAGEPACK = 3 } openxc_PayloadFormatCommand_PayloadFormat; +typedef enum _openxc_NetworkOperatorSettings_OperatorSelectMode { + openxc_NetworkOperatorSettings_OperatorSelectMode_AUTOMATIC = 0, + openxc_NetworkOperatorSettings_OperatorSelectMode_MANUAL = 1, + openxc_NetworkOperatorSettings_OperatorSelectMode_DEREGISTER = 2, + openxc_NetworkOperatorSettings_OperatorSelectMode_SET_ONLY = 3, + openxc_NetworkOperatorSettings_OperatorSelectMode_MANUAL_AUTOMATIC = 4 +} openxc_NetworkOperatorSettings_OperatorSelectMode; + +typedef enum _openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType { + openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType_GSM = 0, + openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType_UTRAN = 2 +} openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType; + typedef enum _openxc_DiagnosticRequest_DecodedType { openxc_DiagnosticRequest_DecodedType_NONE = 1, openxc_DiagnosticRequest_DecodedType_OBD2 = 2 @@ -58,16 +76,11 @@ 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_NetworkDataSettings { + pb_callback_t APN; +} openxc_NetworkDataSettings; + typedef struct _openxc_AcceptanceFilterBypassCommand { bool has_bus; int32_t bus; @@ -75,12 +88,15 @@ typedef struct _openxc_AcceptanceFilterBypassCommand { 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_message_id; - uint32_t message_id; - pb_callback_t data; + 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; @@ -117,7 +133,7 @@ typedef struct _openxc_DiagnosticRequest { openxc_DiagnosticRequest_DecodedType decoded_type; } openxc_DiagnosticRequest; -typedef PB_BYTES_ARRAY_T(8) openxc_DiagnosticResponse_payload_t; +typedef PB_BYTES_ARRAY_T(255) openxc_DiagnosticResponse_payload_t; typedef struct _openxc_DiagnosticResponse { bool has_bus; @@ -149,6 +165,13 @@ typedef struct _openxc_DynamicField { bool boolean_value; } openxc_DynamicField; +typedef struct _openxc_NetworkOperatorSettings_NetworkDescriptor { + bool has_PLMN; + uint32_t PLMN; + bool has_networkType; + openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType networkType; +} openxc_NetworkOperatorSettings_NetworkDescriptor; + typedef struct _openxc_PassthroughModeControlCommand { bool has_bus; int32_t bus; @@ -166,6 +189,18 @@ typedef struct _openxc_PredefinedObd2RequestsCommand { bool enabled; } openxc_PredefinedObd2RequestsCommand; +typedef struct _openxc_RTCConfigurationCommand { + bool has_unix_time; + uint32_t unix_time; +} openxc_RTCConfigurationCommand; + +typedef struct _openxc_ServerConnectSettings { + bool has_host; + char host[128]; + bool has_port; + uint32_t port; +} openxc_ServerConnectSettings; + typedef struct _openxc_DiagnosticControlCommand { bool has_request; openxc_DiagnosticRequest request; @@ -173,16 +208,33 @@ typedef struct _openxc_DiagnosticControlCommand { openxc_DiagnosticControlCommand_Action action; } openxc_DiagnosticControlCommand; +typedef struct _openxc_NetworkOperatorSettings { + bool has_allowDataRoaming; + bool allowDataRoaming; + bool has_operatorSelectMode; + openxc_NetworkOperatorSettings_OperatorSelectMode operatorSelectMode; + bool has_networkDescriptor; + openxc_NetworkOperatorSettings_NetworkDescriptor networkDescriptor; +} openxc_NetworkOperatorSettings; + typedef struct _openxc_SimpleMessage { - bool has_type; - openxc_SimpleMessage_Type type; - pb_callback_t name; + bool has_name; + char name[100]; bool has_value; openxc_DynamicField value; bool has_event; openxc_DynamicField event; } openxc_SimpleMessage; +typedef struct _openxc_ModemConfigurationCommand { + bool has_networkOperatorSettings; + openxc_NetworkOperatorSettings networkOperatorSettings; + bool has_networkDataSettings; + openxc_NetworkDataSettings networkDataSettings; + bool has_serverConnectSettings; + openxc_ServerConnectSettings serverConnectSettings; +} openxc_ModemConfigurationCommand; + typedef struct _openxc_ControlCommand { bool has_type; openxc_ControlCommand_Type type; @@ -196,6 +248,10 @@ typedef struct _openxc_ControlCommand { openxc_PayloadFormatCommand payload_format_command; bool has_predefined_obd2_requests_command; openxc_PredefinedObd2RequestsCommand predefined_obd2_requests_command; + bool has_modem_configuration_command; + openxc_ModemConfigurationCommand modem_configuration_command; + bool has_rtc_configuration_command; + openxc_RTCConfigurationCommand rtc_configuration_command; } openxc_ControlCommand; typedef struct _openxc_VehicleMessage { @@ -211,43 +267,58 @@ typedef struct _openxc_VehicleMessage { openxc_ControlCommand control_command; bool has_command_response; openxc_CommandResponse command_response; + bool has_timestamp; + uint64_t timestamp; } openxc_VehicleMessage; /* Default values for struct fields */ /* Initializer values for message structs */ -#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, {{NULL}, NULL}, 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_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, false, 0} +#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, false, openxc_ModemConfigurationCommand_init_default, false, openxc_RTCConfigurationCommand_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_PayloadFormatCommand_init_default {false, (openxc_PayloadFormatCommand_PayloadFormat)0} #define openxc_PredefinedObd2RequestsCommand_init_default {false, 0} +#define openxc_NetworkOperatorSettings_init_default {false, 0, false, (openxc_NetworkOperatorSettings_OperatorSelectMode)0, false, openxc_NetworkOperatorSettings_NetworkDescriptor_init_default} +#define openxc_NetworkOperatorSettings_NetworkDescriptor_init_default {false, 0, false, (openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType)0} +#define openxc_NetworkDataSettings_init_default {{{NULL}, NULL}} +#define openxc_ServerConnectSettings_init_default {false, "", false, 0} +#define openxc_ModemConfigurationCommand_init_default {false, openxc_NetworkOperatorSettings_init_default, false, openxc_NetworkDataSettings_init_default, false, openxc_ServerConnectSettings_init_default} +#define openxc_RTCConfigurationCommand_init_default {false, 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} #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_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} +#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, false, 0} +#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, false, openxc_ModemConfigurationCommand_init_zero, false, openxc_RTCConfigurationCommand_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_PayloadFormatCommand_init_zero {false, (openxc_PayloadFormatCommand_PayloadFormat)0} #define openxc_PredefinedObd2RequestsCommand_init_zero {false, 0} +#define openxc_NetworkOperatorSettings_init_zero {false, 0, false, (openxc_NetworkOperatorSettings_OperatorSelectMode)0, false, openxc_NetworkOperatorSettings_NetworkDescriptor_init_zero} +#define openxc_NetworkOperatorSettings_NetworkDescriptor_init_zero {false, 0, false, (openxc_NetworkOperatorSettings_NetworkDescriptor_NetworkType)0} +#define openxc_NetworkDataSettings_init_zero {{{NULL}, NULL}} +#define openxc_ServerConnectSettings_init_zero {false, "", false, 0} +#define openxc_ModemConfigurationCommand_init_zero {false, openxc_NetworkOperatorSettings_init_zero, false, openxc_NetworkDataSettings_init_zero, false, openxc_ServerConnectSettings_init_zero} +#define openxc_RTCConfigurationCommand_init_zero {false, 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} #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 {false, "", false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero} /* Field tags (for use in manual encoding/decoding) */ +#define openxc_NetworkDataSettings_APN_tag 1 #define openxc_AcceptanceFilterBypassCommand_bus_tag 1 #define openxc_AcceptanceFilterBypassCommand_bypass_tag 2 #define openxc_CanMessage_bus_tag 1 -#define openxc_CanMessage_message_id_tag 2 +#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 @@ -274,55 +345,79 @@ 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_NetworkOperatorSettings_NetworkDescriptor_PLMN_tag 1 +#define openxc_NetworkOperatorSettings_NetworkDescriptor_networkType_tag 2 #define openxc_PassthroughModeControlCommand_bus_tag 1 #define openxc_PassthroughModeControlCommand_enabled_tag 2 #define openxc_PayloadFormatCommand_format_tag 1 #define openxc_PredefinedObd2RequestsCommand_enabled_tag 1 +#define openxc_RTCConfigurationCommand_unix_time_tag 1 +#define openxc_ServerConnectSettings_host_tag 1 +#define openxc_ServerConnectSettings_port_tag 2 #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_NetworkOperatorSettings_allowDataRoaming_tag 1 +#define openxc_NetworkOperatorSettings_operatorSelectMode_tag 2 +#define openxc_NetworkOperatorSettings_networkDescriptor_tag 3 +#define openxc_SimpleMessage_name_tag 1 +#define openxc_SimpleMessage_value_tag 2 +#define openxc_SimpleMessage_event_tag 3 +#define openxc_ModemConfigurationCommand_networkOperatorSettings_tag 1 +#define openxc_ModemConfigurationCommand_networkDataSettings_tag 2 +#define openxc_ModemConfigurationCommand_serverConnectSettings_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_acceptance_filter_bypass_command_tag 4 #define openxc_ControlCommand_payload_format_command_tag 5 #define openxc_ControlCommand_predefined_obd2_requests_command_tag 6 +#define openxc_ControlCommand_modem_configuration_command_tag 7 +#define openxc_ControlCommand_rtc_configuration_command_tag 8 #define openxc_VehicleMessage_type_tag 1 #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 +#define openxc_VehicleMessage_timestamp_tag 7 /* Struct field encoding specification for nanopb */ -extern const pb_field_t openxc_VehicleMessage_fields[7]; +extern const pb_field_t openxc_VehicleMessage_fields[8]; extern const pb_field_t openxc_CanMessage_fields[5]; -extern const pb_field_t openxc_ControlCommand_fields[7]; +extern const pb_field_t openxc_ControlCommand_fields[9]; 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_PayloadFormatCommand_fields[2]; extern const pb_field_t openxc_PredefinedObd2RequestsCommand_fields[2]; +extern const pb_field_t openxc_NetworkOperatorSettings_fields[4]; +extern const pb_field_t openxc_NetworkOperatorSettings_NetworkDescriptor_fields[3]; +extern const pb_field_t openxc_NetworkDataSettings_fields[2]; +extern const pb_field_t openxc_ServerConnectSettings_fields[3]; +extern const pb_field_t openxc_ModemConfigurationCommand_fields[4]; +extern const pb_field_t openxc_RTCConfigurationCommand_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]; 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 +#define openxc_CanMessage_size 33 #define openxc_DiagnosticControlCommand_size 76 #define openxc_PassthroughModeControlCommand_size 13 #define openxc_AcceptanceFilterBypassCommand_size 13 #define openxc_PayloadFormatCommand_size 6 #define openxc_PredefinedObd2RequestsCommand_size 2 +#define openxc_NetworkOperatorSettings_size 22 +#define openxc_NetworkOperatorSettings_NetworkDescriptor_size 12 +#define openxc_ServerConnectSettings_size 137 +#define openxc_RTCConfigurationCommand_size 6 #define openxc_CommandResponse_size 139 #define openxc_DiagnosticRequest_size 68 -#define openxc_DiagnosticResponse_size 56 +#define openxc_DiagnosticResponse_size 304 #define openxc_DynamicField_size 119 +#define openxc_SimpleMessage_size 344 #ifdef __cplusplus } /* extern "C" */