diff --git a/esphome/components/api/api_pb2_defines.h b/esphome/components/api/api_pb2_defines.h index 8ebd60fb5d..1c0ee876d8 100644 --- a/esphome/components/api/api_pb2_defines.h +++ b/esphome/components/api/api_pb2_defines.h @@ -3,10 +3,8 @@ #pragma once #include "esphome/core/defines.h" -#ifdef USE_BLUETOOTH_PROXY #ifndef USE_API_VARINT64 #define USE_API_VARINT64 #endif -#endif namespace esphome::api {} // namespace esphome::api diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h index b6ef5553d3..1e4b8e5a23 100644 --- a/esphome/components/api/api_pb2_service.h +++ b/esphome/components/api/api_pb2_service.h @@ -211,12 +211,6 @@ class APIServerConnectionBase : public ProtoService { #ifdef USE_ZWAVE_PROXY virtual void on_z_wave_proxy_request(const ZWaveProxyRequest &value){}; #endif -#ifdef USE_ZIGBEE_PROXY - virtual void on_zigbee_proxy_frame(const ZigbeeProxyFrame &value){}; -#endif -#ifdef USE_ZIGBEE_PROXY - virtual void on_zigbee_proxy_request(const ZigbeeProxyRequest &value){}; -#endif #ifdef USE_IR_RF virtual void on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &value){}; @@ -244,6 +238,12 @@ class APIServerConnectionBase : public ProtoService { virtual void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &value){}; #endif +#ifdef USE_ZIGBEE_PROXY + virtual void on_zigbee_proxy_frame(const ZigbeeProxyFrame &value){}; +#endif +#ifdef USE_ZIGBEE_PROXY + virtual void on_zigbee_proxy_request(const ZigbeeProxyRequest &value){}; +#endif protected: void read_message(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) override; };