sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-06-17 22:05:41 +01:00
Code Issues Releases Wiki Activity

Move native API enums to new namespace ()

Browse Source 
Fixes https://github.com/esphome/issues/issues/801
This commit is contained in:
Otto Winter
2019-11-02 19:35:45 +01:00
committed by GitHub
parent be6b4ee47f
commit 66aa02fc34
6 changed files with 145 additions and 131 deletions

12
script/api_protobuf/api_protobuf.py

@ -344,7 +344,7 @@ class UInt32Type(TypeInfo):
class EnumType(TypeInfo):
@property
def cpp_type(self):
return "Enum" + self._field.type_name[1:]
return f'enums::{self._field.type_name[1:]}'
@property
def decode_varint(self):
@ -497,17 +497,17 @@ class RepeatedTypeInfo(TypeInfo):
def build_enum_type(desc):
name = "Enum" + desc.name
name = desc.name
out = f"enum {name} : uint32_t {{\n"
for v in desc.value:
out += f' {v.name} = {v.number},\n'
out += '};\n'
cpp = f"template<>\n"
cpp += f"const char *proto_enum_to_string<{name}>({name} value) {{\n"
cpp += f"const char *proto_enum_to_string<enums::{name}>(enums::{name} value) {{\n"
cpp += f" switch (value) {{\n"
for v in desc.value:
cpp += f' case {v.name}: return "{v.name}";\n'
cpp += f' case enums::{v.name}: return "{v.name}";\n'
cpp += f' default: return "UNKNOWN";\n'
cpp += f' }}\n'
cpp += f'}}\n'
@ -636,11 +636,15 @@ namespace api {
'''
content += 'namespace enums {\n\n'
for enum in file.enum_type:
s, c = build_enum_type(enum)
content += s
cpp += c
content += '\n} // namespace enums\n\n'
mt = file.message_type
for m in mt: