Linter fixes

This commit is contained in:
RoboMagus 2023-04-25 21:29:28 +00:00
parent 932e58167f
commit e7f36c9b3c
5 changed files with 6 additions and 15 deletions
esphome/components/esp32_bt_classic

View file

@ -6,6 +6,7 @@ from esphome.const import (
CONF_DELAY,
CONF_ID,
CONF_MAC_ADDRESS,
CONF_NUM_SCANS,
CONF_TRIGGER_ID,
)
from esphome.core import CORE
@ -17,7 +18,6 @@ from esphome.components.esp32 import (
)
from .const import (
CONF_NUM_SCANS,
CONF_ON_SCAN_START,
CONF_ON_SCAN_RESULT,
)

View file

@ -27,8 +27,6 @@ class BtClassicScannerNode : public BtClassicChildBase {
for (const auto &str : str_addrs) {
esp_bd_addr_t bd_addr;
if (str_to_bd_addr(str.c_str(), bd_addr)) {
ESP_LOGV(TAG, "Adding '%02X:%02X:%02X:%02X:%02X:%02X' to scan list with %d scans", EXPAND_MAC_F(bd_addr),
num_scans);
parent()->addScan(bt_scan_item(bd_addr_to_uint64(bd_addr), num_scans));
}
}
@ -43,7 +41,6 @@ template<typename... Ts> class BtClassicScanAction : public Action<Ts...>, publi
BtClassicScanAction(ESP32BtClassic *bt_client) : BtClassicScannerNode(bt_client) {}
void play(Ts... x) override {
ESP_LOGI(TAG, "BtClassicScanAction::play()");
uint8_t scanCount = this->num_scans_simple_;
if (num_scans_template_ != nullptr) {
scanCount = this->num_scans_template_(x...);
@ -86,11 +83,6 @@ class BtClassicScanResultTrigger : public Trigger<const BtAddress &, const BtSta
}
void on_scan_result(const rmt_name_result &result) override {
// struct read_rmt_name_param {
// esp_bt_status_t stat; /*!< read Remote Name status */
// uint8_t rmt_name[ESP_BT_GAP_MAX_BDNAME_LEN + 1]; /*!< Remote device name */
// esp_bd_addr_t bda; /*!< remote bluetooth device address*/
// } read_rmt_name;
uint64_t result_addr = bd_addr_to_uint64(result.bda);
if (!addresses_.empty()) {

View file

@ -100,6 +100,7 @@ class BtClassicScanResultListner : public BtClassicChildBase {
//
class ESP32BtClassic : public Component, public BtClassicItf {
public:
virtual ~ESP32BtClassic() {};
void setup() override;
void loop() override;
void dump_config() override;

View file

@ -1,6 +1,4 @@
CONF_ESP32_BTCLASSIC_ID = "esp32_btc_id"
CONF_NUM_SCANS = "num_scans"
CONF_ESP32_BTCLASSIC_ID = "esp32_btclassic_id"
CONF_ON_SCAN_START = "on_scan_start"
CONF_ON_SCAN_RESULT = "on_scan_result"

View file

@ -27,9 +27,9 @@ bool str_to_bd_addr(const char *addr_str, esp_bd_addr_t &addr);
std::string u64_addr_to_str(uint64_t address);
template<typename T> void moveItemToBack(std::vector<T> &v, size_t itemIndex) {
T tmp(v[itemIndex]);
v.erase(v.begin() + itemIndex);
template<typename T> void moveItemToBack(std::vector<T> &v, size_t item_index) {
T tmp(v[item_index]);
v.erase(v.begin() + item_index);
v.push_back(tmp);
}