Merge pull request #4335 from esphome/bump-2022.12.5

2022.12.5
Bump version to 2022.12.5
2023-01-23 09:27:18 +13:00 · 2023-01-23 09:06:20 +13:00 · 2023-01-23 09:06:20 +13:00 · 2023-01-21 16:17:57 +13:00 · 2023-01-20 18:33:09 +13:00 · 2023-01-20 18:33:09 +13:00
4 changed files with 9 additions and 9 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -139,7 +139,7 @@ RUN \
        clang-tidy-11=1:11.0.1-2 \
        patch=2.7.6-7 \
        software-properties-common=0.96.20.2-2.1 \
-        nano=5.4-2+deb11u1 \
+        nano=5.4-2+deb11u2 \
        build-essential=12.9 \
        python3-dev=3.9.2-3 \
    && rm -rf \
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -95,7 +95,7 @@ void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) {
  // can't call gpio_config here because that logs in esp-idf which may cause issues
  gpio_set_direction(pin_, flags_to_mode(flags));
  gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
+  if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) {
    pull_mode = GPIO_PULLUP_PULLDOWN;
  } else if (flags & gpio::FLAG_PULLUP) {
    pull_mode = GPIO_PULLUP_ONLY;
@@ -128,7 +128,7 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
  gpio_set_direction(arg->pin, flags_to_mode(flags));
  gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
+  if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) {
    pull_mode = GPIO_PULLUP_PULLDOWN;
  } else if (flags & gpio::FLAG_PULLUP) {
    pull_mode = GPIO_PULLUP_ONLY;
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -132,16 +132,16 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
        this->set_state(espbt::ClientState::IDLE);
        break;
      }
-      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
-        this->set_state(espbt::ClientState::CONNECTED);
-        this->state_ = espbt::ClientState::ESTABLISHED;
-        break;
-      }
      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->open.conn_id);
      if (ret) {
        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_send_mtu_req failed, status=%x", this->connection_index_,
                 this->address_str_.c_str(), ret);
      }
+      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
+        this->set_state(espbt::ClientState::CONNECTED);
+        this->state_ = espbt::ClientState::ESTABLISHED;
+        break;
+      }
      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
      break;
    }
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""

-__version__ = "2022.12.2"
+__version__ = "2022.12.5"

 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
Author	SHA1	Message	Date
Jesse Hills	72c6efd6a0	Merge pull request #4335 from esphome/bump-2022.12.5 2022.12.5	2023-01-23 09:27:18 +13:00
Jesse Hills	a1f1804112	Bump version to 2022.12.5	2023-01-23 09:06:20 +13:00
Jesse Hills	a8b1ceb4e9	Bump nano version in lint docker image (#4218 )	2023-01-23 09:06:20 +13:00
Jesse Hills	4fb0f7f8c6	Merge pull request #4323 from esphome/bump-2022.12.4 2022.12.4	2023-01-21 16:17:57 +13:00
Jesse Hills	958cadeca8	Bump version to 2022.12.4	2023-01-20 18:33:09 +13:00
J. Nick Koston	00f2655f1a	Always send the MTU request for BLE v3 cached connections (#4322 ) closes https://github.com/esphome/esphome/pull/4321 fixes https://github.com/esphome/issues/issues/4041 fixes https://github.com/esphome/issues/issues/3951	2023-01-20 18:33:09 +13:00
Jesse Hills	074f5029eb	Fix gpio pin mode for ISR pins (#4216 )	2023-01-20 18:33:09 +13:00
Jesse Hills	1691976587	Merge pull request #4214 from esphome/bump-2022.12.3 2022.12.3	2022-12-20 23:34:01 +13:00
Jesse Hills	60e6b4d21e	Bump version to 2022.12.3	2022-12-20 23:15:39 +13:00
Jesse Hills	5750591df2	Fix ESP32 GPIO when using INPUT PULLUP mode (#4213 )	2022-12-20 23:15:39 +13:00