Add #if guard for .pb.h version.
The version in PB_PROTO_HEADER_VERSION can be bumped whenever there is a breaking change to the generated files, and it will then alert to the difference. Update issue 129 Status: FixedInGit
This commit is contained in:
Petteri Aimonen
@@ -361,7 +361,7 @@ class Field:
|
||||
'''Return the pb_field_t initializer to use in the constant array.
|
||||
prev_field_name is the name of the previous field or None.
|
||||
'''
|
||||
result = ' PB_FIELD2(%3d, ' % self.tag
|
||||
result = ' PB_FIELD(%3d, ' % self.tag
|
||||
result += '%-8s, ' % self.pbtype
|
||||
result += '%s, ' % self.rules
|
||||
result += '%-8s, ' % self.allocation
|
||||
@@ -782,6 +782,11 @@ def generate_header(dependencies, headername, enums, messages, extensions, optio
|
||||
yield options.genformat % (noext + options.extension + '.h')
|
||||
yield '\n'
|
||||
|
||||
yield '#if PB_PROTO_HEADER_VERSION != 30\n'
|
||||
yield '#error Regenerate this file with the current version of nanopb generator.\n'
|
||||
yield '#endif\n'
|
||||
yield '\n'
|
||||
|
||||
yield '#ifdef __cplusplus\n'
|
||||
yield 'extern "C" {\n'
|
||||
yield '#endif\n\n'
|
||||
@@ -854,6 +859,11 @@ def generate_source(headername, enums, messages, extensions, options):
|
||||
yield options.genformat % (headername)
|
||||
yield '\n'
|
||||
|
||||
yield '#if PB_PROTO_HEADER_VERSION != 30\n'
|
||||
yield '#error Regenerate this file with the current version of nanopb generator.\n'
|
||||
yield '#endif\n'
|
||||
yield '\n'
|
||||
|
||||
for msg in messages:
|
||||
yield msg.default_decl(False)
|
||||
|
||||
|
||||
18
pb.h
18
pb.h
@@ -365,6 +365,9 @@ struct pb_extension_s {
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* This is used to inform about need to regenerate .pb.h/.pb.c files. */
|
||||
#define PB_PROTO_HEADER_VERSION 30
|
||||
|
||||
/* These macros are used to declare pb_field_t's in the constant array. */
|
||||
/* Size of a structure member, in bytes. */
|
||||
#define pb_membersize(st, m) (sizeof ((st*)0)->m)
|
||||
@@ -476,25 +479,14 @@ struct pb_extension_s {
|
||||
* SINT32, SINT64, STRING, UINT32, UINT64 or EXTENSION
|
||||
* - Field rules: REQUIRED, OPTIONAL or REPEATED
|
||||
* - Allocation: STATIC or CALLBACK
|
||||
* - Placement: FIRST or OTHER, depending on if this is the first field in structure.
|
||||
* - Message name
|
||||
* - Field name
|
||||
* - Previous field name (or field name again for first field)
|
||||
* - Pointer to default value or submsg fields.
|
||||
*/
|
||||
|
||||
#define PB_FIELD(tag, type, rules, allocation, message, field, prevfield, ptr) \
|
||||
PB_ ## rules ## _ ## allocation(tag, message, field, \
|
||||
PB_DATAOFFSET_CHOOSE(message, field, prevfield), \
|
||||
PB_LTYPE_MAP_ ## type, ptr)
|
||||
|
||||
/* This is a new version of the macro used by nanopb generator from
|
||||
* version 0.2.3 onwards. It avoids the use of a ternary expression in
|
||||
* the initialization, which confused some compilers.
|
||||
*
|
||||
* - Placement: FIRST or OTHER, depending on if this is the first field in structure.
|
||||
*
|
||||
*/
|
||||
#define PB_FIELD2(tag, type, rules, allocation, placement, message, field, prevfield, ptr) \
|
||||
#define PB_FIELD(tag, type, rules, allocation, placement, message, field, prevfield, ptr) \
|
||||
PB_ ## rules ## _ ## allocation(tag, message, field, \
|
||||
PB_DATAOFFSET_ ## placement(message, field, prevfield), \
|
||||
PB_LTYPE_MAP_ ## type, ptr)
|
||||
|
||||
@@ -1,27 +1,37 @@
|
||||
/* Automatically generated nanopb constant definitions */
|
||||
/* Generated by 0.2.0-dev at Sun Feb 17 00:09:53 2013. */
|
||||
/* This is a file generated using nanopb-0.2.0-dev.
|
||||
* It is used as a part of test suite in order to detect any
|
||||
* incompatible changes made to the generator in future versions.
|
||||
*/
|
||||
/* Generated by nanopb-0.3.0-dev at Tue Aug 19 17:53:24 2014. */
|
||||
|
||||
#include "alltypes_legacy.h"
|
||||
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
#endif
|
||||
|
||||
const char SubMessage_substuff1_default[16] = "1";
|
||||
const int32_t SubMessage_substuff2_default = 2;
|
||||
const uint32_t SubMessage_substuff3_default = 3;
|
||||
const uint32_t SubMessage_substuff3_default = 3u;
|
||||
const int32_t Limits_int32_min_default = 2147483647;
|
||||
const int32_t Limits_int32_max_default = -2147483647;
|
||||
const uint32_t Limits_uint32_min_default = 4294967295u;
|
||||
const uint32_t Limits_uint32_max_default = 0u;
|
||||
const int64_t Limits_int64_min_default = 9223372036854775807ll;
|
||||
const int64_t Limits_int64_max_default = -9223372036854775807ll;
|
||||
const uint64_t Limits_uint64_min_default = 18446744073709551615ull;
|
||||
const uint64_t Limits_uint64_max_default = 0ull;
|
||||
const HugeEnum Limits_enum_min_default = HugeEnum_Positive;
|
||||
const HugeEnum Limits_enum_max_default = HugeEnum_Negative;
|
||||
const int32_t AllTypes_opt_int32_default = 4041;
|
||||
const int64_t AllTypes_opt_int64_default = 4042;
|
||||
const uint32_t AllTypes_opt_uint32_default = 4043;
|
||||
const uint64_t AllTypes_opt_uint64_default = 4044;
|
||||
const int64_t AllTypes_opt_int64_default = 4042ll;
|
||||
const uint32_t AllTypes_opt_uint32_default = 4043u;
|
||||
const uint64_t AllTypes_opt_uint64_default = 4044ull;
|
||||
const int32_t AllTypes_opt_sint32_default = 4045;
|
||||
const int64_t AllTypes_opt_sint64_default = 4046;
|
||||
const bool AllTypes_opt_bool_default = false;
|
||||
const uint32_t AllTypes_opt_fixed32_default = 4048;
|
||||
const uint32_t AllTypes_opt_fixed32_default = 4048u;
|
||||
const int32_t AllTypes_opt_sfixed32_default = 4049;
|
||||
const float AllTypes_opt_float_default = 4050;
|
||||
const uint64_t AllTypes_opt_fixed64_default = 4051;
|
||||
const int64_t AllTypes_opt_sfixed64_default = 4052;
|
||||
const uint64_t AllTypes_opt_fixed64_default = 4051ull;
|
||||
const int64_t AllTypes_opt_sfixed64_default = 4052ll;
|
||||
const double AllTypes_opt_double_default = 4053;
|
||||
const char AllTypes_opt_string_default[16] = "4054";
|
||||
const AllTypes_opt_bytes_t AllTypes_opt_bytes_default = {4, {0x34,0x30,0x35,0x35}};
|
||||
@@ -29,65 +39,115 @@ const MyEnum AllTypes_opt_enum_default = MyEnum_Second;
|
||||
|
||||
|
||||
const pb_field_t SubMessage_fields[4] = {
|
||||
PB_FIELD( 1, STRING , REQUIRED, STATIC, SubMessage, substuff1, substuff1, &SubMessage_substuff1_default),
|
||||
PB_FIELD( 2, INT32 , REQUIRED, STATIC, SubMessage, substuff2, substuff1, &SubMessage_substuff2_default),
|
||||
PB_FIELD( 3, FIXED32 , OPTIONAL, STATIC, SubMessage, substuff3, substuff2, &SubMessage_substuff3_default),
|
||||
PB_FIELD( 1, STRING , REQUIRED, STATIC , FIRST, SubMessage, substuff1, substuff1, &SubMessage_substuff1_default),
|
||||
PB_FIELD( 2, INT32 , REQUIRED, STATIC , OTHER, SubMessage, substuff2, substuff1, &SubMessage_substuff2_default),
|
||||
PB_FIELD( 3, FIXED32 , OPTIONAL, STATIC , OTHER, SubMessage, substuff3, substuff2, &SubMessage_substuff3_default),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
const pb_field_t AllTypes_fields[53] = {
|
||||
PB_FIELD( 1, INT32 , REQUIRED, STATIC, AllTypes, req_int32, req_int32, 0),
|
||||
PB_FIELD( 2, INT64 , REQUIRED, STATIC, AllTypes, req_int64, req_int32, 0),
|
||||
PB_FIELD( 3, UINT32 , REQUIRED, STATIC, AllTypes, req_uint32, req_int64, 0),
|
||||
PB_FIELD( 4, UINT64 , REQUIRED, STATIC, AllTypes, req_uint64, req_uint32, 0),
|
||||
PB_FIELD( 5, SINT32 , REQUIRED, STATIC, AllTypes, req_sint32, req_uint64, 0),
|
||||
PB_FIELD( 6, SINT64 , REQUIRED, STATIC, AllTypes, req_sint64, req_sint32, 0),
|
||||
PB_FIELD( 7, BOOL , REQUIRED, STATIC, AllTypes, req_bool, req_sint64, 0),
|
||||
PB_FIELD( 8, FIXED32 , REQUIRED, STATIC, AllTypes, req_fixed32, req_bool, 0),
|
||||
PB_FIELD( 9, SFIXED32, REQUIRED, STATIC, AllTypes, req_sfixed32, req_fixed32, 0),
|
||||
PB_FIELD( 10, FLOAT , REQUIRED, STATIC, AllTypes, req_float, req_sfixed32, 0),
|
||||
PB_FIELD( 11, FIXED64 , REQUIRED, STATIC, AllTypes, req_fixed64, req_float, 0),
|
||||
PB_FIELD( 12, SFIXED64, REQUIRED, STATIC, AllTypes, req_sfixed64, req_fixed64, 0),
|
||||
PB_FIELD( 13, DOUBLE , REQUIRED, STATIC, AllTypes, req_double, req_sfixed64, 0),
|
||||
PB_FIELD( 14, STRING , REQUIRED, STATIC, AllTypes, req_string, req_double, 0),
|
||||
PB_FIELD( 15, BYTES , REQUIRED, STATIC, AllTypes, req_bytes, req_string, 0),
|
||||
PB_FIELD( 16, MESSAGE , REQUIRED, STATIC, AllTypes, req_submsg, req_bytes, &SubMessage_fields),
|
||||
PB_FIELD( 17, ENUM , REQUIRED, STATIC, AllTypes, req_enum, req_submsg, 0),
|
||||
PB_FIELD( 21, INT32 , REPEATED, STATIC, AllTypes, rep_int32, req_enum, 0),
|
||||
PB_FIELD( 22, INT64 , REPEATED, STATIC, AllTypes, rep_int64, rep_int32, 0),
|
||||
PB_FIELD( 23, UINT32 , REPEATED, STATIC, AllTypes, rep_uint32, rep_int64, 0),
|
||||
PB_FIELD( 24, UINT64 , REPEATED, STATIC, AllTypes, rep_uint64, rep_uint32, 0),
|
||||
PB_FIELD( 25, SINT32 , REPEATED, STATIC, AllTypes, rep_sint32, rep_uint64, 0),
|
||||
PB_FIELD( 26, SINT64 , REPEATED, STATIC, AllTypes, rep_sint64, rep_sint32, 0),
|
||||
PB_FIELD( 27, BOOL , REPEATED, STATIC, AllTypes, rep_bool, rep_sint64, 0),
|
||||
PB_FIELD( 28, FIXED32 , REPEATED, STATIC, AllTypes, rep_fixed32, rep_bool, 0),
|
||||
PB_FIELD( 29, SFIXED32, REPEATED, STATIC, AllTypes, rep_sfixed32, rep_fixed32, 0),
|
||||
PB_FIELD( 30, FLOAT , REPEATED, STATIC, AllTypes, rep_float, rep_sfixed32, 0),
|
||||
PB_FIELD( 31, FIXED64 , REPEATED, STATIC, AllTypes, rep_fixed64, rep_float, 0),
|
||||
PB_FIELD( 32, SFIXED64, REPEATED, STATIC, AllTypes, rep_sfixed64, rep_fixed64, 0),
|
||||
PB_FIELD( 33, DOUBLE , REPEATED, STATIC, AllTypes, rep_double, rep_sfixed64, 0),
|
||||
PB_FIELD( 34, STRING , REPEATED, STATIC, AllTypes, rep_string, rep_double, 0),
|
||||
PB_FIELD( 35, BYTES , REPEATED, STATIC, AllTypes, rep_bytes, rep_string, 0),
|
||||
PB_FIELD( 36, MESSAGE , REPEATED, STATIC, AllTypes, rep_submsg, rep_bytes, &SubMessage_fields),
|
||||
PB_FIELD( 37, ENUM , REPEATED, STATIC, AllTypes, rep_enum, rep_submsg, 0),
|
||||
PB_FIELD( 41, INT32 , OPTIONAL, STATIC, AllTypes, opt_int32, rep_enum, &AllTypes_opt_int32_default),
|
||||
PB_FIELD( 42, INT64 , OPTIONAL, STATIC, AllTypes, opt_int64, opt_int32, &AllTypes_opt_int64_default),
|
||||
PB_FIELD( 43, UINT32 , OPTIONAL, STATIC, AllTypes, opt_uint32, opt_int64, &AllTypes_opt_uint32_default),
|
||||
PB_FIELD( 44, UINT64 , OPTIONAL, STATIC, AllTypes, opt_uint64, opt_uint32, &AllTypes_opt_uint64_default),
|
||||
PB_FIELD( 45, SINT32 , OPTIONAL, STATIC, AllTypes, opt_sint32, opt_uint64, &AllTypes_opt_sint32_default),
|
||||
PB_FIELD( 46, SINT64 , OPTIONAL, STATIC, AllTypes, opt_sint64, opt_sint32, &AllTypes_opt_sint64_default),
|
||||
PB_FIELD( 47, BOOL , OPTIONAL, STATIC, AllTypes, opt_bool, opt_sint64, &AllTypes_opt_bool_default),
|
||||
PB_FIELD( 48, FIXED32 , OPTIONAL, STATIC, AllTypes, opt_fixed32, opt_bool, &AllTypes_opt_fixed32_default),
|
||||
PB_FIELD( 49, SFIXED32, OPTIONAL, STATIC, AllTypes, opt_sfixed32, opt_fixed32, &AllTypes_opt_sfixed32_default),
|
||||
PB_FIELD( 50, FLOAT , OPTIONAL, STATIC, AllTypes, opt_float, opt_sfixed32, &AllTypes_opt_float_default),
|
||||
PB_FIELD( 51, FIXED64 , OPTIONAL, STATIC, AllTypes, opt_fixed64, opt_float, &AllTypes_opt_fixed64_default),
|
||||
PB_FIELD( 52, SFIXED64, OPTIONAL, STATIC, AllTypes, opt_sfixed64, opt_fixed64, &AllTypes_opt_sfixed64_default),
|
||||
PB_FIELD( 53, DOUBLE , OPTIONAL, STATIC, AllTypes, opt_double, opt_sfixed64, &AllTypes_opt_double_default),
|
||||
PB_FIELD( 54, STRING , OPTIONAL, STATIC, AllTypes, opt_string, opt_double, &AllTypes_opt_string_default),
|
||||
PB_FIELD( 55, BYTES , OPTIONAL, STATIC, AllTypes, opt_bytes, opt_string, &AllTypes_opt_bytes_default),
|
||||
PB_FIELD( 56, MESSAGE , OPTIONAL, STATIC, AllTypes, opt_submsg, opt_bytes, &SubMessage_fields),
|
||||
PB_FIELD( 57, ENUM , OPTIONAL, STATIC, AllTypes, opt_enum, opt_submsg, &AllTypes_opt_enum_default),
|
||||
PB_FIELD( 99, INT32 , REQUIRED, STATIC, AllTypes, end, opt_enum, 0),
|
||||
const pb_field_t EmptyMessage_fields[1] = {
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
const pb_field_t Limits_fields[11] = {
|
||||
PB_FIELD( 1, INT32 , REQUIRED, STATIC , FIRST, Limits, int32_min, int32_min, &Limits_int32_min_default),
|
||||
PB_FIELD( 2, INT32 , REQUIRED, STATIC , OTHER, Limits, int32_max, int32_min, &Limits_int32_max_default),
|
||||
PB_FIELD( 3, UINT32 , REQUIRED, STATIC , OTHER, Limits, uint32_min, int32_max, &Limits_uint32_min_default),
|
||||
PB_FIELD( 4, UINT32 , REQUIRED, STATIC , OTHER, Limits, uint32_max, uint32_min, &Limits_uint32_max_default),
|
||||
PB_FIELD( 5, INT64 , REQUIRED, STATIC , OTHER, Limits, int64_min, uint32_max, &Limits_int64_min_default),
|
||||
PB_FIELD( 6, INT64 , REQUIRED, STATIC , OTHER, Limits, int64_max, int64_min, &Limits_int64_max_default),
|
||||
PB_FIELD( 7, UINT64 , REQUIRED, STATIC , OTHER, Limits, uint64_min, int64_max, &Limits_uint64_min_default),
|
||||
PB_FIELD( 8, UINT64 , REQUIRED, STATIC , OTHER, Limits, uint64_max, uint64_min, &Limits_uint64_max_default),
|
||||
PB_FIELD( 9, ENUM , REQUIRED, STATIC , OTHER, Limits, enum_min, uint64_max, &Limits_enum_min_default),
|
||||
PB_FIELD( 10, ENUM , REQUIRED, STATIC , OTHER, Limits, enum_max, enum_min, &Limits_enum_max_default),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
const pb_field_t AllTypes_fields[54] = {
|
||||
PB_FIELD( 1, INT32 , REQUIRED, STATIC , FIRST, AllTypes, req_int32, req_int32, 0),
|
||||
PB_FIELD( 2, INT64 , REQUIRED, STATIC , OTHER, AllTypes, req_int64, req_int32, 0),
|
||||
PB_FIELD( 3, UINT32 , REQUIRED, STATIC , OTHER, AllTypes, req_uint32, req_int64, 0),
|
||||
PB_FIELD( 4, UINT64 , REQUIRED, STATIC , OTHER, AllTypes, req_uint64, req_uint32, 0),
|
||||
PB_FIELD( 5, SINT32 , REQUIRED, STATIC , OTHER, AllTypes, req_sint32, req_uint64, 0),
|
||||
PB_FIELD( 6, SINT64 , REQUIRED, STATIC , OTHER, AllTypes, req_sint64, req_sint32, 0),
|
||||
PB_FIELD( 7, BOOL , REQUIRED, STATIC , OTHER, AllTypes, req_bool, req_sint64, 0),
|
||||
PB_FIELD( 8, FIXED32 , REQUIRED, STATIC , OTHER, AllTypes, req_fixed32, req_bool, 0),
|
||||
PB_FIELD( 9, SFIXED32, REQUIRED, STATIC , OTHER, AllTypes, req_sfixed32, req_fixed32, 0),
|
||||
PB_FIELD( 10, FLOAT , REQUIRED, STATIC , OTHER, AllTypes, req_float, req_sfixed32, 0),
|
||||
PB_FIELD( 11, FIXED64 , REQUIRED, STATIC , OTHER, AllTypes, req_fixed64, req_float, 0),
|
||||
PB_FIELD( 12, SFIXED64, REQUIRED, STATIC , OTHER, AllTypes, req_sfixed64, req_fixed64, 0),
|
||||
PB_FIELD( 13, DOUBLE , REQUIRED, STATIC , OTHER, AllTypes, req_double, req_sfixed64, 0),
|
||||
PB_FIELD( 14, STRING , REQUIRED, STATIC , OTHER, AllTypes, req_string, req_double, 0),
|
||||
PB_FIELD( 15, BYTES , REQUIRED, STATIC , OTHER, AllTypes, req_bytes, req_string, 0),
|
||||
PB_FIELD( 16, MESSAGE , REQUIRED, STATIC , OTHER, AllTypes, req_submsg, req_bytes, &SubMessage_fields),
|
||||
PB_FIELD( 17, ENUM , REQUIRED, STATIC , OTHER, AllTypes, req_enum, req_submsg, 0),
|
||||
PB_FIELD( 21, INT32 , REPEATED, STATIC , OTHER, AllTypes, rep_int32, req_enum, 0),
|
||||
PB_FIELD( 22, INT64 , REPEATED, STATIC , OTHER, AllTypes, rep_int64, rep_int32, 0),
|
||||
PB_FIELD( 23, UINT32 , REPEATED, STATIC , OTHER, AllTypes, rep_uint32, rep_int64, 0),
|
||||
PB_FIELD( 24, UINT64 , REPEATED, STATIC , OTHER, AllTypes, rep_uint64, rep_uint32, 0),
|
||||
PB_FIELD( 25, SINT32 , REPEATED, STATIC , OTHER, AllTypes, rep_sint32, rep_uint64, 0),
|
||||
PB_FIELD( 26, SINT64 , REPEATED, STATIC , OTHER, AllTypes, rep_sint64, rep_sint32, 0),
|
||||
PB_FIELD( 27, BOOL , REPEATED, STATIC , OTHER, AllTypes, rep_bool, rep_sint64, 0),
|
||||
PB_FIELD( 28, FIXED32 , REPEATED, STATIC , OTHER, AllTypes, rep_fixed32, rep_bool, 0),
|
||||
PB_FIELD( 29, SFIXED32, REPEATED, STATIC , OTHER, AllTypes, rep_sfixed32, rep_fixed32, 0),
|
||||
PB_FIELD( 30, FLOAT , REPEATED, STATIC , OTHER, AllTypes, rep_float, rep_sfixed32, 0),
|
||||
PB_FIELD( 31, FIXED64 , REPEATED, STATIC , OTHER, AllTypes, rep_fixed64, rep_float, 0),
|
||||
PB_FIELD( 32, SFIXED64, REPEATED, STATIC , OTHER, AllTypes, rep_sfixed64, rep_fixed64, 0),
|
||||
PB_FIELD( 33, DOUBLE , REPEATED, STATIC , OTHER, AllTypes, rep_double, rep_sfixed64, 0),
|
||||
PB_FIELD( 34, STRING , REPEATED, STATIC , OTHER, AllTypes, rep_string, rep_double, 0),
|
||||
PB_FIELD( 35, BYTES , REPEATED, STATIC , OTHER, AllTypes, rep_bytes, rep_string, 0),
|
||||
PB_FIELD( 36, MESSAGE , REPEATED, STATIC , OTHER, AllTypes, rep_submsg, rep_bytes, &SubMessage_fields),
|
||||
PB_FIELD( 37, ENUM , REPEATED, STATIC , OTHER, AllTypes, rep_enum, rep_submsg, 0),
|
||||
PB_FIELD( 41, INT32 , OPTIONAL, STATIC , OTHER, AllTypes, opt_int32, rep_enum, &AllTypes_opt_int32_default),
|
||||
PB_FIELD( 42, INT64 , OPTIONAL, STATIC , OTHER, AllTypes, opt_int64, opt_int32, &AllTypes_opt_int64_default),
|
||||
PB_FIELD( 43, UINT32 , OPTIONAL, STATIC , OTHER, AllTypes, opt_uint32, opt_int64, &AllTypes_opt_uint32_default),
|
||||
PB_FIELD( 44, UINT64 , OPTIONAL, STATIC , OTHER, AllTypes, opt_uint64, opt_uint32, &AllTypes_opt_uint64_default),
|
||||
PB_FIELD( 45, SINT32 , OPTIONAL, STATIC , OTHER, AllTypes, opt_sint32, opt_uint64, &AllTypes_opt_sint32_default),
|
||||
PB_FIELD( 46, SINT64 , OPTIONAL, STATIC , OTHER, AllTypes, opt_sint64, opt_sint32, &AllTypes_opt_sint64_default),
|
||||
PB_FIELD( 47, BOOL , OPTIONAL, STATIC , OTHER, AllTypes, opt_bool, opt_sint64, &AllTypes_opt_bool_default),
|
||||
PB_FIELD( 48, FIXED32 , OPTIONAL, STATIC , OTHER, AllTypes, opt_fixed32, opt_bool, &AllTypes_opt_fixed32_default),
|
||||
PB_FIELD( 49, SFIXED32, OPTIONAL, STATIC , OTHER, AllTypes, opt_sfixed32, opt_fixed32, &AllTypes_opt_sfixed32_default),
|
||||
PB_FIELD( 50, FLOAT , OPTIONAL, STATIC , OTHER, AllTypes, opt_float, opt_sfixed32, &AllTypes_opt_float_default),
|
||||
PB_FIELD( 51, FIXED64 , OPTIONAL, STATIC , OTHER, AllTypes, opt_fixed64, opt_float, &AllTypes_opt_fixed64_default),
|
||||
PB_FIELD( 52, SFIXED64, OPTIONAL, STATIC , OTHER, AllTypes, opt_sfixed64, opt_fixed64, &AllTypes_opt_sfixed64_default),
|
||||
PB_FIELD( 53, DOUBLE , OPTIONAL, STATIC , OTHER, AllTypes, opt_double, opt_sfixed64, &AllTypes_opt_double_default),
|
||||
PB_FIELD( 54, STRING , OPTIONAL, STATIC , OTHER, AllTypes, opt_string, opt_double, &AllTypes_opt_string_default),
|
||||
PB_FIELD( 55, BYTES , OPTIONAL, STATIC , OTHER, AllTypes, opt_bytes, opt_string, &AllTypes_opt_bytes_default),
|
||||
PB_FIELD( 56, MESSAGE , OPTIONAL, STATIC , OTHER, AllTypes, opt_submsg, opt_bytes, &SubMessage_fields),
|
||||
PB_FIELD( 57, ENUM , OPTIONAL, STATIC , OTHER, AllTypes, opt_enum, opt_submsg, &AllTypes_opt_enum_default),
|
||||
PB_FIELD( 99, INT32 , REQUIRED, STATIC , OTHER, AllTypes, end, opt_enum, 0),
|
||||
PB_FIELD(200, EXTENSION, OPTIONAL, CALLBACK, OTHER, AllTypes, extensions, end, 0),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
|
||||
/* Check that field information fits in pb_field_t */
|
||||
#if !defined(PB_FIELD_32BIT)
|
||||
/* If you get an error here, it means that you need to define PB_FIELD_32BIT
|
||||
* compile-time option. You can do that in pb.h or on compiler command line.
|
||||
*
|
||||
* The reason you need to do this is that some of your messages contain tag
|
||||
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
|
||||
* field descriptors.
|
||||
*/
|
||||
PB_STATIC_ASSERT((pb_membersize(AllTypes, req_submsg) < 65536 && pb_membersize(AllTypes, rep_submsg[0]) < 65536 && pb_membersize(AllTypes, opt_submsg) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_SubMessage_EmptyMessage_Limits_AllTypes)
|
||||
#endif
|
||||
|
||||
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
|
||||
/* If you get an error here, it means that you need to define PB_FIELD_16BIT
|
||||
* compile-time option. You can do that in pb.h or on compiler command line.
|
||||
*
|
||||
* The reason you need to do this is that some of your messages contain tag
|
||||
* numbers or field sizes that are larger than what can fit in the default
|
||||
* 8 bit descriptors.
|
||||
*/
|
||||
PB_STATIC_ASSERT((pb_membersize(AllTypes, req_submsg) < 256 && pb_membersize(AllTypes, rep_submsg[0]) < 256 && pb_membersize(AllTypes, opt_submsg) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_SubMessage_EmptyMessage_Limits_AllTypes)
|
||||
#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.
|
||||
*/
|
||||
PB_STATIC_ASSERT(sizeof(double) == 8, DOUBLE_MUST_BE_8_BYTES)
|
||||
|
||||
|
||||
@@ -1,18 +1,24 @@
|
||||
/* Automatically generated nanopb header */
|
||||
/* This is a file generated using nanopb-0.2.0-dev.
|
||||
* It is used as a part of test suite in order to detect any
|
||||
* incompatible changes made to the generator in future versions.
|
||||
*/
|
||||
/* Generated by nanopb-0.3.0-dev at Tue Aug 19 17:53:24 2014. */
|
||||
|
||||
#ifndef _PB_ALLTYPES_PB_H_
|
||||
#define _PB_ALLTYPES_PB_H_
|
||||
#ifndef PB_ALLTYPES_LEGACY_H_INCLUDED
|
||||
#define PB_ALLTYPES_LEGACY_H_INCLUDED
|
||||
#include <pb.h>
|
||||
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Enum definitions */
|
||||
typedef enum _HugeEnum {
|
||||
HugeEnum_Negative = -2147483647,
|
||||
HugeEnum_Positive = 2147483647
|
||||
} HugeEnum;
|
||||
|
||||
typedef enum _MyEnum {
|
||||
MyEnum_Zero = 0,
|
||||
MyEnum_First = 1,
|
||||
@@ -21,6 +27,23 @@ typedef enum _MyEnum {
|
||||
} MyEnum;
|
||||
|
||||
/* Struct definitions */
|
||||
typedef struct _EmptyMessage {
|
||||
uint8_t dummy_field;
|
||||
} EmptyMessage;
|
||||
|
||||
typedef struct _Limits {
|
||||
int32_t int32_min;
|
||||
int32_t int32_max;
|
||||
uint32_t uint32_min;
|
||||
uint32_t uint32_max;
|
||||
int64_t int64_min;
|
||||
int64_t int64_max;
|
||||
uint64_t uint64_min;
|
||||
uint64_t uint64_max;
|
||||
HugeEnum enum_min;
|
||||
HugeEnum enum_max;
|
||||
} Limits;
|
||||
|
||||
typedef struct _SubMessage {
|
||||
char substuff1[16];
|
||||
int32_t substuff2;
|
||||
@@ -28,20 +51,11 @@ typedef struct _SubMessage {
|
||||
uint32_t substuff3;
|
||||
} SubMessage;
|
||||
|
||||
typedef struct {
|
||||
pb_size_t size;
|
||||
uint8_t bytes[16];
|
||||
} AllTypes_req_bytes_t;
|
||||
typedef PB_BYTES_ARRAY_T(16) AllTypes_req_bytes_t;
|
||||
|
||||
typedef struct {
|
||||
pb_size_t size;
|
||||
uint8_t bytes[16];
|
||||
} AllTypes_rep_bytes_t;
|
||||
typedef PB_BYTES_ARRAY_T(16) AllTypes_rep_bytes_t;
|
||||
|
||||
typedef struct {
|
||||
pb_size_t size;
|
||||
uint8_t bytes[16];
|
||||
} AllTypes_opt_bytes_t;
|
||||
typedef PB_BYTES_ARRAY_T(16) AllTypes_opt_bytes_t;
|
||||
|
||||
typedef struct _AllTypes {
|
||||
int32_t req_int32;
|
||||
@@ -130,12 +144,23 @@ typedef struct _AllTypes {
|
||||
bool has_opt_enum;
|
||||
MyEnum opt_enum;
|
||||
int32_t end;
|
||||
pb_extension_t *extensions;
|
||||
} AllTypes;
|
||||
|
||||
/* Default values for struct fields */
|
||||
extern const char SubMessage_substuff1_default[16];
|
||||
extern const int32_t SubMessage_substuff2_default;
|
||||
extern const uint32_t SubMessage_substuff3_default;
|
||||
extern const int32_t Limits_int32_min_default;
|
||||
extern const int32_t Limits_int32_max_default;
|
||||
extern const uint32_t Limits_uint32_min_default;
|
||||
extern const uint32_t Limits_uint32_max_default;
|
||||
extern const int64_t Limits_int64_min_default;
|
||||
extern const int64_t Limits_int64_max_default;
|
||||
extern const uint64_t Limits_uint64_min_default;
|
||||
extern const uint64_t Limits_uint64_max_default;
|
||||
extern const HugeEnum Limits_enum_min_default;
|
||||
extern const HugeEnum Limits_enum_max_default;
|
||||
extern const int32_t AllTypes_opt_int32_default;
|
||||
extern const int64_t AllTypes_opt_int64_default;
|
||||
extern const uint32_t AllTypes_opt_uint32_default;
|
||||
@@ -153,23 +178,94 @@ extern const char AllTypes_opt_string_default[16];
|
||||
extern const AllTypes_opt_bytes_t AllTypes_opt_bytes_default;
|
||||
extern const MyEnum AllTypes_opt_enum_default;
|
||||
|
||||
/* Initializer values for message structs */
|
||||
#define SubMessage_init_default {"1", 2, false, 3u}
|
||||
#define EmptyMessage_init_default {0}
|
||||
#define Limits_init_default {2147483647, -2147483647, 4294967295u, 0u, 9223372036854775807ll, -9223372036854775807ll, 18446744073709551615ull, 0ull, HugeEnum_Positive, HugeEnum_Negative}
|
||||
#define AllTypes_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", {0, {0}}, SubMessage_init_default, (MyEnum)0, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {"", "", "", "", ""}, 0, {{0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}}, 0, {SubMessage_init_default, SubMessage_init_default, SubMessage_init_default, SubMessage_init_default, SubMessage_init_default}, 0, {(MyEnum)0, (MyEnum)0, (MyEnum)0, (MyEnum)0, (MyEnum)0}, false, 4041, false, 4042ll, false, 4043u, false, 4044ull, false, 4045, false, 4046, false, false, false, 4048u, false, 4049, false, 4050, false, 4051ull, false, 4052ll, false, 4053, false, "4054", false, {4, {0x34,0x30,0x35,0x35}}, false, SubMessage_init_default, false, MyEnum_Second, 0, NULL}
|
||||
#define SubMessage_init_zero {"", 0, false, 0}
|
||||
#define EmptyMessage_init_zero {0}
|
||||
#define Limits_init_zero {0, 0, 0, 0, 0, 0, 0, 0, (HugeEnum)0, (HugeEnum)0}
|
||||
#define AllTypes_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", {0, {0}}, SubMessage_init_zero, (MyEnum)0, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0}, 0, {"", "", "", "", ""}, 0, {{0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}}, 0, {SubMessage_init_zero, SubMessage_init_zero, SubMessage_init_zero, SubMessage_init_zero, SubMessage_init_zero}, 0, {(MyEnum)0, (MyEnum)0, (MyEnum)0, (MyEnum)0, (MyEnum)0}, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, "", false, {0, {0}}, false, SubMessage_init_zero, false, (MyEnum)0, 0, NULL}
|
||||
|
||||
/* Field tags (for use in manual encoding/decoding) */
|
||||
#define Limits_int32_min_tag 1
|
||||
#define Limits_int32_max_tag 2
|
||||
#define Limits_uint32_min_tag 3
|
||||
#define Limits_uint32_max_tag 4
|
||||
#define Limits_int64_min_tag 5
|
||||
#define Limits_int64_max_tag 6
|
||||
#define Limits_uint64_min_tag 7
|
||||
#define Limits_uint64_max_tag 8
|
||||
#define Limits_enum_min_tag 9
|
||||
#define Limits_enum_max_tag 10
|
||||
#define SubMessage_substuff1_tag 1
|
||||
#define SubMessage_substuff2_tag 2
|
||||
#define SubMessage_substuff3_tag 3
|
||||
#define AllTypes_req_int32_tag 1
|
||||
#define AllTypes_req_int64_tag 2
|
||||
#define AllTypes_req_uint32_tag 3
|
||||
#define AllTypes_req_uint64_tag 4
|
||||
#define AllTypes_req_sint32_tag 5
|
||||
#define AllTypes_req_sint64_tag 6
|
||||
#define AllTypes_req_bool_tag 7
|
||||
#define AllTypes_req_fixed32_tag 8
|
||||
#define AllTypes_req_sfixed32_tag 9
|
||||
#define AllTypes_req_float_tag 10
|
||||
#define AllTypes_req_fixed64_tag 11
|
||||
#define AllTypes_req_sfixed64_tag 12
|
||||
#define AllTypes_req_double_tag 13
|
||||
#define AllTypes_req_string_tag 14
|
||||
#define AllTypes_req_bytes_tag 15
|
||||
#define AllTypes_req_submsg_tag 16
|
||||
#define AllTypes_req_enum_tag 17
|
||||
#define AllTypes_rep_int32_tag 21
|
||||
#define AllTypes_rep_int64_tag 22
|
||||
#define AllTypes_rep_uint32_tag 23
|
||||
#define AllTypes_rep_uint64_tag 24
|
||||
#define AllTypes_rep_sint32_tag 25
|
||||
#define AllTypes_rep_sint64_tag 26
|
||||
#define AllTypes_rep_bool_tag 27
|
||||
#define AllTypes_rep_fixed32_tag 28
|
||||
#define AllTypes_rep_sfixed32_tag 29
|
||||
#define AllTypes_rep_float_tag 30
|
||||
#define AllTypes_rep_fixed64_tag 31
|
||||
#define AllTypes_rep_sfixed64_tag 32
|
||||
#define AllTypes_rep_double_tag 33
|
||||
#define AllTypes_rep_string_tag 34
|
||||
#define AllTypes_rep_bytes_tag 35
|
||||
#define AllTypes_rep_submsg_tag 36
|
||||
#define AllTypes_rep_enum_tag 37
|
||||
#define AllTypes_opt_int32_tag 41
|
||||
#define AllTypes_opt_int64_tag 42
|
||||
#define AllTypes_opt_uint32_tag 43
|
||||
#define AllTypes_opt_uint64_tag 44
|
||||
#define AllTypes_opt_sint32_tag 45
|
||||
#define AllTypes_opt_sint64_tag 46
|
||||
#define AllTypes_opt_bool_tag 47
|
||||
#define AllTypes_opt_fixed32_tag 48
|
||||
#define AllTypes_opt_sfixed32_tag 49
|
||||
#define AllTypes_opt_float_tag 50
|
||||
#define AllTypes_opt_fixed64_tag 51
|
||||
#define AllTypes_opt_sfixed64_tag 52
|
||||
#define AllTypes_opt_double_tag 53
|
||||
#define AllTypes_opt_string_tag 54
|
||||
#define AllTypes_opt_bytes_tag 55
|
||||
#define AllTypes_opt_submsg_tag 56
|
||||
#define AllTypes_opt_enum_tag 57
|
||||
#define AllTypes_end_tag 99
|
||||
|
||||
/* Struct field encoding specification for nanopb */
|
||||
extern const pb_field_t SubMessage_fields[4];
|
||||
extern const pb_field_t AllTypes_fields[53];
|
||||
extern const pb_field_t EmptyMessage_fields[1];
|
||||
extern const pb_field_t Limits_fields[11];
|
||||
extern const pb_field_t AllTypes_fields[54];
|
||||
|
||||
/* Check that field information fits in pb_field_t */
|
||||
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
|
||||
PB_STATIC_ASSERT((pb_membersize(AllTypes, req_submsg) < 256 && pb_membersize(AllTypes, rep_submsg[0]) < 256 && pb_membersize(AllTypes, opt_submsg) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_SubMessage_AllTypes)
|
||||
#endif
|
||||
|
||||
#if !defined(PB_FIELD_32BIT)
|
||||
PB_STATIC_ASSERT((pb_membersize(AllTypes, req_submsg) < 65536 && pb_membersize(AllTypes, rep_submsg[0]) < 65536 && pb_membersize(AllTypes, opt_submsg) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_SubMessage_AllTypes)
|
||||
#endif
|
||||
|
||||
/* On some platforms (such as AVR), double is really float.
|
||||
* These are not directly supported by nanopb, but see example_avr_double.
|
||||
*/
|
||||
PB_STATIC_ASSERT(sizeof(double) == 8, DOUBLE_MUST_BE_8_BYTES)
|
||||
/* Maximum encoded size of messages (where known) */
|
||||
#define SubMessage_size 34
|
||||
#define EmptyMessage_size 0
|
||||
#define Limits_size 90
|
||||
#define AllTypes_size 1362
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
|
||||
3
tests/backwards_compatibility/alltypes_legacy.options
Normal file
3
tests/backwards_compatibility/alltypes_legacy.options
Normal file
@@ -0,0 +1,3 @@
|
||||
* max_size:16
|
||||
* max_count:5
|
||||
|
||||
108
tests/backwards_compatibility/alltypes_legacy.proto
Normal file
108
tests/backwards_compatibility/alltypes_legacy.proto
Normal file
@@ -0,0 +1,108 @@
|
||||
message SubMessage {
|
||||
required string substuff1 = 1 [default = "1"];
|
||||
required int32 substuff2 = 2 [default = 2];
|
||||
optional fixed32 substuff3 = 3 [default = 3];
|
||||
}
|
||||
|
||||
message EmptyMessage {
|
||||
|
||||
}
|
||||
|
||||
enum HugeEnum {
|
||||
Negative = -2147483647; /* protoc doesn't accept -2147483648 here */
|
||||
Positive = 2147483647;
|
||||
}
|
||||
|
||||
message Limits {
|
||||
required int32 int32_min = 1 [default = 2147483647];
|
||||
required int32 int32_max = 2 [default = -2147483647];
|
||||
required uint32 uint32_min = 3 [default = 4294967295];
|
||||
required uint32 uint32_max = 4 [default = 0];
|
||||
required int64 int64_min = 5 [default = 9223372036854775807];
|
||||
required int64 int64_max = 6 [default = -9223372036854775807];
|
||||
required uint64 uint64_min = 7 [default = 18446744073709551615];
|
||||
required uint64 uint64_max = 8 [default = 0];
|
||||
required HugeEnum enum_min = 9 [default = Positive];
|
||||
required HugeEnum enum_max = 10 [default = Negative];
|
||||
}
|
||||
|
||||
enum MyEnum {
|
||||
Zero = 0;
|
||||
First = 1;
|
||||
Second = 2;
|
||||
Truth = 42;
|
||||
}
|
||||
|
||||
message AllTypes {
|
||||
required int32 req_int32 = 1;
|
||||
required int64 req_int64 = 2;
|
||||
required uint32 req_uint32 = 3;
|
||||
required uint64 req_uint64 = 4;
|
||||
required sint32 req_sint32 = 5;
|
||||
required sint64 req_sint64 = 6;
|
||||
required bool req_bool = 7;
|
||||
|
||||
required fixed32 req_fixed32 = 8;
|
||||
required sfixed32 req_sfixed32= 9;
|
||||
required float req_float = 10;
|
||||
|
||||
required fixed64 req_fixed64 = 11;
|
||||
required sfixed64 req_sfixed64= 12;
|
||||
required double req_double = 13;
|
||||
|
||||
required string req_string = 14;
|
||||
required bytes req_bytes = 15;
|
||||
required SubMessage req_submsg = 16;
|
||||
required MyEnum req_enum = 17;
|
||||
|
||||
|
||||
repeated int32 rep_int32 = 21 [packed = true];
|
||||
repeated int64 rep_int64 = 22 [packed = true];
|
||||
repeated uint32 rep_uint32 = 23 [packed = true];
|
||||
repeated uint64 rep_uint64 = 24 [packed = true];
|
||||
repeated sint32 rep_sint32 = 25 [packed = true];
|
||||
repeated sint64 rep_sint64 = 26 [packed = true];
|
||||
repeated bool rep_bool = 27 [packed = true];
|
||||
|
||||
repeated fixed32 rep_fixed32 = 28 [packed = true];
|
||||
repeated sfixed32 rep_sfixed32= 29 [packed = true];
|
||||
repeated float rep_float = 30 [packed = true];
|
||||
|
||||
repeated fixed64 rep_fixed64 = 31 [packed = true];
|
||||
repeated sfixed64 rep_sfixed64= 32 [packed = true];
|
||||
repeated double rep_double = 33 [packed = true];
|
||||
|
||||
repeated string rep_string = 34;
|
||||
repeated bytes rep_bytes = 35;
|
||||
repeated SubMessage rep_submsg = 36;
|
||||
repeated MyEnum rep_enum = 37 [packed = true];
|
||||
|
||||
optional int32 opt_int32 = 41 [default = 4041];
|
||||
optional int64 opt_int64 = 42 [default = 4042];
|
||||
optional uint32 opt_uint32 = 43 [default = 4043];
|
||||
optional uint64 opt_uint64 = 44 [default = 4044];
|
||||
optional sint32 opt_sint32 = 45 [default = 4045];
|
||||
optional sint64 opt_sint64 = 46 [default = 4046];
|
||||
optional bool opt_bool = 47 [default = false];
|
||||
|
||||
optional fixed32 opt_fixed32 = 48 [default = 4048];
|
||||
optional sfixed32 opt_sfixed32= 49 [default = 4049];
|
||||
optional float opt_float = 50 [default = 4050];
|
||||
|
||||
optional fixed64 opt_fixed64 = 51 [default = 4051];
|
||||
optional sfixed64 opt_sfixed64= 52 [default = 4052];
|
||||
optional double opt_double = 53 [default = 4053];
|
||||
|
||||
optional string opt_string = 54 [default = "4054"];
|
||||
optional bytes opt_bytes = 55 [default = "4055"];
|
||||
optional SubMessage opt_submsg = 56;
|
||||
optional MyEnum opt_enum = 57 [default = Second];
|
||||
|
||||
// Just to make sure that the size of the fields has been calculated
|
||||
// properly, i.e. otherwise a bug in last field might not be detected.
|
||||
required int32 end = 99;
|
||||
|
||||
|
||||
extensions 200 to 255;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user