Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-14 11:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #2267 from esphome/bump-2021.9.0b2

Browse source 
2021.9.0b2
This commit is contained in:
Jesse Hills 2021-09-10 22:13:54 +12:00 committed by GitHub
commit f1a8d957f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/api/api_frame_helper.cpp
View file

@ -707,7 +707,7 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
} }
size_t i = 1; size_t i = 1;
size_t consumed = 0; uint32_t consumed = 0;
auto msg_size_varint = ProtoVarInt::parse(&rx_header_buf_[i], rx_header_buf_.size() - i, &consumed); auto msg_size_varint = ProtoVarInt::parse(&rx_header_buf_[i], rx_header_buf_.size() - i, &consumed);
if (!msg_size_varint.has_value()) { if (!msg_size_varint.has_value()) {
// not enough data there yet // not enough data there yet

2
esphome/components/pn532/pn532.cpp
View file

@ -49,7 +49,7 @@ void PN532::setup() {
} }
// Set up SAM (secure access module) // Set up SAM (secure access module)
uint8_t sam_timeout = std::min(255u, this->update_interval_ / 50); uint8_t sam_timeout = std::min<uint8_t>(255u, this->update_interval_ / 50);
if (!this->write_command_({ if (!this->write_command_({
PN532_COMMAND_SAMCONFIGURATION, PN532_COMMAND_SAMCONFIGURATION,
0x01, // normal mode 0x01, // normal mode

3
esphome/components/sm300d2/sm300d2.cpp
View file

@ -27,7 +27,8 @@ void SM300D2Sensor::update() {
} }
uint16_t calculated_checksum = this->sm300d2_checksum_(response); uint16_t calculated_checksum = this->sm300d2_checksum_(response);
if (calculated_checksum != response[SM300D2_RESPONSE_LENGTH - 1]) { if ((calculated_checksum != response[SM300D2_RESPONSE_LENGTH - 1]) &&
(calculated_checksum - 0x80 != response[SM300D2_RESPONSE_LENGTH - 1])) {
ESP_LOGW(TAG, "SM300D2 Checksum doesn't match: 0x%02X!=0x%02X", response[SM300D2_RESPONSE_LENGTH - 1], ESP_LOGW(TAG, "SM300D2 Checksum doesn't match: 0x%02X!=0x%02X", response[SM300D2_RESPONSE_LENGTH - 1],
calculated_checksum); calculated_checksum);
this->status_set_warning(); this->status_set_warning();

4
esphome/components/uart/uart_esp32.cpp
View file

@ -73,7 +73,11 @@ void UARTComponent::setup() {
// Use Arduino HardwareSerial UARTs if all used pins match the ones // Use Arduino HardwareSerial UARTs if all used pins match the ones
// preconfigured by the platform. For example if RX disabled but TX pin // preconfigured by the platform. For example if RX disabled but TX pin
// is 1 we still want to use Serial. // is 1 we still want to use Serial.
#ifdef CONFIG_IDF_TARGET_ESP32C3
if (this->tx_pin_.value_or(21) == 21 && this->rx_pin_.value_or(20) == 20) {
#else
if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) { if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) {
#endif
this->hw_serial_ = &Serial; this->hw_serial_ = &Serial;
} else { } else {
this->hw_serial_ = new HardwareSerial(next_uart_num++); this->hw_serial_ = new HardwareSerial(next_uart_num++);

2
esphome/const.py
View file

@ -1,6 +1,6 @@
"""Constants used by esphome.""" """Constants used by esphome."""
__version__ = "2021.9.0b1" __version__ = "2021.9.0b2"
ESP_PLATFORM_ESP32 = "ESP32" ESP_PLATFORM_ESP32 = "ESP32"
ESP_PLATFORM_ESP8266 = "ESP8266" ESP_PLATFORM_ESP8266 = "ESP8266"