rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include the field tags in the generated .pb.h file.

Browse Source 
Patch from Michael Haberler.
This commit is contained in:
Petteri Aimonen
2013-06-03 22:46:19 +03:00
parent bfd7cb36b9
commit a1cec46b3e
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
generator/nanopb_generator.py
View File

@@ -235,6 +235,11 @@ class Field:
else: else:
return 'const %s %s_default%s = %s;' % (ctype, self.struct_name + self.name, array_decl, default) return 'const %s %s_default%s = %s;' % (ctype, self.struct_name + self.name, array_decl, default)
def tags(self):
'''Return the #define for the tag number of this field.'''
identifier = '%s_%s_tag' % (self.struct_name, self.name)
return '#define %-40s %d\n' % (identifier, self.tag)
def pb_field_t(self, prev_field_name): def pb_field_t(self, prev_field_name):
'''Return the pb_field_t initializer to use in the constant array. '''Return the pb_field_t initializer to use in the constant array.
prev_field_name is the name of the previous field or None. prev_field_name is the name of the previous field or None.
@@ -490,6 +495,12 @@ def generate_header(dependencies, headername, enums, messages, options):
yield msg.default_decl(True) yield msg.default_decl(True)
yield '\n' yield '\n'
yield '/* Field tags (for use in manual encoding/decoding) */\n'
for msg in sort_dependencies(messages):
for field in msg.fields:
yield field.tags()
yield '\n'
yield '/* Struct field encoding specification for nanopb */\n' yield '/* Struct field encoding specification for nanopb */\n'
for msg in messages: for msg in messages:
yield msg.fields_declaration() + '\n' yield msg.fields_declaration() + '\n'