sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-04 09:01:49 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into zero_copy

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-20 20:17:55 -10:00
parent 8c11241af0 305667b06d
commit 4a8f6ce556
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/api/api.proto
View File

@@ -203,7 +203,7 @@ message DeviceInfoResponse {
option (id) = 10; option (id) = 10;
option (source) = SOURCE_SERVER; option (source) = SOURCE_SERVER;
bool uses_password = 1; bool uses_password = 1 [(field_ifdef) = "USE_API_PASSWORD"];
// The name of the node, given by "App.set_name()" // The name of the node, given by "App.set_name()"
string name = 2; string name = 2;

2
esphome/components/api/api_connection.cpp
View File

@@ -1407,8 +1407,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
DeviceInfoResponse resp{}; DeviceInfoResponse resp{};
#ifdef USE_API_PASSWORD #ifdef USE_API_PASSWORD
resp.uses_password = true; resp.uses_password = true;
#else
resp.uses_password = false;
#endif #endif
resp.name = App.get_name(); resp.name = App.get_name();
resp.friendly_name = App.get_friendly_name(); resp.friendly_name = App.get_friendly_name();

4
esphome/components/api/api_pb2.cpp
View File

@@ -80,7 +80,9 @@ void DeviceInfo::calculate_size(uint32_t &total_size) const {
} }
#endif #endif
void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const { void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
#ifdef USE_API_PASSWORD
buffer.encode_bool(1, this->uses_password); buffer.encode_bool(1, this->uses_password);
#endif
buffer.encode_string(2, this->name); buffer.encode_string(2, this->name);
buffer.encode_string(3, this->mac_address); buffer.encode_string(3, this->mac_address);
buffer.encode_string(4, this->esphome_version); buffer.encode_string(4, this->esphome_version);
@@ -130,7 +132,9 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
#endif #endif
} }
void DeviceInfoResponse::calculate_size(uint32_t &total_size) const { void DeviceInfoResponse::calculate_size(uint32_t &total_size) const {
#ifdef USE_API_PASSWORD
ProtoSize::add_bool_field(total_size, 1, this->uses_password); ProtoSize::add_bool_field(total_size, 1, this->uses_password);
#endif
ProtoSize::add_string_field(total_size, 1, this->name); ProtoSize::add_string_field(total_size, 1, this->name);
ProtoSize::add_string_field(total_size, 1, this->mac_address); ProtoSize::add_string_field(total_size, 1, this->mac_address);
ProtoSize::add_string_field(total_size, 1, this->esphome_version); ProtoSize::add_string_field(total_size, 1, this->esphome_version);

2
esphome/components/api/api_pb2.h
View File

@@ -474,7 +474,9 @@ class DeviceInfoResponse : public ProtoMessage {
#ifdef HAS_PROTO_MESSAGE_DUMP #ifdef HAS_PROTO_MESSAGE_DUMP
const char *message_name() const override { return "device_info_response"; } const char *message_name() const override { return "device_info_response"; }
#endif #endif
#ifdef USE_API_PASSWORD
bool uses_password{false}; bool uses_password{false};
#endif
std::string name{}; std::string name{};
std::string mac_address{}; std::string mac_address{};
std::string esphome_version{}; std::string esphome_version{};

2
esphome/components/api/api_pb2_dump.cpp
View File

@@ -647,10 +647,12 @@ void DeviceInfo::dump_to(std::string &out) const {
void DeviceInfoResponse::dump_to(std::string &out) const { void DeviceInfoResponse::dump_to(std::string &out) const {
__attribute__((unused)) char buffer[64]; __attribute__((unused)) char buffer[64];
out.append("DeviceInfoResponse {\n"); out.append("DeviceInfoResponse {\n");
#ifdef USE_API_PASSWORD
out.append(" uses_password: "); out.append(" uses_password: ");
out.append(YESNO(this->uses_password)); out.append(YESNO(this->uses_password));
out.append("\n"); out.append("\n");
#endif
out.append(" name: "); out.append(" name: ");
out.append("'").append(this->name).append("'"); out.append("'").append(this->name).append("'");
out.append("\n"); out.append("\n");