Merge pull request #3560 from esphome/bump-2022.6.0b4

2022.6.0b4
Bump version to 2022.6.0b4
2025-11-02 08:01:50 +00:00 · 2022-06-14 22:42:06 +12:00 · 2022-06-14 20:41:46 +12:00 · 2022-06-14 20:41:46 +12:00 · 2022-06-14 20:41:46 +12:00
3 changed files with 4 additions and 3 deletions
--- a/esphome/components/bmp3xx/sensor.py
+++ b/esphome/components/bmp3xx/sensor.py
@@ -25,7 +25,7 @@ OVERSAMPLING_OPTIONS = {
    "4X": Oversampling.OVERSAMPLING_X4,
    "8X": Oversampling.OVERSAMPLING_X8,
    "16X": Oversampling.OVERSAMPLING_X16,
-    "32x": Oversampling.OVERSAMPLING_X32,
+    "32X": Oversampling.OVERSAMPLING_X32,
 }

 IIRFilter = bmp3xx_ns.enum("IIRFilter")
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -178,7 +178,8 @@ void Logger::pre_setup() {
        Serial1.setDebugOutput(ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE);
 #endif
        break;
-#if defined(USE_ESP32) && !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32S2)
+#if defined(USE_ESP32) && !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32S2) && \
+    !defined(USE_ESP32_VARIANT_ESP32S3)
      case UART_SELECTION_UART2:
        this->hw_serial_ = &Serial2;
        Serial2.begin(this->baud_rate_);
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""

-__version__ = "2022.6.0b3"
+__version__ = "2022.6.0b4"

 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
Author	SHA1	Message	Date
Jesse Hills	9ff893881c	Merge pull request #3560 from esphome/bump-2022.6.0b4 2022.6.0b4	2022-06-14 22:42:06 +12:00
Jesse Hills	94f6c6861a	Bump version to 2022.6.0b4	2022-06-14 20:41:46 +12:00
Martin	b1d614e6c4	Bm3xx: Fix typo (#3559 )	2022-06-14 20:41:46 +12:00
André Klitzing	7fceb070e5	Fix compilation with ESP32-S3 (#3543 ) Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>	2022-06-14 20:41:46 +12:00