Bump version to 2024.6.2

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/bump-version.yml

@@ -15,45 +15,47 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-    - uses: actions/checkout@v4.0.0
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    - run: pip install -r script/requirements.txt
-    - run: script/bump-version.py ${{ github.event.inputs.version }}
-    - name: Write Beta changelog
-      run: |
-        cat > esphome-beta/CHANGELOG.md << 'EOF'
-        ## ${{ github.event.inputs.version }}
+      - uses: actions/checkout@v4.1.7
+      - uses: actions/setup-python@v5.1.0
+        with:
+          python-version: "3.11"
+      - run: pip install -r script/requirements.txt
+      - run: script/bump-version.py ${{ github.event.inputs.version }}
+      - name: Write Beta changelog
+        if: ${{ !contains(github.event.inputs.version, 'dev') }}
+        run: |
+          cat > esphome-beta/CHANGELOG.md << 'EOF'
+          ## ${{ github.event.inputs.version }}
 
-        ${{ github.event.inputs.content }}
-        EOF
-    - name: Write Stable changelog
-      if: ${{ !contains(github.event.inputs.version, 'b') }}
-      run: |
-        cat > esphome/CHANGELOG.md << 'EOF'
-        ## ${{ github.event.inputs.version }}
+          ${{ github.event.inputs.content }}
+          EOF
+      - name: Write Stable changelog
+        if: ${{ !contains(github.event.inputs.version, 'b') && !contains(github.event.inputs.version, 'dev')  }}
+        run: |
+          cat > esphome/CHANGELOG.md << 'EOF'
+          ## ${{ github.event.inputs.version }}
 
-        ${{ github.event.inputs.content }}
-        EOF
-    - name: Commit version bump
-      id: commit_version
-      run: |
-        git config user.name esphomebot
-        git config user.email esphome@nabucasa.com
-        git add .
-        git commit -m "Bump version to ${{ github.event.inputs.version }}"
-        git push
-        COMMIT=$(git rev-parse HEAD)
-        echo "::set-output name=commit_sha::${COMMIT}"
-    - name: Create a Release
-      uses: actions/create-release@v1.1.4
-      continue-on-error: true
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.event.inputs.version }}
-        release_name: ${{ github.event.inputs.version }}
-        body: ${{ github.event.inputs.content }}
-        prerelease: ${{ contains(github.event.inputs.version, 'b') }}
-        commitish: ${{ steps.commit_version.outputs.commit_sha }}
+          ${{ github.event.inputs.content }}
+          EOF
+      - name: Commit version bump
+        id: commit_version
+        run: |
+          git config user.name esphomebot
+          git config user.email esphome@nabucasa.com
+          git add .
+          git commit -m "Bump version to ${{ github.event.inputs.version }}"
+          git push
+          COMMIT=$(git rev-parse HEAD)
+          echo "::set-output name=commit_sha::${COMMIT}"
+      - name: Create a Release
+        uses: actions/create-release@v1.1.4
+        continue-on-error: true
+        if: ${{ !contains(github.event.inputs.version, 'dev') }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.event.inputs.version }}
+          release_name: ${{ github.event.inputs.version }}
+          body: ${{ github.event.inputs.content }}
+          prerelease: ${{ contains(github.event.inputs.version, 'b') }}
+          commitish: ${{ steps.commit_version.outputs.commit_sha }}

.github/workflows/devcontainer-build.yaml

@@ -19,20 +19,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.7
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.2.0
         if: github.event_name != 'pull_request'
         with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
             password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.2.0
+        uses: docker/setup-qemu-action@v3.0.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.10.0
+        uses: docker/setup-buildx-action@v3.3.0
       - name: Build and Push
-        uses: docker/build-push-action@v4.1.1
+        uses: docker/build-push-action@v6.0.2
         with:
           context: .
           file: .devcontainer/Dockerfile

.github/workflows/lint.yml

@@ -19,16 +19,16 @@ jobs:
             channel: dev
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.7
       - name: 🛠 Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5.1.0
         with:
-          python-version: '3.x'
+          python-version: '3.11'
       - name: 🛠 Install dependencies
         run: pip install -r script/requirements.txt
       - name: 🛠 Generate files from template
         run: python script/generate.py ${{ matrix.channels.channel }}
       - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channels.channel }}
-        uses: frenck/action-addon-linter@v2.13.2
+        uses: frenck/action-addon-linter@v2.15.1
         with:
           path: "./${{ matrix.channels.folder }}"

esphome-beta/CHANGELOG.md

@@ -1,149 +1,12 @@
-## 2023.9.0
+## 2024.6.2
 
