From: Christopher Peplin Date: Tue, 4 Mar 2014 19:47:23 +0000 (-0500) Subject: Remove duplicate generate files. X-Git-Tag: 5.0.2~275^2~30 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=d12a24040584f3202ee9428bce56e5915954ffaf;p=apps%2Fagl-service-can-low-level.git Remove duplicate generate files. --- diff --git a/gen/openxc.pb b/gen/openxc.pb deleted file mode 100644 index e343eeb0..00000000 --- a/gen/openxc.pb +++ /dev/null @@ -1,30 +0,0 @@ - -Å - openxc.protoopenxc"Å -VehicleMessage) -type (2.openxc.VehicleMessage.Type' - raw_message ( 2.openxc.RawMessage7 -string_message ( 2.openxc.TranslatedStringMessage; -numerical_message ( 2 .openxc.TranslatedNumericMessage9 -boolean_message ( 2 .openxc.TranslatedBooleanMessage". -Type -RAW - -STRING -NUM -BOOL"; - -RawMessage -bus ( - -message_id (  -data ("6 -TranslatedStringMessage -name (  -value ( "7 -TranslatedNumericMessage -name (  -value ("7 -TranslatedBooleanMessage -name (  -value ( \ No newline at end of file diff --git a/gen/openxc.pb.c b/gen/openxc.pb.c deleted file mode 100644 index 19473b4d..00000000 --- a/gen/openxc.pb.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.2.4-dev at Tue Oct 1 16:50:34 2013. */ - -#include "openxc.pb.h" - - - -const pb_field_t openxc_VehicleMessage_fields[6] = { - PB_FIELD2( 1, ENUM , OPTIONAL, STATIC, FIRST, openxc_VehicleMessage, type, type, 0), - PB_FIELD2( 2, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, raw_message, type, &openxc_RawMessage_fields), - PB_FIELD2( 3, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, string_message, raw_message, &openxc_TranslatedStringMessage_fields), - PB_FIELD2( 4, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, numerical_message, string_message, &openxc_TranslatedNumericMessage_fields), - PB_FIELD2( 5, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, boolean_message, numerical_message, &openxc_TranslatedBooleanMessage_fields), - PB_LAST_FIELD -}; - -const pb_field_t openxc_RawMessage_fields[4] = { - PB_FIELD2( 1, INT32 , OPTIONAL, STATIC, FIRST, openxc_RawMessage, bus, bus, 0), - PB_FIELD2( 2, UINT32 , OPTIONAL, STATIC, OTHER, openxc_RawMessage, message_id, bus, 0), - PB_FIELD2( 3, SINT64 , OPTIONAL, STATIC, OTHER, openxc_RawMessage, data, message_id, 0), - PB_LAST_FIELD -}; - -const pb_field_t openxc_TranslatedStringMessage_fields[3] = { - PB_FIELD2( 1, STRING , OPTIONAL, STATIC, FIRST, openxc_TranslatedStringMessage, name, name, 0), - PB_FIELD2( 2, STRING , OPTIONAL, STATIC, OTHER, openxc_TranslatedStringMessage, value, name, 0), - PB_LAST_FIELD -}; - -const pb_field_t openxc_TranslatedNumericMessage_fields[3] = { - PB_FIELD2( 1, STRING , OPTIONAL, STATIC, FIRST, openxc_TranslatedNumericMessage, name, name, 0), - PB_FIELD2( 2, DOUBLE , OPTIONAL, STATIC, OTHER, openxc_TranslatedNumericMessage, value, name, 0), - PB_LAST_FIELD -}; - -const pb_field_t openxc_TranslatedBooleanMessage_fields[3] = { - PB_FIELD2( 1, STRING , OPTIONAL, STATIC, FIRST, openxc_TranslatedBooleanMessage, name, name, 0), - PB_FIELD2( 2, BOOL , OPTIONAL, STATIC, OTHER, openxc_TranslatedBooleanMessage, value, name, 0), - PB_LAST_FIELD -}; - - -/* Check that field information fits in pb_field_t */ -#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) -STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, string_message) < 256 && pb_membersize(openxc_VehicleMessage, numerical_message) < 256 && pb_membersize(openxc_VehicleMessage, boolean_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedStringMessage_openxc_TranslatedNumericMessage_openxc_TranslatedBooleanMessage) -#endif - -#if !defined(PB_FIELD_32BIT) -STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, string_message) < 65536 && pb_membersize(openxc_VehicleMessage, numerical_message) < 65536 && pb_membersize(openxc_VehicleMessage, boolean_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedStringMessage_openxc_TranslatedNumericMessage_openxc_TranslatedBooleanMessage) -#endif - -/* On some platforms (such as AVR), double is really float. - * These are not directly supported by nanopb, but see example_avr_double. - * To get rid of this error, remove any double fields from your .proto. - */ -STATIC_ASSERT(sizeof(double) == 8, DOUBLE_MUST_BE_8_BYTES) - diff --git a/gen/openxc.pb.h b/gen/openxc.pb.h deleted file mode 100644 index 4923dcc0..00000000 --- a/gen/openxc.pb.h +++ /dev/null @@ -1,100 +0,0 @@ -/* Automatically generated nanopb header */ -/* Generated by nanopb-0.2.4-dev at Tue Oct 1 16:50:34 2013. */ - -#ifndef _PB_OPENXC_PB_H_ -#define _PB_OPENXC_PB_H_ -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* Enum definitions */ -typedef enum _openxc_VehicleMessage_Type { - openxc_VehicleMessage_Type_RAW = 1, - openxc_VehicleMessage_Type_STRING = 2, - openxc_VehicleMessage_Type_NUM = 3, - openxc_VehicleMessage_Type_BOOL = 4 -} openxc_VehicleMessage_Type; - -/* Struct definitions */ -typedef struct _openxc_RawMessage { - bool has_bus; - int32_t bus; - bool has_message_id; - uint32_t message_id; - bool has_data; - int64_t data; -} openxc_RawMessage; - -typedef struct _openxc_TranslatedBooleanMessage { - bool has_name; - char name[100]; - bool has_value; - bool value; -} openxc_TranslatedBooleanMessage; - -typedef struct _openxc_TranslatedNumericMessage { - bool has_name; - char name[100]; - bool has_value; - double value; -} openxc_TranslatedNumericMessage; - -typedef struct _openxc_TranslatedStringMessage { - bool has_name; - char name[100]; - bool has_value; - char value[100]; -} openxc_TranslatedStringMessage; - -typedef struct _openxc_VehicleMessage { - bool has_type; - openxc_VehicleMessage_Type type; - bool has_raw_message; - openxc_RawMessage raw_message; - bool has_string_message; - openxc_TranslatedStringMessage string_message; - bool has_numerical_message; - openxc_TranslatedNumericMessage numerical_message; - bool has_boolean_message; - openxc_TranslatedBooleanMessage boolean_message; -} openxc_VehicleMessage; - -/* Default values for struct fields */ - -/* Field tags (for use in manual encoding/decoding) */ -#define openxc_RawMessage_bus_tag 1 -#define openxc_RawMessage_message_id_tag 2 -#define openxc_RawMessage_data_tag 3 -#define openxc_TranslatedBooleanMessage_name_tag 1 -#define openxc_TranslatedBooleanMessage_value_tag 2 -#define openxc_TranslatedNumericMessage_name_tag 1 -#define openxc_TranslatedNumericMessage_value_tag 2 -#define openxc_TranslatedStringMessage_name_tag 1 -#define openxc_TranslatedStringMessage_value_tag 2 -#define openxc_VehicleMessage_type_tag 1 -#define openxc_VehicleMessage_raw_message_tag 2 -#define openxc_VehicleMessage_string_message_tag 3 -#define openxc_VehicleMessage_numerical_message_tag 4 -#define openxc_VehicleMessage_boolean_message_tag 5 - -/* Struct field encoding specification for nanopb */ -extern const pb_field_t openxc_VehicleMessage_fields[6]; -extern const pb_field_t openxc_RawMessage_fields[4]; -extern const pb_field_t openxc_TranslatedStringMessage_fields[3]; -extern const pb_field_t openxc_TranslatedNumericMessage_fields[3]; -extern const pb_field_t openxc_TranslatedBooleanMessage_fields[3]; - -/* Maximum encoded size of messages (where known) */ -#define openxc_VehicleMessage_size 457 -#define openxc_RawMessage_size 23 -#define openxc_TranslatedStringMessage_size 204 -#define openxc_TranslatedNumericMessage_size 111 -#define openxc_TranslatedBooleanMessage_size 104 - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif diff --git a/gen/openxc_pb2.py b/gen/openxc_pb2.py deleted file mode 100644 index ad379eb3..00000000 --- a/gen/openxc_pb2.py +++ /dev/null @@ -1,296 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: openxc.proto - -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import descriptor_pb2 -# @@protoc_insertion_point(imports) - - - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='openxc.proto', - package='openxc', - serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\xc5\x02\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x37\n\x0estring_message\x18\x03 \x01(\x0b\x32\x1f.openxc.TranslatedStringMessage\x12;\n\x11numerical_message\x18\x04 \x01(\x0b\x32 .openxc.TranslatedNumericMessage\x12\x39\n\x0f\x62oolean_message\x18\x05 \x01(\x0b\x32 .openxc.TranslatedBooleanMessage\".\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x07\n\x03NUM\x10\x03\x12\x08\n\x04\x42OOL\x10\x04\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x12\"6\n\x17TranslatedStringMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"7\n\x18TranslatedNumericMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01\"7\n\x18TranslatedBooleanMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08') - - - -_VEHICLEMESSAGE_TYPE = _descriptor.EnumDescriptor( - name='Type', - full_name='openxc.VehicleMessage.Type', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='RAW', index=0, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='STRING', index=1, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NUM', index=2, number=3, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='BOOL', index=3, number=4, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=304, - serialized_end=350, -) - - -_VEHICLEMESSAGE = _descriptor.Descriptor( - name='VehicleMessage', - full_name='openxc.VehicleMessage', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='type', full_name='openxc.VehicleMessage.type', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=1, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='raw_message', full_name='openxc.VehicleMessage.raw_message', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='string_message', full_name='openxc.VehicleMessage.string_message', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='numerical_message', full_name='openxc.VehicleMessage.numerical_message', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='boolean_message', full_name='openxc.VehicleMessage.boolean_message', index=4, - number=5, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _VEHICLEMESSAGE_TYPE, - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=25, - serialized_end=350, -) - - -_RAWMESSAGE = _descriptor.Descriptor( - name='RawMessage', - full_name='openxc.RawMessage', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='bus', full_name='openxc.RawMessage.bus', index=0, - number=1, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='message_id', full_name='openxc.RawMessage.message_id', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='data', full_name='openxc.RawMessage.data', index=2, - number=3, type=18, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=352, - serialized_end=411, -) - - -_TRANSLATEDSTRINGMESSAGE = _descriptor.Descriptor( - name='TranslatedStringMessage', - full_name='openxc.TranslatedStringMessage', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='openxc.TranslatedStringMessage.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='value', full_name='openxc.TranslatedStringMessage.value', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=413, - serialized_end=467, -) - - -_TRANSLATEDNUMERICMESSAGE = _descriptor.Descriptor( - name='TranslatedNumericMessage', - full_name='openxc.TranslatedNumericMessage', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='openxc.TranslatedNumericMessage.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='value', full_name='openxc.TranslatedNumericMessage.value', index=1, - number=2, type=1, cpp_type=5, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=469, - serialized_end=524, -) - - -_TRANSLATEDBOOLEANMESSAGE = _descriptor.Descriptor( - name='TranslatedBooleanMessage', - full_name='openxc.TranslatedBooleanMessage', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='openxc.TranslatedBooleanMessage.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='value', full_name='openxc.TranslatedBooleanMessage.value', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=526, - serialized_end=581, -) - -_VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE -_VEHICLEMESSAGE.fields_by_name['raw_message'].message_type = _RAWMESSAGE -_VEHICLEMESSAGE.fields_by_name['string_message'].message_type = _TRANSLATEDSTRINGMESSAGE -_VEHICLEMESSAGE.fields_by_name['numerical_message'].message_type = _TRANSLATEDNUMERICMESSAGE -_VEHICLEMESSAGE.fields_by_name['boolean_message'].message_type = _TRANSLATEDBOOLEANMESSAGE -_VEHICLEMESSAGE_TYPE.containing_type = _VEHICLEMESSAGE; -DESCRIPTOR.message_types_by_name['VehicleMessage'] = _VEHICLEMESSAGE -DESCRIPTOR.message_types_by_name['RawMessage'] = _RAWMESSAGE -DESCRIPTOR.message_types_by_name['TranslatedStringMessage'] = _TRANSLATEDSTRINGMESSAGE -DESCRIPTOR.message_types_by_name['TranslatedNumericMessage'] = _TRANSLATEDNUMERICMESSAGE -DESCRIPTOR.message_types_by_name['TranslatedBooleanMessage'] = _TRANSLATEDBOOLEANMESSAGE - -class VehicleMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _VEHICLEMESSAGE - - # @@protoc_insertion_point(class_scope:openxc.VehicleMessage) - -class RawMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _RAWMESSAGE - - # @@protoc_insertion_point(class_scope:openxc.RawMessage) - -class TranslatedStringMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _TRANSLATEDSTRINGMESSAGE - - # @@protoc_insertion_point(class_scope:openxc.TranslatedStringMessage) - -class TranslatedNumericMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _TRANSLATEDNUMERICMESSAGE - - # @@protoc_insertion_point(class_scope:openxc.TranslatedNumericMessage) - -class TranslatedBooleanMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _TRANSLATEDBOOLEANMESSAGE - - # @@protoc_insertion_point(class_scope:openxc.TranslatedBooleanMessage) - - -# @@protoc_insertion_point(module_scope)