Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-02 19:18:20 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

[pre-commit.ci lite] apply automatic fixes

Browse Source
This commit is contained in:
pre-commit-ci-lite[bot]
2025-11-17 23:30:01 +00:00
committed by GitHub
parent 55407844d8
commit 26a4379c34
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/bthome/__init__.py
+12 -4
View File
@@ -148,7 +148,9 @@ CONFIG_SCHEMA = cv.All(
*SENSOR_DEVICE_CLASS_TO_OBJECT_ID.keys(), lower=True
),
cv.Required(CONF_ID): cv.use_id(sensor.Sensor),
cv.Optional(CONF_ADVERTISE_IMMEDIATELY, default=False): cv.boolean,
cv.Optional(
CONF_ADVERTISE_IMMEDIATELY, default=False
): cv.boolean,
}
)
),
@@ -159,7 +161,9 @@ CONFIG_SCHEMA = cv.All(
*BINARY_SENSOR_DEVICE_CLASS_TO_OBJECT_ID.keys(), lower=True
),
cv.Required(CONF_ID): cv.use_id(binary_sensor.BinarySensor),
cv.Optional(CONF_ADVERTISE_IMMEDIATELY, default=False): cv.boolean,
cv.Optional(
CONF_ADVERTISE_IMMEDIATELY, default=False
): cv.boolean,
}
)
),
@@ -194,8 +198,12 @@ async def to_code(config):
if CONF_ENCRYPTION_KEY in config:
key = config[CONF_ENCRYPTION_KEY]
key_bytes = [cg.RawExpression(f"0x{key[i:i+2]}") for i in range(0, len(key), 2)]
key_array = cg.RawExpression(f"std::array<uint8_t, 16>{{{', '.join(str(b) for b in key_bytes)}}}")
key_bytes = [
cg.RawExpression(f"0x{key[i : i + 2]}") for i in range(0, len(key), 2)
]
key_array = cg.RawExpression(
f"std::array<uint8_t, 16>{{{', '.join(str(b) for b in key_bytes)}}}"
)
cg.add(var.set_encryption_key(key_array))
# Add sensor measurements
esphome/components/bthome/bthome.cpp
+14 -14
View File
@@ -158,7 +158,7 @@ void BTHome::build_advertisement_packets_() {
// Service UUID
size_t service_data_start = pos;
pos++; // Length placeholder
pos++; // Length placeholder
data[pos++] = 0x16; // Service Data type
data[pos++] = BTHOME_SERVICE_UUID & 0xFF;
data[pos++] = (BTHOME_SERVICE_UUID >> 8) & 0xFF;
@@ -179,7 +179,7 @@ void BTHome::build_advertisement_packets_() {
auto &measurement = this->measurements_[this->immediate_adv_measurement_index_];
if (measurement.sensor->has_state() && !std::isnan(measurement.sensor->state)) {
pos += this->encode_measurement_(data + pos, max_payload - (pos - measurement_start), measurement.object_id,
measurement.sensor->state);
measurement.sensor->state);
}
}
@@ -225,7 +225,7 @@ void BTHome::build_advertisement_packets_() {
// Service UUID
measurement_start = pos;
pos++; // Length placeholder
pos++; // Length placeholder
data[pos++] = 0x16; // Service Data type
data[pos++] = BTHOME_SERVICE_UUID & 0xFF;
data[pos++] = (BTHOME_SERVICE_UUID >> 8) & 0xFF;
@@ -288,7 +288,7 @@ void BTHome::build_advertisement_packets_() {
}
pos += this->encode_measurement_(data + pos, max_payload - (pos - measurement_start), measurement.object_id,
measurement.sensor->state);
measurement.sensor->state);
}
// Add all binary sensor measurements
@@ -304,8 +304,8 @@ void BTHome::build_advertisement_packets_() {
start_new_packet();
}
pos += this->encode_binary_measurement_(data + pos, max_payload - (pos - measurement_start),
measurement.object_id, measurement.sensor->state);
pos += this->encode_binary_measurement_(data + pos, max_payload - (pos - measurement_start), measurement.object_id,
measurement.sensor->state);
}
finish_packet();
@@ -468,13 +468,13 @@ bool BTHome::encrypt_payload_(const uint8_t *plaintext, size_t plaintext_len, ui
// MAC (6 bytes) + UUID (2 bytes) + device info (1 byte) + counter (4 bytes) = 13 bytes
uint8_t nonce[13];
memcpy(nonce, mac, 6);
nonce[6] = BTHOME_SERVICE_UUID & 0xFF; // UUID byte 1
nonce[7] = (BTHOME_SERVICE_UUID >> 8) & 0xFF; // UUID byte 2
nonce[8] = BTHOME_DEVICE_INFO_ENCRYPTED; // Device info byte
nonce[9] = this->counter_ & 0xFF; // Counter byte 0
nonce[10] = (this->counter_ >> 8) & 0xFF; // Counter byte 1
nonce[11] = (this->counter_ >> 16) & 0xFF; // Counter byte 2
nonce[12] = (this->counter_ >> 24) & 0xFF; // Counter byte 3
nonce[6] = BTHOME_SERVICE_UUID & 0xFF; // UUID byte 1
nonce[7] = (BTHOME_SERVICE_UUID >> 8) & 0xFF; // UUID byte 2
nonce[8] = BTHOME_DEVICE_INFO_ENCRYPTED; // Device info byte
nonce[9] = this->counter_ & 0xFF; // Counter byte 0
nonce[10] = (this->counter_ >> 8) & 0xFF; // Counter byte 1
nonce[11] = (this->counter_ >> 16) & 0xFF; // Counter byte 2
nonce[12] = (this->counter_ >> 24) & 0xFF; // Counter byte 3
// Initialize mbedtls CCM context
mbedtls_ccm_context ctx;
@@ -490,7 +490,7 @@ bool BTHome::encrypt_payload_(const uint8_t *plaintext, size_t plaintext_len, ui
// Encrypt and generate tag (4-byte MIC)
ret = mbedtls_ccm_encrypt_and_tag(&ctx, plaintext_len, nonce, sizeof(nonce), nullptr, 0, plaintext, ciphertext,
ciphertext + plaintext_len, 4);
ciphertext + plaintext_len, 4);
mbedtls_ccm_free(&ctx);