-## Full list of changes
-
-### New Components
-
-- Add pmwcs3 capacitive soil moisture & temperature sensor component [esphome#4624](https://github.com/esphome/esphome/pull/4624) by [@SeByDocKy](https://github.com/SeByDocKy) (new-integration)
-- Support for LibreTiny platform (RTL8710, BK7231 & other modules) [esphome#3509](https://github.com/esphome/esphome/pull/3509) by [@kuba2k2](https://github.com/kuba2k2) (new-integration)
-- Adding DFRobot Ozone Sensor Support (sen0321) [esphome#4782](https://github.com/esphome/esphome/pull/4782) by [@notjj](https://github.com/notjj) (new-integration)
-- Integration LightwaveRF switches [esphome#4812](https://github.com/esphome/esphome/pull/4812) by [@max246](https://github.com/max246) (new-integration)
-- Refactor SPI code; Add ESP-IDF hardware support [esphome#5311](https://github.com/esphome/esphome/pull/5311) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Add BMI160 support [esphome#5143](https://github.com/esphome/esphome/pull/5143) by [@flaviut](https://github.com/flaviut) (new-integration)
-- Native SPI RGB LED component [esphome#5288](https://github.com/esphome/esphome/pull/5288) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Wireguard component [esphome#4256](https://github.com/esphome/esphome/pull/4256) by [@lhoracek](https://github.com/lhoracek) (new-integration)
-
-### Breaking Changes
-
-- Synchronise Device Classes from Home Assistant [esphome#5328](https://github.com/esphome/esphome/pull/5328) by [@esphomebot](https://github.com/esphomebot) (breaking-change)
-- Use /data directory for .esphome folder when running as HA add-on [esphome#5374](https://github.com/esphome/esphome/pull/5374) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
-
-### Beta Changes
-
-- Add patch to apt install [esphome#5389](https://github.com/esphome/esphome/pull/5389) by [@synesthesiam](https://github.com/synesthesiam)
-- Fix Waveshare 7.5v2 epaper screens are always powered on [esphome#5283](https://github.com/esphome/esphome/pull/5283) by [@phoenixswiss](https://github.com/phoenixswiss)
-- Update radon_eye_listener.cpp [esphome#5401](https://github.com/esphome/esphome/pull/5401) by [@rmmacias](https://github.com/rmmacias)
-- Add shelly-dimmer-stm32 51.7 to known versions [esphome#5400](https://github.com/esphome/esphome/pull/5400) by [@trvrnrth](https://github.com/trvrnrth)
-- Add E-Trailer Gaslevel support to Mopeka Std Check [esphome#5397](https://github.com/esphome/esphome/pull/5397) by [@Phhere](https://github.com/Phhere)
-- fix disabled wifi power on 8266 [esphome#5409](https://github.com/esphome/esphome/pull/5409) by [@ssieb](https://github.com/ssieb)
-- fix handling of web server version [esphome#5405](https://github.com/esphome/esphome/pull/5405) by [@ssieb](https://github.com/ssieb)
-- Climate preset fix [esphome#5407](https://github.com/esphome/esphome/pull/5407) by [@Jorre05](https://github.com/Jorre05)
-- Remove Wi-Fi dependency from Midea component [esphome#5394](https://github.com/esphome/esphome/pull/5394) by [@AnthonyMaiorani](https://github.com/AnthonyMaiorani)
-- http_request: Cleanups and safety improvements [esphome#5360](https://github.com/esphome/esphome/pull/5360) by [@kpfleming](https://github.com/kpfleming)
-- Make the pulse meter timeout on startup when no pulses are received [esphome#5388](https://github.com/esphome/esphome/pull/5388) by [@TrentHouliston](https://github.com/TrentHouliston)
-- Wizard: fix colored text in input prompts [esphome#5313](https://github.com/esphome/esphome/pull/5313) by [@kuba2k2](https://github.com/kuba2k2)
-- support keypads with pulldowns [esphome#5404](https://github.com/esphome/esphome/pull/5404) by [@ssieb](https://github.com/ssieb)
-- Fix SPI inverted clock on ESP8266 [esphome#5416](https://github.com/esphome/esphome/pull/5416) by [@clydebarrow](https://github.com/clydebarrow)
-- [RP2040W] Fix WiFi bootloop upon LibreTiny support [esphome#5414](https://github.com/esphome/esphome/pull/5414) by [@hostcc](https://github.com/hostcc)
-- dallas: limit addresses to 64 bits [esphome#5413](https://github.com/esphome/esphome/pull/5413) by [@oddstr13](https://github.com/oddstr13)
-- Bump zeroconf from 0.108.0 to 0.112.0 [esphome#5392](https://github.com/esphome/esphome/pull/5392) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- LibreTiny: enable MQTT, bump to v1.4.1 [esphome#5419](https://github.com/esphome/esphome/pull/5419) by [@kuba2k2](https://github.com/kuba2k2)
-- Wireguard keepalive remove uint16 type [esphome#5430](https://github.com/esphome/esphome/pull/5430) by [@glmnet](https://github.com/glmnet)
-- Fix #4896 and #4903 [esphome#5433](https://github.com/esphome/esphome/pull/5433) by [@clydebarrow](https://github.com/clydebarrow)
-
-### All changes
-
-- Updated my username in Code Owners [esphome#5247](https://github.com/esphome/esphome/pull/5247) by [@mreditor97](https://github.com/mreditor97)
-- remote_base: change dumpers log level [esphome#5253](https://github.com/esphome/esphome/pull/5253) by [@dudanov](https://github.com/dudanov)
-- Add `libfreetype-dev` Debian package for armv7 Docker builds [esphome#5262](https://github.com/esphome/esphome/pull/5262) by [@pierlon](https://github.com/pierlon)
-- Add delay before enabling ipv6 [esphome#5256](https://github.com/esphome/esphome/pull/5256) by [@HeMan](https://github.com/HeMan)
-- Bump zeroconf from 0.74.0 to 0.80.0 [esphome#5260](https://github.com/esphome/esphome/pull/5260) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump click from 8.1.6 to 8.1.7 [esphome#5272](https://github.com/esphome/esphome/pull/5272) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Remove support for ESP-IDF version < 4 [esphome#5261](https://github.com/esphome/esphome/pull/5261) by [@HeMan](https://github.com/HeMan)
-- Add pmwcs3 capacitive soil moisture & temperature sensor component [esphome#4624](https://github.com/esphome/esphome/pull/4624) by [@SeByDocKy](https://github.com/SeByDocKy) (new-integration)
-- Add manufacturer data config to BLE server [esphome#5251](https://github.com/esphome/esphome/pull/5251) by [@clydebarrow](https://github.com/clydebarrow)
-- Add support for ESP32-{S2,S3,C3} to debug component [esphome#4731](https://github.com/esphome/esphome/pull/4731) by [@jayme-github](https://github.com/jayme-github)
-- Support for ESP32-C2 & ESP32-C6 [esphome#4377](https://github.com/esphome/esphome/pull/4377) by [@vidplace7](https://github.com/vidplace7)
-- Bump arduino-heatpumpir to v1.0.23 [esphome#5269](https://github.com/esphome/esphome/pull/5269) by [@rob-deutsch](https://github.com/rob-deutsch)
-- Fix equality check when setting current-based cover position [esphome#5167](https://github.com/esphome/esphome/pull/5167) by [@kroimon](https://github.com/kroimon)
-- Bump platformio from 6.1.9 to 6.1.10 [esphome#5237](https://github.com/esphome/esphome/pull/5237) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Add Invert method for SSD1306 [esphome#5292](https://github.com/esphome/esphome/pull/5292) by [@max246](https://github.com/max246)
-- Update PSRAM config params for IDF4+ [esphome#5298](https://github.com/esphome/esphome/pull/5298) by [@kbx81](https://github.com/kbx81)
-- Fix legacy zeroconf record update method [esphome#5294](https://github.com/esphome/esphome/pull/5294) by [@bdraco](https://github.com/bdraco)
-- Bump zeroconf from 0.80.0 to 0.86.0 [esphome#5308](https://github.com/esphome/esphome/pull/5308) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Add PSRAM mode and speed config [esphome#5312](https://github.com/esphome/esphome/pull/5312) by [@kbx81](https://github.com/kbx81)
-- Add extra SLPOUT for waking up some ST7789 chips [esphome#5319](https://github.com/esphome/esphome/pull/5319) by [@clydebarrow](https://github.com/clydebarrow)
-- 7789 controller fixes take 2 [esphome#5320](https://github.com/esphome/esphome/pull/5320) by [@clydebarrow](https://github.com/clydebarrow)
-- Bump Arduino Pico to 3.4.0 [esphome#5321](https://github.com/esphome/esphome/pull/5321) by [@HeMan](https://github.com/HeMan)
-- Use gzip compression for the web server component's static resources [esphome#5291](https://github.com/esphome/esphome/pull/5291) by [@EternityForest](https://github.com/EternityForest)
-- Bump zeroconf from 0.86.0 to 0.88.0 [esphome#5315](https://github.com/esphome/esphome/pull/5315) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Adding heating coil and fan icons, enum device_class [esphome#5325](https://github.com/esphome/esphome/pull/5325) by [@barndawgie](https://github.com/barndawgie)
-- Add dashboard API to get firmware binaries [esphome#4675](https://github.com/esphome/esphome/pull/4675) by [@kuba2k2](https://github.com/kuba2k2)
-- Make uart error message go away [esphome#5329](https://github.com/esphome/esphome/pull/5329) by [@clydebarrow](https://github.com/clydebarrow)
-- add heating functionality to SI7021 [esphome#4828](https://github.com/esphome/esphome/pull/4828) by [@max246](https://github.com/max246)
-- Bump esphome-dashboard to 20230904.0 [esphome#5339](https://github.com/esphome/esphome/pull/5339) by [@jesserockz](https://github.com/jesserockz)
-- Added Handling for Nack "file not found" [esphome#5338](https://github.com/esphome/esphome/pull/5338) by [@croessi](https://github.com/croessi)
-- Prepare api and time for ESP-IDF >= 5 [esphome#5332](https://github.com/esphome/esphome/pull/5332) by [@HeMan](https://github.com/HeMan)
-- Tweak Improv serial to build in IDF 5 [esphome#5331](https://github.com/esphome/esphome/pull/5331) by [@kbx81](https://github.com/kbx81)
-- Support for LibreTiny platform (RTL8710, BK7231 & other modules) [esphome#3509](https://github.com/esphome/esphome/pull/3509) by [@kuba2k2](https://github.com/kuba2k2) (new-integration)
-- Extend ESP32 CAN bit rates /bus speed support [esphome#5280](https://github.com/esphome/esphome/pull/5280) by [@mkaiser](https://github.com/mkaiser)
-- Debug component: add free PSRAM sensor [esphome#5334](https://github.com/esphome/esphome/pull/5334) by [@kahrendt](https://github.com/kahrendt)
-- libretiny: fix uart_port framework config [esphome#5343](https://github.com/esphome/esphome/pull/5343) by [@jesserockz](https://github.com/jesserockz)
-- Bump actions/checkout from 3 to 4 [esphome#5341](https://github.com/esphome/esphome/pull/5341) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Add Lilygo T-Embed to st7789v display config. [esphome#5337](https://github.com/esphome/esphome/pull/5337) by [@clydebarrow](https://github.com/clydebarrow)
-- Disable IPv6 when config explicitly says false [esphome#5310](https://github.com/esphome/esphome/pull/5310) by [@HeMan](https://github.com/HeMan)
-- Add defines.h to ethernet_component.h for ENABLE_IPV6 [esphome#5344](https://github.com/esphome/esphome/pull/5344) by [@kbx81](https://github.com/kbx81)
-- Synchronise Device Classes from Home Assistant [esphome#5328](https://github.com/esphome/esphome/pull/5328) by [@esphomebot](https://github.com/esphomebot) (breaking-change)
-- Bump pytest from 7.4.0 to 7.4.1 [esphome#5342](https://github.com/esphome/esphome/pull/5342) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Fixed default temperature step values for haier climate [esphome#5330](https://github.com/esphome/esphome/pull/5330) by [@paveldn](https://github.com/paveldn)
-- Add debug component to all tests [esphome#5333](https://github.com/esphome/esphome/pull/5333) by [@HeMan](https://github.com/HeMan)
-- Support MaxBotix XL in addition to HRXL [esphome#4510](https://github.com/esphome/esphome/pull/4510) by [@notjj](https://github.com/notjj)
-- Adding DFRobot Ozone Sensor Support (sen0321) [esphome#4782](https://github.com/esphome/esphome/pull/4782) by [@notjj](https://github.com/notjj) (new-integration)
-- mdns: bump IDF mdns component to 1.2.0 [esphome#5217](https://github.com/esphome/esphome/pull/5217) by [@stintel](https://github.com/stintel)
-- Integration LightwaveRF switches [esphome#4812](https://github.com/esphome/esphome/pull/4812) by [@max246](https://github.com/max246) (new-integration)
-- Bump flake8 from 6.0.0 to 6.1.0 [esphome#5171](https://github.com/esphome/esphome/pull/5171) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump tornado from 6.3.2 to 6.3.3 [esphome#5236](https://github.com/esphome/esphome/pull/5236) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump platformio from 6.1.10 to 6.1.11 [esphome#5323](https://github.com/esphome/esphome/pull/5323) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Only run ci-docker when ci-docker workflow changes [esphome#5347](https://github.com/esphome/esphome/pull/5347) by [@jesserockz](https://github.com/jesserockz)
-- esp32: Extra build customization [esphome#5322](https://github.com/esphome/esphome/pull/5322) by [@jesserockz](https://github.com/jesserockz)
-- Allow upload command to flash file via serial [esphome#5274](https://github.com/esphome/esphome/pull/5274) by [@jesserockz](https://github.com/jesserockz)
-- Allow "--device SERIAL" on cli to flash only via serial [esphome#5351](https://github.com/esphome/esphome/pull/5351) by [@jesserockz](https://github.com/jesserockz)
-- Fix PN532 for IDF 5 and ultralight enhancements [esphome#5352](https://github.com/esphome/esphome/pull/5352) by [@kbx81](https://github.com/kbx81)
-- Fix cpu_ll_get_cycle_count() deprecated warning [esphome#5353](https://github.com/esphome/esphome/pull/5353) by [@kbx81](https://github.com/kbx81)
-- Refactor SPI code; Add ESP-IDF hardware support [esphome#5311](https://github.com/esphome/esphome/pull/5311) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Bump actions/cache from 3.3.1 to 3.3.2 [esphome#5367](https://github.com/esphome/esphome/pull/5367) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump zeroconf from 0.88.0 to 0.102.0 [esphome#5368](https://github.com/esphome/esphome/pull/5368) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Fix repeat.count = 0 case [esphome#5364](https://github.com/esphome/esphome/pull/5364) by [@Xmister](https://github.com/Xmister)
-- Fix dashboard download for ESP32 variants [esphome#5355](https://github.com/esphome/esphome/pull/5355) by [@kuba2k2](https://github.com/kuba2k2)
-- Bump pytest from 7.4.1 to 7.4.2 [esphome#5357](https://github.com/esphome/esphome/pull/5357) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- [ADC] Support measuring VCC on Raspberry Pico (W) [esphome#5335](https://github.com/esphome/esphome/pull/5335) by [@hostcc](https://github.com/hostcc)
-- Move CONF_PHASE_A/B/C constants to const.py. [esphome#5304](https://github.com/esphome/esphome/pull/5304) by [@kpfleming](https://github.com/kpfleming)
-- Add BMI160 support [esphome#5143](https://github.com/esphome/esphome/pull/5143) by [@flaviut](https://github.com/flaviut) (new-integration)
-- Use black-pre-commit-mirror to speed up pre-commit runs. [esphome#5372](https://github.com/esphome/esphome/pull/5372) by [@kpfleming](https://github.com/kpfleming)
-- Native SPI RGB LED component [esphome#5288](https://github.com/esphome/esphome/pull/5288) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Wireguard component [esphome#4256](https://github.com/esphome/esphome/pull/4256) by [@lhoracek](https://github.com/lhoracek) (new-integration)
-- Bump LibreTiny version to 1.4.0 [esphome#5375](https://github.com/esphome/esphome/pull/5375) by [@kuba2k2](https://github.com/kuba2k2)
-- time: Make std::string version of strftime() avoid runaway memory allocations [esphome#5348](https://github.com/esphome/esphome/pull/5348) by [@kpfleming](https://github.com/kpfleming)
-- Fix disabled wifi crash on boot [esphome#5370](https://github.com/esphome/esphome/pull/5370) by [@Xmister](https://github.com/Xmister)
-- debug: add ESP32-C6 support [esphome#5354](https://github.com/esphome/esphome/pull/5354) by [@stintel](https://github.com/stintel)
-- Make string globals persist-able using fixed size allocations [esphome#5296](https://github.com/esphome/esphome/pull/5296) by [@EternityForest](https://github.com/EternityForest)
-- Use /data directory for .esphome folder when running as HA add-on [esphome#5374](https://github.com/esphome/esphome/pull/5374) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
-- Bump zeroconf from 0.102.0 to 0.108.0 [esphome#5376](https://github.com/esphome/esphome/pull/5376) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump black from 23.7.0 to 23.9.1 [esphome#5377](https://github.com/esphome/esphome/pull/5377) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Attempt to fix rp2040 adc with vcc [esphome#5378](https://github.com/esphome/esphome/pull/5378) by [@jesserockz](https://github.com/jesserockz)
-- Enable IPv6 for ESP8266 and Raspberry pi pico w (RP2040) [esphome#4759](https://github.com/esphome/esphome/pull/4759) by [@HeMan](https://github.com/HeMan)
-- Workflow updates [esphome#5384](https://github.com/esphome/esphome/pull/5384) by [@jesserockz](https://github.com/jesserockz)
-- Modbus Controller added some features [esphome#5318](https://github.com/esphome/esphome/pull/5318) by [@0x3333](https://github.com/0x3333)
-- Force heater off on setup [esphome#5161](https://github.com/esphome/esphome/pull/5161) by [@rufuswilson](https://github.com/rufuswilson)
-- Add IDF 5 test yaml, add adc to IDF tests, fix adc for IDF 5 [esphome#5379](https://github.com/esphome/esphome/pull/5379) by [@kbx81](https://github.com/kbx81)
-- Add patch to apt install [esphome#5389](https://github.com/esphome/esphome/pull/5389) by [@synesthesiam](https://github.com/synesthesiam)
-- Fix Waveshare 7.5v2 epaper screens are always powered on [esphome#5283](https://github.com/esphome/esphome/pull/5283) by [@phoenixswiss](https://github.com/phoenixswiss)
-- Update radon_eye_listener.cpp [esphome#5401](https://github.com/esphome/esphome/pull/5401) by [@rmmacias](https://github.com/rmmacias)
-- Add shelly-dimmer-stm32 51.7 to known versions [esphome#5400](https://github.com/esphome/esphome/pull/5400) by [@trvrnrth](https://github.com/trvrnrth)
-- Add E-Trailer Gaslevel support to Mopeka Std Check [esphome#5397](https://github.com/esphome/esphome/pull/5397) by [@Phhere](https://github.com/Phhere)
-- fix disabled wifi power on 8266 [esphome#5409](https://github.com/esphome/esphome/pull/5409) by [@ssieb](https://github.com/ssieb)
-- fix handling of web server version [esphome#5405](https://github.com/esphome/esphome/pull/5405) by [@ssieb](https://github.com/ssieb)
-- Climate preset fix [esphome#5407](https://github.com/esphome/esphome/pull/5407) by [@Jorre05](https://github.com/Jorre05)
-- Remove Wi-Fi dependency from Midea component [esphome#5394](https://github.com/esphome/esphome/pull/5394) by [@AnthonyMaiorani](https://github.com/AnthonyMaiorani)
-- http_request: Cleanups and safety improvements [esphome#5360](https://github.com/esphome/esphome/pull/5360) by [@kpfleming](https://github.com/kpfleming)
-- Make the pulse meter timeout on startup when no pulses are received [esphome#5388](https://github.com/esphome/esphome/pull/5388) by [@TrentHouliston](https://github.com/TrentHouliston)
-- Wizard: fix colored text in input prompts [esphome#5313](https://github.com/esphome/esphome/pull/5313) by [@kuba2k2](https://github.com/kuba2k2)
-- support keypads with pulldowns [esphome#5404](https://github.com/esphome/esphome/pull/5404) by [@ssieb](https://github.com/ssieb)
-- Fix SPI inverted clock on ESP8266 [esphome#5416](https://github.com/esphome/esphome/pull/5416) by [@clydebarrow](https://github.com/clydebarrow)
-- [RP2040W] Fix WiFi bootloop upon LibreTiny support [esphome#5414](https://github.com/esphome/esphome/pull/5414) by [@hostcc](https://github.com/hostcc)
-- dallas: limit addresses to 64 bits [esphome#5413](https://github.com/esphome/esphome/pull/5413) by [@oddstr13](https://github.com/oddstr13)
-- Bump zeroconf from 0.108.0 to 0.112.0 [esphome#5392](https://github.com/esphome/esphome/pull/5392) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- LibreTiny: enable MQTT, bump to v1.4.1 [esphome#5419](https://github.com/esphome/esphome/pull/5419) by [@kuba2k2](https://github.com/kuba2k2)
-- Wireguard keepalive remove uint16 type [esphome#5430](https://github.com/esphome/esphome/pull/5430) by [@glmnet](https://github.com/glmnet)
-- Fix #4896 and #4903 [esphome#5433](https://github.com/esphome/esphome/pull/5433) by [@clydebarrow](https://github.com/clydebarrow)
+- [core] Fix package merging with lists of primitives [esphome#6952](https://github.com/esphome/esphome/pull/6952) by [@jesserockz](https://github.com/jesserockz)
+- [update] Set entity_category to config & Publish state to logs [esphome#6954](https://github.com/esphome/esphome/pull/6954) by [@jesserockz](https://github.com/jesserockz)
+- Fix infinite loop in http_request for ESP-IDF. [esphome#6963](https://github.com/esphome/esphome/pull/6963) by [@kpfleming](https://github.com/kpfleming)
+- ESP-IDF 4.x expects seconds for esp_task_wdt_init(), not milliseconds. [esphome#6964](https://github.com/esphome/esphome/pull/6964) by [@kpfleming](https://github.com/kpfleming)
+- Onewire [esphome#6967](https://github.com/esphome/esphome/pull/6967) by [@ssieb](https://github.com/ssieb)
+- [http_request] memory leak fix [esphome#6973](https://github.com/esphome/esphome/pull/6973) by [@gabest11](https://github.com/gabest11)
+- Await cg.get_variable in Update component [esphome#6974](https://github.com/esphome/esphome/pull/6974) by [@bkaufx](https://github.com/bkaufx)
+- [one-wire] fix potential hang [esphome#6976](https://github.com/esphome/esphome/pull/6976) by [@ssieb](https://github.com/ssieb)
+- [midea] fix fan speed compatibility with some models [esphome#6978](https://github.com/esphome/esphome/pull/6978) by [@dudanov](https://github.com/dudanov)
 

esphome-beta/config.yaml

@@ -30,8 +30,9 @@ schema:
 backup_exclude:
 - '*/*/'
 init: false
+startup: services
 name: ESPHome (beta)
-version: 2023.9.0
+version: 2024.6.2
 slug: esphome-beta
 description: Beta version of ESPHome add-on
 image: ghcr.io/esphome/esphome-hassio

esphome-dev/CHANGELOG.md

@@ -1 +1 @@
-See https://esphome.io/changelog/index.html
+See https://github.com/esphome/esphome/commits/dev

esphome-dev/Dockerfile

@@ -1,10 +0,0 @@
-ARG BUILD_FROM=esphome/esphome-hassio-amd64:dev
-FROM ${BUILD_FROM}
-
-# Copy root filesystem
-COPY rootfs /
-
-# Labels
-LABEL \
-    io.hass.type="addon" \
-    io.hass.version=dev

esphome-dev/build.yaml

@@ -1,5 +0,0 @@
----
-build_from:
-  aarch64: ghcr.io/esphome/esphome-hassio:dev
-  amd64: ghcr.io/esphome/esphome-hassio:dev
-  armv7: ghcr.io/esphome/esphome-hassio:dev

esphome-dev/config.yaml

@@ -31,10 +31,12 @@ schema:
 backup_exclude:
 - '*/*/'
 init: false
+startup: services
 name: ESPHome (dev)
-version: dev
+version: 2024.7.0-dev20240624
 slug: esphome-dev
 description: Development version of ESPHome add-on
+image: ghcr.io/esphome/esphome-hassio
 stage: experimental
 advanced: true
 options:

esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh

@@ -1,47 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files installs the user ESPHome fork if specified
-# The fork must be up to date with the latest ESPHome dev branch
-# and have no conflicts
-# ==============================================================================
-
-declare esphome_fork
-
-if bashio::config.has_value 'esphome_fork'; then
-    esphome_fork=$(bashio::config 'esphome_fork')
-    if [[ $esphome_fork == *":"* ]]; then
-      IFS=':' read -r -a array <<< "$esphome_fork"
-      username=${array[0]}
-      ref=${array[1]}
-    else
-      username="esphome"
-      ref=$esphome_fork
-    fi
-    full_url="https://github.com/${username}/esphome/archive/${ref}.tar.gz"
-    bashio::log.info "Checking forked ESPHome"
-    dev_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
-    bashio::log.info "Downloading ESPHome from fork '${esphome_fork}' (${full_url})..."
-    curl -L -o /tmp/esphome.tar.gz "${full_url}" -qq \
-      || bashio::exit.nok "Failed downloading ESPHome fork."
-    bashio::log.info "Installing ESPHome from fork '${esphome_fork}' (${full_url})..."
-    rm -rf /esphome || bashio::exit.nok "Failed to remove ESPHome."
-    mkdir /esphome
-    tar -zxf /tmp/esphome.tar.gz -C /esphome --strip-components=1 \
-      || bashio::exit.nok "Failed installing ESPHome from fork."
-    pip install -U -e /esphome || bashio::exit.nok "Failed installing ESPHome from fork."
-    rm -f /tmp/esphome.tar.gz
-    fork_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
-
-    if [[ "$fork_version" != "$dev_version" ]]; then
-      bashio::log.error "############################"
-      bashio::log.error "Uninstalled fork as version does not match"
-      bashio::log.error "Update (or ask the author to update) the branch"
-      bashio::log.error "This is important as the dev addon and the dev ESPHome"
-      bashio::log.error "branch can have changes that are not compatible with old forks"
-      bashio::log.error "and get reported as bugs which we cannot solve easily."
-      bashio::log.error "############################"
-      bashio::exit.nok
-    fi
-    bashio::log.info "Installed ESPHome from fork '${esphome_fork}' (${full_url})..."
-fi

esphome/CHANGELOG.md

@@ -1,149 +1,12 @@
-## 2023.9.0
+## 2024.6.2
 
-## Full list of changes
-
-### New Components
-
-- Add pmwcs3 capacitive soil moisture & temperature sensor component [esphome#4624](https://github.com/esphome/esphome/pull/4624) by [@SeByDocKy](https://github.com/SeByDocKy) (new-integration)
-- Support for LibreTiny platform (RTL8710, BK7231 & other modules) [esphome#3509](https://github.com/esphome/esphome/pull/3509) by [@kuba2k2](https://github.com/kuba2k2) (new-integration)
-- Adding DFRobot Ozone Sensor Support (sen0321) [esphome#4782](https://github.com/esphome/esphome/pull/4782) by [@notjj](https://github.com/notjj) (new-integration)
-- Integration LightwaveRF switches [esphome#4812](https://github.com/esphome/esphome/pull/4812) by [@max246](https://github.com/max246) (new-integration)
-- Refactor SPI code; Add ESP-IDF hardware support [esphome#5311](https://github.com/esphome/esphome/pull/5311) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Add BMI160 support [esphome#5143](https://github.com/esphome/esphome/pull/5143) by [@flaviut](https://github.com/flaviut) (new-integration)
-- Native SPI RGB LED component [esphome#5288](https://github.com/esphome/esphome/pull/5288) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Wireguard component [esphome#4256](https://github.com/esphome/esphome/pull/4256) by [@lhoracek](https://github.com/lhoracek) (new-integration)
-
-### Breaking Changes
-
-- Synchronise Device Classes from Home Assistant [esphome#5328](https://github.com/esphome/esphome/pull/5328) by [@esphomebot](https://github.com/esphomebot) (breaking-change)
-- Use /data directory for .esphome folder when running as HA add-on [esphome#5374](https://github.com/esphome/esphome/pull/5374) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
-
-### Beta Changes
-
-- Add patch to apt install [esphome#5389](https://github.com/esphome/esphome/pull/5389) by [@synesthesiam](https://github.com/synesthesiam)
-- Fix Waveshare 7.5v2 epaper screens are always powered on [esphome#5283](https://github.com/esphome/esphome/pull/5283) by [@phoenixswiss](https://github.com/phoenixswiss)
-- Update radon_eye_listener.cpp [esphome#5401](https://github.com/esphome/esphome/pull/5401) by [@rmmacias](https://github.com/rmmacias)
-- Add shelly-dimmer-stm32 51.7 to known versions [esphome#5400](https://github.com/esphome/esphome/pull/5400) by [@trvrnrth](https://github.com/trvrnrth)
-- Add E-Trailer Gaslevel support to Mopeka Std Check [esphome#5397](https://github.com/esphome/esphome/pull/5397) by [@Phhere](https://github.com/Phhere)
-- fix disabled wifi power on 8266 [esphome#5409](https://github.com/esphome/esphome/pull/5409) by [@ssieb](https://github.com/ssieb)
-- fix handling of web server version [esphome#5405](https://github.com/esphome/esphome/pull/5405) by [@ssieb](https://github.com/ssieb)
-- Climate preset fix [esphome#5407](https://github.com/esphome/esphome/pull/5407) by [@Jorre05](https://github.com/Jorre05)
-- Remove Wi-Fi dependency from Midea component [esphome#5394](https://github.com/esphome/esphome/pull/5394) by [@AnthonyMaiorani](https://github.com/AnthonyMaiorani)
-- http_request: Cleanups and safety improvements [esphome#5360](https://github.com/esphome/esphome/pull/5360) by [@kpfleming](https://github.com/kpfleming)
-- Make the pulse meter timeout on startup when no pulses are received [esphome#5388](https://github.com/esphome/esphome/pull/5388) by [@TrentHouliston](https://github.com/TrentHouliston)
-- Wizard: fix colored text in input prompts [esphome#5313](https://github.com/esphome/esphome/pull/5313) by [@kuba2k2](https://github.com/kuba2k2)
-- support keypads with pulldowns [esphome#5404](https://github.com/esphome/esphome/pull/5404) by [@ssieb](https://github.com/ssieb)
-- Fix SPI inverted clock on ESP8266 [esphome#5416](https://github.com/esphome/esphome/pull/5416) by [@clydebarrow](https://github.com/clydebarrow)
-- [RP2040W] Fix WiFi bootloop upon LibreTiny support [esphome#5414](https://github.com/esphome/esphome/pull/5414) by [@hostcc](https://github.com/hostcc)
-- dallas: limit addresses to 64 bits [esphome#5413](https://github.com/esphome/esphome/pull/5413) by [@oddstr13](https://github.com/oddstr13)
-- Bump zeroconf from 0.108.0 to 0.112.0 [esphome#5392](https://github.com/esphome/esphome/pull/5392) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- LibreTiny: enable MQTT, bump to v1.4.1 [esphome#5419](https://github.com/esphome/esphome/pull/5419) by [@kuba2k2](https://github.com/kuba2k2)
-- Wireguard keepalive remove uint16 type [esphome#5430](https://github.com/esphome/esphome/pull/5430) by [@glmnet](https://github.com/glmnet)
-- Fix #4896 and #4903 [esphome#5433](https://github.com/esphome/esphome/pull/5433) by [@clydebarrow](https://github.com/clydebarrow)
-
-### All changes
-
-- Updated my username in Code Owners [esphome#5247](https://github.com/esphome/esphome/pull/5247) by [@mreditor97](https://github.com/mreditor97)
-- remote_base: change dumpers log level [esphome#5253](https://github.com/esphome/esphome/pull/5253) by [@dudanov](https://github.com/dudanov)
-- Add `libfreetype-dev` Debian package for armv7 Docker builds [esphome#5262](https://github.com/esphome/esphome/pull/5262) by [@pierlon](https://github.com/pierlon)
-- Add delay before enabling ipv6 [esphome#5256](https://github.com/esphome/esphome/pull/5256) by [@HeMan](https://github.com/HeMan)
-- Bump zeroconf from 0.74.0 to 0.80.0 [esphome#5260](https://github.com/esphome/esphome/pull/5260) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump click from 8.1.6 to 8.1.7 [esphome#5272](https://github.com/esphome/esphome/pull/5272) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Remove support for ESP-IDF version < 4 [esphome#5261](https://github.com/esphome/esphome/pull/5261) by [@HeMan](https://github.com/HeMan)
-- Add pmwcs3 capacitive soil moisture & temperature sensor component [esphome#4624](https://github.com/esphome/esphome/pull/4624) by [@SeByDocKy](https://github.com/SeByDocKy) (new-integration)
-- Add manufacturer data config to BLE server [esphome#5251](https://github.com/esphome/esphome/pull/5251) by [@clydebarrow](https://github.com/clydebarrow)
-- Add support for ESP32-{S2,S3,C3} to debug component [esphome#4731](https://github.com/esphome/esphome/pull/4731) by [@jayme-github](https://github.com/jayme-github)
-- Support for ESP32-C2 & ESP32-C6 [esphome#4377](https://github.com/esphome/esphome/pull/4377) by [@vidplace7](https://github.com/vidplace7)
-- Bump arduino-heatpumpir to v1.0.23 [esphome#5269](https://github.com/esphome/esphome/pull/5269) by [@rob-deutsch](https://github.com/rob-deutsch)
-- Fix equality check when setting current-based cover position [esphome#5167](https://github.com/esphome/esphome/pull/5167) by [@kroimon](https://github.com/kroimon)
-- Bump platformio from 6.1.9 to 6.1.10 [esphome#5237](https://github.com/esphome/esphome/pull/5237) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Add Invert method for SSD1306 [esphome#5292](https://github.com/esphome/esphome/pull/5292) by [@max246](https://github.com/max246)
-- Update PSRAM config params for IDF4+ [esphome#5298](https://github.com/esphome/esphome/pull/5298) by [@kbx81](https://github.com/kbx81)
-- Fix legacy zeroconf record update method [esphome#5294](https://github.com/esphome/esphome/pull/5294) by [@bdraco](https://github.com/bdraco)
-- Bump zeroconf from 0.80.0 to 0.86.0 [esphome#5308](https://github.com/esphome/esphome/pull/5308) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Add PSRAM mode and speed config [esphome#5312](https://github.com/esphome/esphome/pull/5312) by [@kbx81](https://github.com/kbx81)
-- Add extra SLPOUT for waking up some ST7789 chips [esphome#5319](https://github.com/esphome/esphome/pull/5319) by [@clydebarrow](https://github.com/clydebarrow)
-- 7789 controller fixes take 2 [esphome#5320](https://github.com/esphome/esphome/pull/5320) by [@clydebarrow](https://github.com/clydebarrow)
-- Bump Arduino Pico to 3.4.0 [esphome#5321](https://github.com/esphome/esphome/pull/5321) by [@HeMan](https://github.com/HeMan)
-- Use gzip compression for the web server component's static resources [esphome#5291](https://github.com/esphome/esphome/pull/5291) by [@EternityForest](https://github.com/EternityForest)
-- Bump zeroconf from 0.86.0 to 0.88.0 [esphome#5315](https://github.com/esphome/esphome/pull/5315) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Adding heating coil and fan icons, enum device_class [esphome#5325](https://github.com/esphome/esphome/pull/5325) by [@barndawgie](https://github.com/barndawgie)
-- Add dashboard API to get firmware binaries [esphome#4675](https://github.com/esphome/esphome/pull/4675) by [@kuba2k2](https://github.com/kuba2k2)
-- Make uart error message go away [esphome#5329](https://github.com/esphome/esphome/pull/5329) by [@clydebarrow](https://github.com/clydebarrow)
-- add heating functionality to SI7021 [esphome#4828](https://github.com/esphome/esphome/pull/4828) by [@max246](https://github.com/max246)
-- Bump esphome-dashboard to 20230904.0 [esphome#5339](https://github.com/esphome/esphome/pull/5339) by [@jesserockz](https://github.com/jesserockz)
-- Added Handling for Nack "file not found" [esphome#5338](https://github.com/esphome/esphome/pull/5338) by [@croessi](https://github.com/croessi)
-- Prepare api and time for ESP-IDF >= 5 [esphome#5332](https://github.com/esphome/esphome/pull/5332) by [@HeMan](https://github.com/HeMan)
-- Tweak Improv serial to build in IDF 5 [esphome#5331](https://github.com/esphome/esphome/pull/5331) by [@kbx81](https://github.com/kbx81)
-- Support for LibreTiny platform (RTL8710, BK7231 & other modules) [esphome#3509](https://github.com/esphome/esphome/pull/3509) by [@kuba2k2](https://github.com/kuba2k2) (new-integration)
-- Extend ESP32 CAN bit rates /bus speed support [esphome#5280](https://github.com/esphome/esphome/pull/5280) by [@mkaiser](https://github.com/mkaiser)
-- Debug component: add free PSRAM sensor [esphome#5334](https://github.com/esphome/esphome/pull/5334) by [@kahrendt](https://github.com/kahrendt)
-- libretiny: fix uart_port framework config [esphome#5343](https://github.com/esphome/esphome/pull/5343) by [@jesserockz](https://github.com/jesserockz)
-- Bump actions/checkout from 3 to 4 [esphome#5341](https://github.com/esphome/esphome/pull/5341) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Add Lilygo T-Embed to st7789v display config. [esphome#5337](https://github.com/esphome/esphome/pull/5337) by [@clydebarrow](https://github.com/clydebarrow)
-- Disable IPv6 when config explicitly says false [esphome#5310](https://github.com/esphome/esphome/pull/5310) by [@HeMan](https://github.com/HeMan)
-- Add defines.h to ethernet_component.h for ENABLE_IPV6 [esphome#5344](https://github.com/esphome/esphome/pull/5344) by [@kbx81](https://github.com/kbx81)
-- Synchronise Device Classes from Home Assistant [esphome#5328](https://github.com/esphome/esphome/pull/5328) by [@esphomebot](https://github.com/esphomebot) (breaking-change)
-- Bump pytest from 7.4.0 to 7.4.1 [esphome#5342](https://github.com/esphome/esphome/pull/5342) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Fixed default temperature step values for haier climate [esphome#5330](https://github.com/esphome/esphome/pull/5330) by [@paveldn](https://github.com/paveldn)
-- Add debug component to all tests [esphome#5333](https://github.com/esphome/esphome/pull/5333) by [@HeMan](https://github.com/HeMan)
-- Support MaxBotix XL in addition to HRXL [esphome#4510](https://github.com/esphome/esphome/pull/4510) by [@notjj](https://github.com/notjj)
-- Adding DFRobot Ozone Sensor Support (sen0321) [esphome#4782](https://github.com/esphome/esphome/pull/4782) by [@notjj](https://github.com/notjj) (new-integration)
-- mdns: bump IDF mdns component to 1.2.0 [esphome#5217](https://github.com/esphome/esphome/pull/5217) by [@stintel](https://github.com/stintel)
-- Integration LightwaveRF switches [esphome#4812](https://github.com/esphome/esphome/pull/4812) by [@max246](https://github.com/max246) (new-integration)
-- Bump flake8 from 6.0.0 to 6.1.0 [esphome#5171](https://github.com/esphome/esphome/pull/5171) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump tornado from 6.3.2 to 6.3.3 [esphome#5236](https://github.com/esphome/esphome/pull/5236) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump platformio from 6.1.10 to 6.1.11 [esphome#5323](https://github.com/esphome/esphome/pull/5323) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Only run ci-docker when ci-docker workflow changes [esphome#5347](https://github.com/esphome/esphome/pull/5347) by [@jesserockz](https://github.com/jesserockz)
-- esp32: Extra build customization [esphome#5322](https://github.com/esphome/esphome/pull/5322) by [@jesserockz](https://github.com/jesserockz)
-- Allow upload command to flash file via serial [esphome#5274](https://github.com/esphome/esphome/pull/5274) by [@jesserockz](https://github.com/jesserockz)
-- Allow "--device SERIAL" on cli to flash only via serial [esphome#5351](https://github.com/esphome/esphome/pull/5351) by [@jesserockz](https://github.com/jesserockz)
-- Fix PN532 for IDF 5 and ultralight enhancements [esphome#5352](https://github.com/esphome/esphome/pull/5352) by [@kbx81](https://github.com/kbx81)
-- Fix cpu_ll_get_cycle_count() deprecated warning [esphome#5353](https://github.com/esphome/esphome/pull/5353) by [@kbx81](https://github.com/kbx81)
-- Refactor SPI code; Add ESP-IDF hardware support [esphome#5311](https://github.com/esphome/esphome/pull/5311) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Bump actions/cache from 3.3.1 to 3.3.2 [esphome#5367](https://github.com/esphome/esphome/pull/5367) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump zeroconf from 0.88.0 to 0.102.0 [esphome#5368](https://github.com/esphome/esphome/pull/5368) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Fix repeat.count = 0 case [esphome#5364](https://github.com/esphome/esphome/pull/5364) by [@Xmister](https://github.com/Xmister)
-- Fix dashboard download for ESP32 variants [esphome#5355](https://github.com/esphome/esphome/pull/5355) by [@kuba2k2](https://github.com/kuba2k2)
-- Bump pytest from 7.4.1 to 7.4.2 [esphome#5357](https://github.com/esphome/esphome/pull/5357) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- [ADC] Support measuring VCC on Raspberry Pico (W) [esphome#5335](https://github.com/esphome/esphome/pull/5335) by [@hostcc](https://github.com/hostcc)
-- Move CONF_PHASE_A/B/C constants to const.py. [esphome#5304](https://github.com/esphome/esphome/pull/5304) by [@kpfleming](https://github.com/kpfleming)
-- Add BMI160 support [esphome#5143](https://github.com/esphome/esphome/pull/5143) by [@flaviut](https://github.com/flaviut) (new-integration)
-- Use black-pre-commit-mirror to speed up pre-commit runs. [esphome#5372](https://github.com/esphome/esphome/pull/5372) by [@kpfleming](https://github.com/kpfleming)
-- Native SPI RGB LED component [esphome#5288](https://github.com/esphome/esphome/pull/5288) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
-- Wireguard component [esphome#4256](https://github.com/esphome/esphome/pull/4256) by [@lhoracek](https://github.com/lhoracek) (new-integration)
-- Bump LibreTiny version to 1.4.0 [esphome#5375](https://github.com/esphome/esphome/pull/5375) by [@kuba2k2](https://github.com/kuba2k2)
-- time: Make std::string version of strftime() avoid runaway memory allocations [esphome#5348](https://github.com/esphome/esphome/pull/5348) by [@kpfleming](https://github.com/kpfleming)
-- Fix disabled wifi crash on boot [esphome#5370](https://github.com/esphome/esphome/pull/5370) by [@Xmister](https://github.com/Xmister)
-- debug: add ESP32-C6 support [esphome#5354](https://github.com/esphome/esphome/pull/5354) by [@stintel](https://github.com/stintel)
-- Make string globals persist-able using fixed size allocations [esphome#5296](https://github.com/esphome/esphome/pull/5296) by [@EternityForest](https://github.com/EternityForest)
-- Use /data directory for .esphome folder when running as HA add-on [esphome#5374](https://github.com/esphome/esphome/pull/5374) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
-- Bump zeroconf from 0.102.0 to 0.108.0 [esphome#5376](https://github.com/esphome/esphome/pull/5376) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Bump black from 23.7.0 to 23.9.1 [esphome#5377](https://github.com/esphome/esphome/pull/5377) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- Attempt to fix rp2040 adc with vcc [esphome#5378](https://github.com/esphome/esphome/pull/5378) by [@jesserockz](https://github.com/jesserockz)
-- Enable IPv6 for ESP8266 and Raspberry pi pico w (RP2040) [esphome#4759](https://github.com/esphome/esphome/pull/4759) by [@HeMan](https://github.com/HeMan)
-- Workflow updates [esphome#5384](https://github.com/esphome/esphome/pull/5384) by [@jesserockz](https://github.com/jesserockz)
-- Modbus Controller added some features [esphome#5318](https://github.com/esphome/esphome/pull/5318) by [@0x3333](https://github.com/0x3333)
-- Force heater off on setup [esphome#5161](https://github.com/esphome/esphome/pull/5161) by [@rufuswilson](https://github.com/rufuswilson)
-- Add IDF 5 test yaml, add adc to IDF tests, fix adc for IDF 5 [esphome#5379](https://github.com/esphome/esphome/pull/5379) by [@kbx81](https://github.com/kbx81)
-- Add patch to apt install [esphome#5389](https://github.com/esphome/esphome/pull/5389) by [@synesthesiam](https://github.com/synesthesiam)
-- Fix Waveshare 7.5v2 epaper screens are always powered on [esphome#5283](https://github.com/esphome/esphome/pull/5283) by [@phoenixswiss](https://github.com/phoenixswiss)
-- Update radon_eye_listener.cpp [esphome#5401](https://github.com/esphome/esphome/pull/5401) by [@rmmacias](https://github.com/rmmacias)
-- Add shelly-dimmer-stm32 51.7 to known versions [esphome#5400](https://github.com/esphome/esphome/pull/5400) by [@trvrnrth](https://github.com/trvrnrth)
-- Add E-Trailer Gaslevel support to Mopeka Std Check [esphome#5397](https://github.com/esphome/esphome/pull/5397) by [@Phhere](https://github.com/Phhere)
-- fix disabled wifi power on 8266 [esphome#5409](https://github.com/esphome/esphome/pull/5409) by [@ssieb](https://github.com/ssieb)
-- fix handling of web server version [esphome#5405](https://github.com/esphome/esphome/pull/5405) by [@ssieb](https://github.com/ssieb)
-- Climate preset fix [esphome#5407](https://github.com/esphome/esphome/pull/5407) by [@Jorre05](https://github.com/Jorre05)
-- Remove Wi-Fi dependency from Midea component [esphome#5394](https://github.com/esphome/esphome/pull/5394) by [@AnthonyMaiorani](https://github.com/AnthonyMaiorani)
-- http_request: Cleanups and safety improvements [esphome#5360](https://github.com/esphome/esphome/pull/5360) by [@kpfleming](https://github.com/kpfleming)
-- Make the pulse meter timeout on startup when no pulses are received [esphome#5388](https://github.com/esphome/esphome/pull/5388) by [@TrentHouliston](https://github.com/TrentHouliston)
-- Wizard: fix colored text in input prompts [esphome#5313](https://github.com/esphome/esphome/pull/5313) by [@kuba2k2](https://github.com/kuba2k2)
-- support keypads with pulldowns [esphome#5404](https://github.com/esphome/esphome/pull/5404) by [@ssieb](https://github.com/ssieb)
-- Fix SPI inverted clock on ESP8266 [esphome#5416](https://github.com/esphome/esphome/pull/5416) by [@clydebarrow](https://github.com/clydebarrow)
-- [RP2040W] Fix WiFi bootloop upon LibreTiny support [esphome#5414](https://github.com/esphome/esphome/pull/5414) by [@hostcc](https://github.com/hostcc)
-- dallas: limit addresses to 64 bits [esphome#5413](https://github.com/esphome/esphome/pull/5413) by [@oddstr13](https://github.com/oddstr13)
-- Bump zeroconf from 0.108.0 to 0.112.0 [esphome#5392](https://github.com/esphome/esphome/pull/5392) by [@dependabot[bot]](https://github.com/apps/dependabot)
-- LibreTiny: enable MQTT, bump to v1.4.1 [esphome#5419](https://github.com/esphome/esphome/pull/5419) by [@kuba2k2](https://github.com/kuba2k2)
-- Wireguard keepalive remove uint16 type [esphome#5430](https://github.com/esphome/esphome/pull/5430) by [@glmnet](https://github.com/glmnet)
-- Fix #4896 and #4903 [esphome#5433](https://github.com/esphome/esphome/pull/5433) by [@clydebarrow](https://github.com/clydebarrow)
+- [core] Fix package merging with lists of primitives [esphome#6952](https://github.com/esphome/esphome/pull/6952) by [@jesserockz](https://github.com/jesserockz)
+- [update] Set entity_category to config & Publish state to logs [esphome#6954](https://github.com/esphome/esphome/pull/6954) by [@jesserockz](https://github.com/jesserockz)
+- Fix infinite loop in http_request for ESP-IDF. [esphome#6963](https://github.com/esphome/esphome/pull/6963) by [@kpfleming](https://github.com/kpfleming)
+- ESP-IDF 4.x expects seconds for esp_task_wdt_init(), not milliseconds. [esphome#6964](https://github.com/esphome/esphome/pull/6964) by [@kpfleming](https://github.com/kpfleming)
+- Onewire [esphome#6967](https://github.com/esphome/esphome/pull/6967) by [@ssieb](https://github.com/ssieb)
+- [http_request] memory leak fix [esphome#6973](https://github.com/esphome/esphome/pull/6973) by [@gabest11](https://github.com/gabest11)
+- Await cg.get_variable in Update component [esphome#6974](https://github.com/esphome/esphome/pull/6974) by [@bkaufx](https://github.com/bkaufx)
+- [one-wire] fix potential hang [esphome#6976](https://github.com/esphome/esphome/pull/6976) by [@ssieb](https://github.com/ssieb)
+- [midea] fix fan speed compatibility with some models [esphome#6978](https://github.com/esphome/esphome/pull/6978) by [@dudanov](https://github.com/dudanov)
 

esphome/config.yaml

@@ -30,8 +30,9 @@ schema:
 backup_exclude:
 - '*/*/'
 init: false
+startup: services
 name: ESPHome
-version: 2023.9.0
+version: 2024.6.2
 slug: esphome
 description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
 image: ghcr.io/esphome/esphome-hassio

script/bump-version.py

@@ -2,7 +2,6 @@
 
 import argparse
 import re
-import subprocess
 from dataclasses import dataclass
 import sys
 import os
@@ -17,72 +16,71 @@ class Version:
     minor: int
     patch: int
     beta: int = 0
-    dev: bool = False
+    dev: str = ""
 
     def __str__(self):
-        return f'{self.major}.{self.minor}.{self.full_patch}'
+        return f"{self.major}.{self.minor}.{self.full_patch}"
 
     @property
     def full_patch(self):
-        res = f'{self.patch}'
+        res = f"{self.patch}"
         if self.beta > 0:
-            res += f'b{self.beta}'
+            res += f"b{self.beta}"
         if self.dev:
-            res += '-dev'
+            res += f"-dev{self.dev}"
         return res
 
     @classmethod
     def parse(cls, value):
-        match = re.match(r'(\d+).(\d+).(\d+)(b\d+)?(-dev)?', value)
+        match = re.match(r"(\d+).(\d+).(\d+)(b\d+)?(-dev\d+)?", value)
         assert match is not None
         major = int(match[1])
         minor = int(match[2])
         patch = int(match[3])
         beta = int(match[4][1:]) if match[4] else 0
-        dev = bool(match[5])
-        return Version(
-            major=major, minor=minor, patch=patch,
-            beta=beta, dev=dev
-        )
+        dev = str(match[5][4:]) if match[5] else ""
+        return Version(major=major, minor=minor, patch=patch, beta=beta, dev=dev)
 
 
-def sub(path, pattern, repl, expected_count=1):
-    with open(path) as fh:
+def _sub(path, pattern, repl, expected_count=1):
+    with open(path, encoding="utf-8") as fh:
         content = fh.read()
-    content, count = re.subn(pattern, repl, content, flags=re.MULTILINE)
+    content, count = re.subn(pattern, repl, content, flags=re.NOFLAG)
     if expected_count is not None:
         assert count == expected_count, f"Pattern {pattern} replacement failed!"
-    with open(path, "wt") as fh:
+    with open(path, "wt", encoding="utf-8") as fh:
         fh.write(content)
 
 
-def write_version(target: str, version: Version):
-    #  version: '1.14.5'  # BETA
-    #  version: '1.14.5'  # STABLE
-    sub(
-        'template/addon_config.yaml',
-        r"  version: '[^']+'  # {}".format(target.upper()),
-        f"  version: '{version}'  # {target.upper()}"
+def _write_version(target: str, version: Version):
+    #  version: "2024.5.0-dev20240412"  # DEV
+    #  version: "1.14.5"  # BETA
+    #  version: "1.14.5"  # STABLE
+    _sub(
+        "template/addon_config.yaml",
+        f'  version: "[^"]+"  # {target.upper()}',
+        f'  version: "{version}"  # {target.upper()}',
     )
 
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('new_version', type=str)
+    parser.add_argument("new_version", type=str)
     args = parser.parse_args()
 
     version = Version.parse(args.new_version)
-    assert not version.dev
 
     print(f"Bumping to {version}")
-    if version.beta:
-        write_version('beta', version)
-        generate.main(['beta'])
+    if version.dev:
+        _write_version("dev", version)
+        generate.main(["dev"])
+    elif version.beta:
+        _write_version("beta", version)
+        generate.main(["beta"])
     else:
-        assert not version.beta
-        write_version('stable', version)
-        write_version('beta', version)
-        generate.main(['stable', 'beta'])
+        _write_version("stable", version)
+        _write_version("beta", version)
+        generate.main(["stable", "beta"])
     return 0
 
 

script/generate.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 
 import argparse
-import yaml
 from pathlib import Path
 from enum import Enum
 from shutil import copyfile
 import sys
 import os
 
+import yaml
+
 
 class Channel(Enum):
     stable = "stable"
@@ -25,17 +26,16 @@ def main(args):
     root = Path(__file__).parent.parent
     templ = root / "template"
 
-    with open(templ / "addon_config.yaml", "r") as f:
+    with open(templ / "addon_config.yaml", "r", encoding="utf-8") as f:
         config = yaml.safe_load(f)
 
     copyf = config["copy_files"]
 
     for channel in args.channels:
         conf = config[f"esphome-{channel.value}"]
-        base_image = conf.pop("base_image", None)
         dir_ = root / conf.pop("directory")
         path = dir_ / "config.yaml"
-        with open(path, "w") as f:
+        with open(path, "w", encoding="utf-8") as f:
             yaml.dump(conf, f, indent=2, sort_keys=False, explicit_start=True)
 
         for file_ in copyf:
@@ -46,19 +46,9 @@ def main(args):
                 copyfile(templ / file_, dir_ / file_)
 
         path = dir_ / "FILES ARE GENERATED DO NOT EDIT"
-        with open(path, "w") as f:
+        with open(path, "w", encoding="utf-8") as f:
             f.write("Any edits should be made to the files in the 'template' directory")
 
-        if channel == Channel.dev:
-            path = dir_ / "build.yaml"
-            build_conf = {
-                "build_from": {
-                    arch: base_image for arch in conf["arch"]
-                }
-            }
-            with open(path, "w") as f:
-                yaml.dump(build_conf, f, indent=2, sort_keys=True, explicit_start=True)
-
 
 if __name__ == "__main__":
     main(sys.argv[1:])

template/addon_config.yaml

@@ -16,11 +16,11 @@ base: &base
   # Ingress settings
   ingress: true
   ingress_port: 0
-  panel_icon: 'mdi:chip'
+  panel_icon: "mdi:chip"
   # Automatically add UART devices to add-on
   uart: true
   ports:
-    '6052/tcp': null
+    "6052/tcp": null
   map:
     - ssl:ro
     - config:rw
@@ -39,15 +39,18 @@ base: &base
     - "*/*/"
   # Disable docker init for s6
   init: false
+  # Make sure dashboard is available for core
+  startup: services
 
 esphome-dev:
   <<: *base
   directory: esphome-dev
   name: ESPHome (dev)
-  version: 'dev'  # DEV
+  version: "2024.7.0-dev20240624"  # DEV
   slug: esphome-dev
   description: "Development version of ESPHome add-on"
   url: https://next.esphome.io/
+  image: ghcr.io/esphome/esphome-hassio
   stage: experimental
   advanced: true
   schema:
@@ -60,15 +63,14 @@ esphome-dev:
     certfile: str?
     keyfile: str?
     leave_front_door_open: bool?
-  base_image: ghcr.io/esphome/esphome-hassio:dev
   options:
-      home_assistant_dashboard_integration: false
+    home_assistant_dashboard_integration: false
 
 esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '2023.9.0'  # BETA
+  version: "2024.6.2"  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
@@ -76,13 +78,13 @@ esphome-beta:
   stage: experimental
   advanced: true
   options:
-      home_assistant_dashboard_integration: false
+    home_assistant_dashboard_integration: false
 
 esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '2023.9.0'  # STABLE
+  version: "2024.6.2"  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio