github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-08-27 00:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neutral-ble-client' into radon-eye-single-node

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-12 18:16:44 -05:00
parent bbe643e16b f5debdad32
commit 014cccb67e
4 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/ble_client/automation.cpp
-15
View File
@@ -1,15 +0,0 @@
#include "esphome/core/defines.h"
#ifdef USE_ESP32
#include "automation.h"
#elif defined(USE_BLE_GATT_CLIENT)
#include "automation_gatt.h"
#endif
#if defined(USE_ESP32) || defined(USE_BLE_GATT_CLIENT)
namespace esphome::ble_client {
const char *const Automation::TAG = "ble_client.automation";
} // namespace esphome::ble_client
#endif
esphome/components/ble_client/automation.h
-7
View File
@@ -7,13 +7,6 @@
namespace esphome::ble_client {
// placeholder class for static TAG .
class Automation {
public:
// could be made inline with C++17
static const char *const TAG;
};
// implement on_connect automation.
class BLEClientConnectTrigger final : public Trigger<>, public BLEClientNode {
public:
esphome/components/ble_client/automation_gatt.h
-6
View File
@@ -18,12 +18,6 @@
namespace esphome::ble_client {
// placeholder class for static TAG (shared with automation.cpp).
class Automation {
public:
static const char *const TAG;
};
class BLEClientConnectTrigger final : public Trigger<> {
public:
explicit BLEClientConnectTrigger(BLEClient *parent) {
esphome/components/ble_client/connect_backoff.h
+3 -3
View File
@@ -17,12 +17,12 @@ namespace esphome::ble_client {
class ConnectBackoff {
public:
bool holding_off() const {
return this->failures_ != 0 && static_cast<uint16_t>(now_() - this->start_) < this->failures_ * STEP_TICKS;
return this->failures_ != 0 && static_cast<uint16_t>(now() - this->start_) < this->failures_ * STEP_TICKS;
}
void register_failure(const char *address_str) {
if (this->failures_ < MAX_STEPS)
this->failures_++;
this->start_ = now_();
this->start_ = now();
esph_log_w("ble_client", "[%s] Holding off reconnect for %u s", address_str, this->failures_ * 10u);
}
void reset() { this->failures_ = 0; }
@@ -32,7 +32,7 @@ class ConnectBackoff {
// a minute at worst.
static constexpr uint16_t STEP_TICKS = 40; // x 256 ms
static constexpr uint8_t MAX_STEPS = 6;
static uint16_t now_() { return static_cast<uint16_t>(millis() >> 8); }
static uint16_t now() { return static_cast<uint16_t>(millis() >> 8); }
uint16_t start_{0};
uint8_t failures_{0};