Bump version to 2024.3.0

Bump version to 2024.3.0b5
Bump version to 2024.3.0b4
2024-03-20 05:56:01 +00:00 · 2024-03-20 04:33:23 +00:00 · 2024-03-19 02:55:00 +00:00 · 2024-03-18 06:54:13 +00:00 · 2024-03-15 04:22:49 +00:00 · 2024-03-13 04:46:22 +00:00
69 changed files with 1263 additions and 730 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,15 @@
+FROM ghcr.io/home-assistant/devcontainer:addons
+
+RUN \
+  apt-get update \
+  && apt-get install -y --no-install-recommends \
+    python3-pip \
+    python3-venv
+
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+COPY script/requirements.txt /
+
+RUN pip install -r /requirements.txt
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,41 @@
+{
+  "name": "ESPHome Home Assistant add-on devcontainer",
+  "image": "ghcr.io/esphome/devcontainer:addons",
+  "appPort": [
+    "7123:8123",
+    "7357:4357"
+  ],
+  "postStartCommand": "bash devcontainer_bootstrap",
+  "runArgs": [
+    "-e",
+    "GIT_EDITOR=code --wait",
+    "--privileged"
+  ],
+  "containerEnv": {
+    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "timonwong.shellcheck",
+        "esbenp.prettier-vscode",
+        "ms-python.python"
+      ],
+      "mounts": [
+        "type=volume,target=/var/lib/docker"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh": {
+            "path": "/usr/bin/zsh"
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "zsh",
+        "editor.formatOnPaste": false,
+        "editor.formatOnSave": true,
+        "editor.formatOnType": true,
+        "files.trimTrailingWhitespace": true
+      }
+    }
+  }
+}
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -6,68 +6,54 @@ on:
      version:
        description: The version to release
        required: true
+      content:
+        description: The content of the release-notes
+        required: true

 jobs:
  create-release:
    runs-on: ubuntu-latest
+    continue-on-error: true
    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v4.1.1
+    - uses: actions/setup-python@v4.8.0
      with:
-        python-version: '3.x'
+        python-version: '3.11'
    - 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 }}
+
+        ${{ 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: 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 v${{ github.event.inputs.version }}"
+        git commit -m "Bump version to ${{ github.event.inputs.version }}"
        git push
        COMMIT=$(git rev-parse HEAD)
        echo "::set-output name=commit_sha::${COMMIT}"
-    - if: ${{ contains(github.event.inputs.version, 'b') }}
-      name: Create Beta Release
-      uses: actions/create-release@v1
+    - name: Create a Release
+      uses: actions/create-release@v1.1.4
+      continue-on-error: true
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
-        tag_name: v${{ github.event.inputs.version }}
+        tag_name: ${{ github.event.inputs.version }}
        release_name: ${{ github.event.inputs.version }}
-        body: 'See https://beta.esphome.io/changelog/index.html'
-        prerelease: true
+        body: ${{ github.event.inputs.content }}
+        prerelease: ${{ contains(github.event.inputs.version, 'b') }}
        commitish: ${{ steps.commit_version.outputs.commit_sha }}
-    - if: ${{ !contains(github.event.inputs.version, 'b') }}
-      name: Create Stable Release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: v${{ github.event.inputs.version }}
-        release_name: ${{ github.event.inputs.version }}
-        body: 'See https://esphome.io/changelog/index.html'
-        prerelease: false
-        commitish: ${{ steps.commit_version.outputs.commit_sha }}
-
-  deploy-community-addons:
-    runs-on: ubuntu-latest
-    needs: [create-release]
-    steps:
-    - name: Publish beta release to community-addons repository
-      run: |
-        docker run --rm hassioaddons/repository-updater:latest \
-          --repository hassio-addons/repository-beta \
-          --addon esphome \
-          --token "${TOKEN}"
-      env:
-        TOKEN: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
-    - if: ${{ !contains(github.event.inputs.version, 'b') }}
-      name: Publish stable release to community-addons repository
-      run: |
-        docker run --rm hassioaddons/repository-updater:latest \
-          --repository hassio-addons/repository \
-          --addon esphome \
-          --token "${TOKEN}"
-      env:
-        TOKEN: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
--- a/.github/workflows/devcontainer-build.yaml
+++ b/.github/workflows/devcontainer-build.yaml
@@ -0,0 +1,41 @@
+name: Build devcontainer image
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - .devcontainer/**
+  schedule:
+    - cron: '0 0 1 * *'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - .devcontainer/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@v3.0.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@v3.0.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+      - name: Build and Push
+        uses: docker/build-push-action@v5.1.0
+        with:
+          context: .
+          file: .devcontainer/Dockerfile
+          tags: ghcr.io/${{ github.repository_owner }}/devcontainer:addons
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,16 +19,16 @@ jobs:
            channel: dev
    steps:
      - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
      - name: 🛠 Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4.8.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
+        uses: frenck/action-addon-linter@v2.15.0
        with:
          path: "./${{ matrix.channels.folder }}"
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 __pycache__/
 *.py[cod]
 *$py.class
+venv/
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -0,0 +1,19 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start Home Assistant",
+      "type": "shell",
+      "command": "supervisor_run",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    }
+  ]
+}
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1 +1,179 @@
-See https://esphome.io/changelog/index.html
+## 2024.3.0
+
+## Full list of changes
+
+### New Components
+
+- New component: ADE7880 voltage/current/power/energy sensor [esphome#5242](https://github.com/esphome/esphome/pull/5242) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Add Uponor Smatrix component [esphome#5769](https://github.com/esphome/esphome/pull/5769) by [@kroimon](https://github.com/kroimon) (new-integration)
+- Support for MS8607 PHT (Pressure Humidity Temperature) sensor [esphome#3307](https://github.com/esphome/esphome/pull/3307) by [@e28eta](https://github.com/e28eta) (new-integration)
+- Add datetime date entities [esphome#6191](https://github.com/esphome/esphome/pull/6191) by [@RFDarter](https://github.com/RFDarter) (new-integration)
+- Add AGS10 Sensor [esphome#6070](https://github.com/esphome/esphome/pull/6070) by [@mak-42](https://github.com/mak-42) (new-integration)
+- ads1118 component [esphome#5711](https://github.com/esphome/esphome/pull/5711) by [@solomondg1](https://github.com/solomondg1) (new-integration)
+- Add CST816 touchscreen driver [esphome#5941](https://github.com/esphome/esphome/pull/5941) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- AM2315C Temperature + Humidity Sensor [esphome#6266](https://github.com/esphome/esphome/pull/6266) by [@swoboda1337](https://github.com/swoboda1337) (new-integration)
+- Touchscreen: add support for CST226 controller chip [esphome#6151](https://github.com/esphome/esphome/pull/6151) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- Drivers for RGB 16 bit parallel displays [esphome#5872](https://github.com/esphome/esphome/pull/5872) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- VEML7700 and VEML6030 light sensors [esphome#6067](https://github.com/esphome/esphome/pull/6067) by [@latonita](https://github.com/latonita) (new-integration)
+- Add Seeed Studio mmWave Kit MR24HPC1 [esphome#5761](https://github.com/esphome/esphome/pull/5761) by [@limengdu](https://github.com/limengdu) (new-integration)
+- Add driver for quad SPI AMOLED displays [esphome#6354](https://github.com/esphome/esphome/pull/6354) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- feat: Add HTU31D Support [esphome#5805](https://github.com/esphome/esphome/pull/5805) by [@betterengineering](https://github.com/betterengineering) (new-integration)
+- Emmeti infrared climate support [esphome#5197](https://github.com/esphome/esphome/pull/5197) by [@E440QF](https://github.com/E440QF) (new-integration)
+- Added Kamstrup Multical 40x component [esphome#4200](https://github.com/esphome/esphome/pull/4200) by [@cfeenstra1024](https://github.com/cfeenstra1024) (new-integration)
+
+### New Platforms
+
+- Additional sensors and binary sensors support for Haier Climate [esphome#6257](https://github.com/esphome/esphome/pull/6257) by [@paveldn](https://github.com/paveldn) (breaking-change) (new-platform)
+- add template fan [esphome#6310](https://github.com/esphome/esphome/pull/6310) by [@ssieb](https://github.com/ssieb) (breaking-change) (new-platform)
+
+### Breaking Changes
+
+- LTR390 - Multiple bugfixes [esphome#6161](https://github.com/esphome/esphome/pull/6161) by [@sjtrny](https://github.com/sjtrny) (breaking-change)
+- Touchscreen component and driver fixes [esphome#5997](https://github.com/esphome/esphome/pull/5997) by [@nielsnl68](https://github.com/nielsnl68) (breaking-change)
+- Additional sensors and binary sensors support for Haier Climate [esphome#6257](https://github.com/esphome/esphome/pull/6257) by [@paveldn](https://github.com/paveldn) (breaking-change) (new-platform)
+- add template fan [esphome#6310](https://github.com/esphome/esphome/pull/6310) by [@ssieb](https://github.com/ssieb) (breaking-change) (new-platform)
+
+### Beta Changes
+
+- SPI: Revert clk_pin to standard output pin schema [esphome#6368](https://github.com/esphome/esphome/pull/6368) by [@clydebarrow](https://github.com/clydebarrow)
+- Allow actions in web_server to be executed via GET method [esphome#5938](https://github.com/esphome/esphome/pull/5938) by [@afarago](https://github.com/afarago)
+- fix servo restore [esphome#6370](https://github.com/esphome/esphome/pull/6370) by [@ssieb](https://github.com/ssieb)
+- Don't try to get IPv6 addresses when disabled [esphome#6366](https://github.com/esphome/esphome/pull/6366) by [@HeMan](https://github.com/HeMan)
+- Use AQI device class [esphome#6376](https://github.com/esphome/esphome/pull/6376) by [@fgsch](https://github.com/fgsch)
+- Fix list-components when PR is not targeting dev [esphome#6375](https://github.com/esphome/esphome/pull/6375) by [@jesserockz](https://github.com/jesserockz)
+- allow negative ppm for sensair [esphome#6385](https://github.com/esphome/esphome/pull/6385) by [@ssieb](https://github.com/ssieb)
+- microWakeWord - add new ops and small improvements [esphome#6360](https://github.com/esphome/esphome/pull/6360) by [@kahrendt](https://github.com/kahrendt)
+- Fix compilation for uponor_smatrix without time component [esphome#6389](https://github.com/esphome/esphome/pull/6389) by [@kroimon](https://github.com/kroimon)
+- Shows component operation time in `ms` [esphome#6388](https://github.com/esphome/esphome/pull/6388) by [@edwardtfn](https://github.com/edwardtfn)
+- IPv6 can't be enabled for libretiny [esphome#6387](https://github.com/esphome/esphome/pull/6387) by [@HeMan](https://github.com/HeMan)
+- Replace name and friendly name in full adopted configs [esphome#4456](https://github.com/esphome/esphome/pull/4456) by [@jesserockz](https://github.com/jesserockz)
+- Fix bug in `remote_base` conditional [esphome#6281](https://github.com/esphome/esphome/pull/6281) by [@swoboda1337](https://github.com/swoboda1337)
+- Fix sending packets to uponor_smatrix devices [esphome#6392](https://github.com/esphome/esphome/pull/6392) by [@kroimon](https://github.com/kroimon)
+- Fix wrong initialization of vectors in ade7953_i2c [esphome#6393](https://github.com/esphome/esphome/pull/6393) by [@kroimon](https://github.com/kroimon)
+- ld2420: Firmware v1.5.4+ bug workaround [esphome#6168](https://github.com/esphome/esphome/pull/6168) by [@descipher](https://github.com/descipher)
+- Require xsrf/csrf when using a password [esphome#6396](https://github.com/esphome/esphome/pull/6396) by [@jesserockz](https://github.com/jesserockz)
+- AHT10: Use state machine to avoid blocking delay [esphome#6401](https://github.com/esphome/esphome/pull/6401) by [@clydebarrow](https://github.com/clydebarrow)
+- Show component warnings and errors in the log; [esphome#6400](https://github.com/esphome/esphome/pull/6400) by [@clydebarrow](https://github.com/clydebarrow)
+- web_server support for v3 [esphome#6203](https://github.com/esphome/esphome/pull/6203) by [@RFDarter](https://github.com/RFDarter)
+
+### All changes
+
+- Bump openssh-client to 1:9.2p1-2+deb12u2 [esphome#6216](https://github.com/esphome/esphome/pull/6216) by [@jesserockz](https://github.com/jesserockz)
+- Add support for 1.8V-powered devices [esphome#6234](https://github.com/esphome/esphome/pull/6234) by [@bisbastuner](https://github.com/bisbastuner)
+- Adjust HeatpumpIR dependency [esphome#6222](https://github.com/esphome/esphome/pull/6222) by [@ivankravets](https://github.com/ivankravets)
+- INA226 - fixed improper work with signed values, added configurable ADC parameters [esphome#6172](https://github.com/esphome/esphome/pull/6172) by [@latonita](https://github.com/latonita)
+- Prevent network config on rpipico board [esphome#5832](https://github.com/esphome/esphome/pull/5832) by [@carlosV2](https://github.com/carlosV2)
+- Bump pytest-asyncio from 0.23.3 to 0.23.5 [esphome#6201](https://github.com/esphome/esphome/pull/6201) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- New component: ADE7880 voltage/current/power/energy sensor [esphome#5242](https://github.com/esphome/esphome/pull/5242) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Add some components to the new testing framework (D) [esphome#6175](https://github.com/esphome/esphome/pull/6175) by [@kbx81](https://github.com/kbx81)
+- Provide example devcontainer config for mdns and USB passthrough [esphome#6094](https://github.com/esphome/esphome/pull/6094) by [@linkedupbits](https://github.com/linkedupbits)
+- Bump black from 23.12.1 to 24.2.0 [esphome#6221](https://github.com/esphome/esphome/pull/6221) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest from 7.4.4 to 8.0.1 [esphome#6246](https://github.com/esphome/esphome/pull/6246) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump codecov/codecov-action from 3 to 4 [esphome#6160](https://github.com/esphome/esphome/pull/6160) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump peter-evans/create-pull-request from 5.0.2 to 6.0.0 [esphome#6159](https://github.com/esphome/esphome/pull/6159) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump frenck/action-yamllint from 1.4.2 to 1.5.0 [esphome#6236](https://github.com/esphome/esphome/pull/6236) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump voluptuous from 0.14.1 to 0.14.2 [esphome#6181](https://github.com/esphome/esphome/pull/6181) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pyupgrade from 3.15.0 to 3.15.1 [esphome#6247](https://github.com/esphome/esphome/pull/6247) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- LTR390 - Multiple bugfixes [esphome#6161](https://github.com/esphome/esphome/pull/6161) by [@sjtrny](https://github.com/sjtrny) (breaking-change)
+- Fix yamllint [esphome#6253](https://github.com/esphome/esphome/pull/6253) by [@jesserockz](https://github.com/jesserockz)
+- Improve the error message on OTA version mismatch [esphome#6259](https://github.com/esphome/esphome/pull/6259) by [@sybrenstuvel](https://github.com/sybrenstuvel)
+- Bump aioesphomeapi from 21.0.2 to 22.0.0 [esphome#6263](https://github.com/esphome/esphome/pull/6263) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Allow ESP8266 to use multiple i2c busses [esphome#6145](https://github.com/esphome/esphome/pull/6145) by [@LouDou](https://github.com/LouDou)
+- Add Uponor Smatrix component [esphome#5769](https://github.com/esphome/esphome/pull/5769) by [@kroimon](https://github.com/kroimon) (new-integration)
+- Fix test_build_components for macOS sed [esphome#6278](https://github.com/esphome/esphome/pull/6278) by [@kbx81](https://github.com/kbx81)
+- Allow to specify global build directory [esphome#6276](https://github.com/esphome/esphome/pull/6276) by [@werwolfby](https://github.com/werwolfby)
+- Add device class support to text sensor [esphome#6202](https://github.com/esphome/esphome/pull/6202) by [@dougiteixeira](https://github.com/dougiteixeira)
+- Bump pytest from 8.0.1 to 8.0.2 [esphome#6288](https://github.com/esphome/esphome/pull/6288) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Improve dualstack and IPv6 support [esphome#5449](https://github.com/esphome/esphome/pull/5449) by [@HeMan](https://github.com/HeMan)
+- Waveshare e-ink 2IN9_V2 - fix full and partial update based on vendor… [esphome#5481](https://github.com/esphome/esphome/pull/5481) by [@darianndd](https://github.com/darianndd)
+- Add RTTTL volume control. [esphome#5968](https://github.com/esphome/esphome/pull/5968) by [@nielsnl68](https://github.com/nielsnl68)
+- Touchscreen component and driver fixes [esphome#5997](https://github.com/esphome/esphome/pull/5997) by [@nielsnl68](https://github.com/nielsnl68) (breaking-change)
+- Add `on_update` trigger for Project versions [esphome#6298](https://github.com/esphome/esphome/pull/6298) by [@jesserockz](https://github.com/jesserockz)
+- Bump peter-evans/create-pull-request from 6.0.0 to 6.0.1 [esphome#6302](https://github.com/esphome/esphome/pull/6302) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- CSE7766 Apparent Power & Power Factor calculations [esphome#6292](https://github.com/esphome/esphome/pull/6292) by [@DAVe3283](https://github.com/DAVe3283)
+- Adding W5500 support to ethernet component [esphome#4424](https://github.com/esphome/esphome/pull/4424) by [@JeroenVanOort](https://github.com/JeroenVanOort)
+- Fix numbering of ip_address sensors [esphome#6305](https://github.com/esphome/esphome/pull/6305) by [@HeMan](https://github.com/HeMan)
+- Bump aioesphomeapi from 22.0.0 to 23.0.0 [esphome#6293](https://github.com/esphome/esphome/pull/6293) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Add regular polygon shapes to display component [esphome#6108](https://github.com/esphome/esphome/pull/6108) by [@mathieu-mp](https://github.com/mathieu-mp)
+- Fix return value in `core/automation.h` [esphome#6314](https://github.com/esphome/esphome/pull/6314) by [@FlyingFeng2021](https://github.com/FlyingFeng2021)
+- aht10: Added new CMD and renamed existing CMD to match datasheet [esphome#6303](https://github.com/esphome/esphome/pull/6303) by [@cptskippy](https://github.com/cptskippy)
+- handling with the negative temperature in the sensor tmp102 [esphome#6316](https://github.com/esphome/esphome/pull/6316) by [@FlyingFeng2021](https://github.com/FlyingFeng2021)
+- x9c: fix off by 1 error [esphome#6318](https://github.com/esphome/esphome/pull/6318) by [@andynumber2](https://github.com/andynumber2)
+- Support for MS8607 PHT (Pressure Humidity Temperature) sensor [esphome#3307](https://github.com/esphome/esphome/pull/3307) by [@e28eta](https://github.com/e28eta) (new-integration)
+- Separate logger implementations for each hardware platform into different files [esphome#6167](https://github.com/esphome/esphome/pull/6167) by [@tomaszduda23](https://github.com/tomaszduda23)
+- Additional sensors and binary sensors support for Haier Climate [esphome#6257](https://github.com/esphome/esphome/pull/6257) by [@paveldn](https://github.com/paveldn) (breaking-change) (new-platform)
+- Add toggle command to cover web_server endpoint [esphome#6319](https://github.com/esphome/esphome/pull/6319) by [@heythisisnate](https://github.com/heythisisnate)
+- Improv: support connecting to hidden networks [esphome#6322](https://github.com/esphome/esphome/pull/6322) by [@jesserockz](https://github.com/jesserockz)
+- Update mDNS for IDF >= 5.0 [esphome#6328](https://github.com/esphome/esphome/pull/6328) by [@HeMan](https://github.com/HeMan)
+- DFPlayer: refix Bug created with PR 4758 [esphome#5861](https://github.com/esphome/esphome/pull/5861) by [@sandronidi](https://github.com/sandronidi)
+- Fix build failures on host platform caused by #6167 [esphome#6338](https://github.com/esphome/esphome/pull/6338) by [@clydebarrow](https://github.com/clydebarrow)
+- Update bang_bang to log two decimal places in config dump [esphome#6304](https://github.com/esphome/esphome/pull/6304) by [@rafalw1277](https://github.com/rafalw1277)
+- Add datetime date entities [esphome#6191](https://github.com/esphome/esphome/pull/6191) by [@RFDarter](https://github.com/RFDarter) (new-integration)
+- Add AGS10 Sensor [esphome#6070](https://github.com/esphome/esphome/pull/6070) by [@mak-42](https://github.com/mak-42) (new-integration)
+- Bump aioesphomeapi from 23.0.0 to 23.1.0 [esphome#6332](https://github.com/esphome/esphome/pull/6332) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest-asyncio from 0.23.5 to 0.23.5.post1 [esphome#6334](https://github.com/esphome/esphome/pull/6334) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump docker/setup-buildx-action from 3.0.0 to 3.1.0 [esphome#6295](https://github.com/esphome/esphome/pull/6295) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Set dependabot to look at composite actions versions [esphome#6343](https://github.com/esphome/esphome/pull/6343) by [@jesserockz](https://github.com/jesserockz)
+- ads1118 component [esphome#5711](https://github.com/esphome/esphome/pull/5711) by [@solomondg1](https://github.com/solomondg1) (new-integration)
+- Bump actions/cache from 4.0.0 to 4.0.1 [esphome#6306](https://github.com/esphome/esphome/pull/6306) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump docker/build-push-action from 5.0.0 to 5.2.0 in /.github/actions/build-image [esphome#6347](https://github.com/esphome/esphome/pull/6347) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- fix: modbus_textsensor response is too long in some cases [esphome#6333](https://github.com/esphome/esphome/pull/6333) by [@NewoPL](https://github.com/NewoPL)
+- add template fan [esphome#6310](https://github.com/esphome/esphome/pull/6310) by [@ssieb](https://github.com/ssieb) (breaking-change) (new-platform)
+- dump config after logging CDC port is opened by host [esphome#6169](https://github.com/esphome/esphome/pull/6169) by [@tomaszduda23](https://github.com/tomaszduda23)
+- Add IRK support to allow tracking of devices with random MAC addresses [esphome#6335](https://github.com/esphome/esphome/pull/6335) by [@chbmuc](https://github.com/chbmuc)
+- [Fingerprint_grow] Implements Sleep Mode feature [esphome#6116](https://github.com/esphome/esphome/pull/6116) by [@alexborro](https://github.com/alexborro)
+- cleanup ili9xxx component by removing data rate define [esphome#6350](https://github.com/esphome/esphome/pull/6350) by [@nielsnl68](https://github.com/nielsnl68)
+- web_server_idf: support x-www-form-urlencoded POST requests [esphome#6037](https://github.com/esphome/esphome/pull/6037) by [@dentra](https://github.com/dentra)
+- feat(MQTT): Add QoS option for each MQTT component [esphome#6279](https://github.com/esphome/esphome/pull/6279) by [@Rapsssito](https://github.com/Rapsssito)
+- Check permissions [esphome#6255](https://github.com/esphome/esphome/pull/6255) by [@OdileVidrine](https://github.com/OdileVidrine)
+- Add CST816 touchscreen driver [esphome#5941](https://github.com/esphome/esphome/pull/5941) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- ILI9XXX: Lazily allocate buffer [esphome#6352](https://github.com/esphome/esphome/pull/6352) by [@clydebarrow](https://github.com/clydebarrow)
+- AM2315C Temperature + Humidity Sensor [esphome#6266](https://github.com/esphome/esphome/pull/6266) by [@swoboda1337](https://github.com/swoboda1337) (new-integration)
+- Add ble_presence binary sensor timeout config value. [esphome#6024](https://github.com/esphome/esphome/pull/6024) by [@clydebarrow](https://github.com/clydebarrow)
+- Add state listeners to `rotary_encoder` [esphome#6035](https://github.com/esphome/esphome/pull/6035) by [@clydebarrow](https://github.com/clydebarrow)
+- ili9xxx: Add support for GC9A01A display [esphome#6351](https://github.com/esphome/esphome/pull/6351) by [@clydebarrow](https://github.com/clydebarrow)
+- Touchscreen: add support for CST226 controller chip [esphome#6151](https://github.com/esphome/esphome/pull/6151) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- font: add anti-aliasing and other features [esphome#6198](https://github.com/esphome/esphome/pull/6198) by [@clydebarrow](https://github.com/clydebarrow)
+- Mhz19 warmup [esphome#6214](https://github.com/esphome/esphome/pull/6214) by [@fornellas](https://github.com/fornellas)
+- Refactor ATM90E32 to reduce blocking time and improve accuracy. [esphome#5670](https://github.com/esphome/esphome/pull/5670) by [@descipher](https://github.com/descipher)
+- Bump aioesphomeapi from 23.1.0 to 23.1.1 [esphome#6348](https://github.com/esphome/esphome/pull/6348) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest from 8.0.2 to 8.1.1 [esphome#6346](https://github.com/esphome/esphome/pull/6346) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Add support for Waveshare 2.13" V2 display [esphome#6337](https://github.com/esphome/esphome/pull/6337) by [@manuelkasper](https://github.com/manuelkasper)
+- Mitsubishi Climate updates [esphome#3886](https://github.com/esphome/esphome/pull/3886) by [@RubyBailey](https://github.com/RubyBailey)
+- Drivers for RGB 16 bit parallel displays [esphome#5872](https://github.com/esphome/esphome/pull/5872) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- hydreon_rgxx - add resolution option [esphome#6077](https://github.com/esphome/esphome/pull/6077) by [@mrtoy-me](https://github.com/mrtoy-me)
+- SPI schema now uses typed_schema with `type` key  [esphome#6353](https://github.com/esphome/esphome/pull/6353) by [@clydebarrow](https://github.com/clydebarrow)
+- VEML7700 and VEML6030 light sensors [esphome#6067](https://github.com/esphome/esphome/pull/6067) by [@latonita](https://github.com/latonita) (new-integration)
+- Add Seeed Studio mmWave Kit MR24HPC1 [esphome#5761](https://github.com/esphome/esphome/pull/5761) by [@limengdu](https://github.com/limengdu) (new-integration)
+- Add getter for font glyph data [esphome#6355](https://github.com/esphome/esphome/pull/6355) by [@clydebarrow](https://github.com/clydebarrow)
+- Require reset_pin for certain waveshare_epaper models in YAML validation [esphome#6357](https://github.com/esphome/esphome/pull/6357) by [@manuelkasper](https://github.com/manuelkasper)
+- touchscreen driver fixes [esphome#6356](https://github.com/esphome/esphome/pull/6356) by [@clydebarrow](https://github.com/clydebarrow)
+- Make USE_HOST compilable on msys2 [esphome#6359](https://github.com/esphome/esphome/pull/6359) by [@maruel](https://github.com/maruel)
+- download font from url on build [esphome#5254](https://github.com/esphome/esphome/pull/5254) by [@landonr](https://github.com/landonr)
+- Add driver for quad SPI AMOLED displays [esphome#6354](https://github.com/esphome/esphome/pull/6354) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- ADE7953: Add the ability to use accumulating energy registers, more precise power reporting [esphome#6311](https://github.com/esphome/esphome/pull/6311) by [@isorin](https://github.com/isorin)
+- feat: Add HTU31D Support [esphome#5805](https://github.com/esphome/esphome/pull/5805) by [@betterengineering](https://github.com/betterengineering) (new-integration)
+- Emmeti infrared climate support [esphome#5197](https://github.com/esphome/esphome/pull/5197) by [@E440QF](https://github.com/E440QF) (new-integration)
+- Added Kamstrup Multical 40x component [esphome#4200](https://github.com/esphome/esphome/pull/4200) by [@cfeenstra1024](https://github.com/cfeenstra1024) (new-integration)
+- add possibility to provide different conversion times for Bus Voltage… [esphome#6327](https://github.com/esphome/esphome/pull/6327) by [@kev300](https://github.com/kev300)
+- SPI: Revert clk_pin to standard output pin schema [esphome#6368](https://github.com/esphome/esphome/pull/6368) by [@clydebarrow](https://github.com/clydebarrow)
+- Allow actions in web_server to be executed via GET method [esphome#5938](https://github.com/esphome/esphome/pull/5938) by [@afarago](https://github.com/afarago)
+- fix servo restore [esphome#6370](https://github.com/esphome/esphome/pull/6370) by [@ssieb](https://github.com/ssieb)
+- Don't try to get IPv6 addresses when disabled [esphome#6366](https://github.com/esphome/esphome/pull/6366) by [@HeMan](https://github.com/HeMan)
+- Use AQI device class [esphome#6376](https://github.com/esphome/esphome/pull/6376) by [@fgsch](https://github.com/fgsch)
+- Fix list-components when PR is not targeting dev [esphome#6375](https://github.com/esphome/esphome/pull/6375) by [@jesserockz](https://github.com/jesserockz)
+- allow negative ppm for sensair [esphome#6385](https://github.com/esphome/esphome/pull/6385) by [@ssieb](https://github.com/ssieb)
+- microWakeWord - add new ops and small improvements [esphome#6360](https://github.com/esphome/esphome/pull/6360) by [@kahrendt](https://github.com/kahrendt)
+- Fix compilation for uponor_smatrix without time component [esphome#6389](https://github.com/esphome/esphome/pull/6389) by [@kroimon](https://github.com/kroimon)
+- Shows component operation time in `ms` [esphome#6388](https://github.com/esphome/esphome/pull/6388) by [@edwardtfn](https://github.com/edwardtfn)
+- IPv6 can't be enabled for libretiny [esphome#6387](https://github.com/esphome/esphome/pull/6387) by [@HeMan](https://github.com/HeMan)
+- Replace name and friendly name in full adopted configs [esphome#4456](https://github.com/esphome/esphome/pull/4456) by [@jesserockz](https://github.com/jesserockz)
+- Fix bug in `remote_base` conditional [esphome#6281](https://github.com/esphome/esphome/pull/6281) by [@swoboda1337](https://github.com/swoboda1337)
+- Fix sending packets to uponor_smatrix devices [esphome#6392](https://github.com/esphome/esphome/pull/6392) by [@kroimon](https://github.com/kroimon)
+- Fix wrong initialization of vectors in ade7953_i2c [esphome#6393](https://github.com/esphome/esphome/pull/6393) by [@kroimon](https://github.com/kroimon)
+- ld2420: Firmware v1.5.4+ bug workaround [esphome#6168](https://github.com/esphome/esphome/pull/6168) by [@descipher](https://github.com/descipher)
+- Require xsrf/csrf when using a password [esphome#6396](https://github.com/esphome/esphome/pull/6396) by [@jesserockz](https://github.com/jesserockz)
+- AHT10: Use state machine to avoid blocking delay [esphome#6401](https://github.com/esphome/esphome/pull/6401) by [@clydebarrow](https://github.com/clydebarrow)
+- Show component warnings and errors in the log; [esphome#6400](https://github.com/esphome/esphome/pull/6400) by [@clydebarrow](https://github.com/clydebarrow)
+- web_server support for v3 [esphome#6203](https://github.com/esphome/esphome/pull/6203) by [@RFDarter](https://github.com/RFDarter)
+
--- a/esphome-beta/DOCS.md
+++ b/esphome-beta/DOCS.md
@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation

 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
@@ -51,15 +50,6 @@ The private key file to use for SSL. If this file doesn't exist, the add-on star
 Adding this option to the add-on configuration allows you to disable
 authentication by setting it to `true`.

-### Option: `esphome_version`
-
-Manually override which ESPHome version to use in the add-on.
-For example to install the latest development version, use `"esphome_version": "dev"`,
-or for version 1.14.0: `"esphome_version": "v1.14.0""`.
-
-Please note that this does not always work and is only meant for testing, usually the
-ESPHome add-on and dashboard version must match to guarantee a working system.
-
 ### Option: `relative_url`

 Host the ESPHome dashboard under a relative URL, so that it can be integrated
--- a/esphome-beta/README.md
+++ b/esphome-beta/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Beta Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/
--- a/esphome-beta/config.json
+++ b/esphome-beta/config.json
@@ -1,44 +0,0 @@
-{
-  "arch": [
-    "amd64",
-    "armv7",
-    "aarch64"
-  ],
-  "auth_api": true,
-  "description": "Beta version of ESPHome add-on",
-  "hassio_api": true,
-  "host_network": true,
-  "image": "esphome/esphome-hassio-{arch}",
-  "ingress": true,
-  "ingress_port": 0,
-  "map": [
-    "ssl:ro",
-    "config:rw"
-  ],
-  "name": "ESPHome (beta)",
-  "panel_icon": "mdi:chip",
-  "ports": {
-    "6052/tcp": null
-  },
-  "ports_description": {
-    "6052/tcp": "Web interface (not required for Home Assistant ingress)"
-  },
-  "schema": {
-    "certfile": "str?",
-    "esphome_version": "str?",
-    "keyfile": "str?",
-    "leave_front_door_open": "bool?",
-    "relative_url": "str?",
-    "ssl": "bool?",
-    "status_use_ping": "bool?",
-    "streamer_mode": "bool?"
-  },
-  "slug": "esphome-beta",
-  "snapshot_exclude": [
-    "*/*/"
-  ],
-  "stage": "experimental",
-  "uart": true,
-  "url": "https://beta.esphome.io/",
-  "version": "1.20.3"
-}
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -0,0 +1,42 @@
+---
+url: https://beta.esphome.io/
+arch:
+- amd64
+- armv7
+- aarch64
+hassio_api: true
+auth_api: true
+host_network: true
+ingress: true
+ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
+map:
+- ssl:ro
+- config:rw
+discovery:
+- esphome
+schema:
+  status_use_ping: bool?
+  streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+startup: services
+name: ESPHome (beta)
+version: 2024.3.0
+slug: esphome-beta
+description: Beta version of ESPHome add-on
+image: ghcr.io/esphome/esphome-hassio
+stage: experimental
+advanced: true
+options:
+  home_assistant_dashboard_integration: false
--- a/esphome-beta/images/dht-example.png
+++ b/esphome-beta/images/dht-example.png
--- a/esphome-beta/images/screenshot.png
+++ b/esphome-beta/images/screenshot.png
--- a/esphome-beta/images/temperature-humidity.png
+++ b/esphome-beta/images/temperature-humidity.png
--- a/esphome-beta/logo.png
+++ b/esphome-beta/logo.png
--- a/esphome-beta/translations/en.yaml
+++ b/esphome-beta/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)
--- a/esphome-dev/CHANGELOG.md
+++ b/esphome-dev/CHANGELOG.md
--- a/esphome-dev/DOCS.md
+++ b/esphome-dev/DOCS.md
@@ -1,30 +1,31 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome DEV add on

-## Installation
+This is **development** version of the ESPHome add on.

-The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
+To deploy production nodes please use mainstream release add on.

-1. Search for the “ESPHome” add-on in the Supervisor add-on store.
-2. Press install to download the add-on and unpack it on your machine. This can take some time.
-3. Optional: If you're using SSL/TLS certificates and want to encrypt your communication to this add-on, please enter `true` into the `ssl` field and set the `fullchain` and `certfile` options accordingly.
-4. Start the add-on, check the logs of the add-on to see if everything went well.
-5. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Home Assistant's authentication system to log you in.
-
-You can view the ESPHome documentation at https://esphome.io/
+The add on uses a version of ESPHome built automatically every day at 02:00 UTC. and is used to test components in development. See the `esphome_fork` configuration below to properly configure the add on. Once you update the configuration make sure to rebuild the image.

 ## Configuration

 **Note**: _Remember to restart the add-on when the configuration is changed._

-Example add-on configuration:
+### Option: `esphome_fork`

-```json
-{
-  "ssl": false,
-  "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem"
-}
-```
+Install ESPHome from a fork or branch.
+For example to test a pull request, use `pull/XXXX/head` where `XXXX` is the PR number,
+or you can specify the username of the fork owner and branch `username:branch` which
+assumes the repository is named `esphome` still.
+
+If you need to test the latest commit on dev branch before the image is updated you can enter `dev` here.
+
+Please note that the fork or branch you are using **must** be up to date with ESPHome dev
+or the add-on **will not start**.
+
+
+## General ESPHome add on configurations
+
+General options also available in other versions.

 ### Option: `ssl`

@@ -51,15 +52,6 @@ The private key file to use for SSL. If this file doesn't exist, the add-on star
 Adding this option to the add-on configuration allows you to disable
 authentication by setting it to `true`.

-### Option: `esphome_version`
-
-Manually override which ESPHome version to use in the add-on.
-For example to install the latest development version, use `"esphome_version": "dev"`,
-or for version 1.14.0: `"esphome_version": "v1.14.0""`.
-
-Please note that this does not always work and is only meant for testing, usually the
-ESPHome add-on and dashboard version must match to guarantee a working system.
-
 ### Option: `relative_url`

 Host the ESPHome dashboard under a relative URL, so that it can be integrated
--- a/esphome-dev/Dockerfile
+++ b/esphome-dev/Dockerfile
@@ -1,17 +1,10 @@
-ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:2.0.0
+ARG BUILD_FROM=esphome/esphome-hassio-amd64:dev
 FROM ${BUILD_FROM}

 # Copy root filesystem
 COPY rootfs /

-RUN pip3 install --no-cache-dir https://github.com/esphome/esphome/archive/dev.zip
-
-# Build arguments
-ARG BUILD_VERSION=dev
-
 # Labels
 LABEL \
-    io.hass.name="ESPHome" \
-    io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
    io.hass.type="addon" \
    io.hass.version=dev
--- a/esphome-dev/README.md
+++ b/esphome-dev/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Dev Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/
--- a/esphome-dev/build.json
+++ b/esphome-dev/build.json
@@ -1,7 +0,0 @@
-{
-  "build_from": {
-    "aarch64": "esphome/esphome-hassio-base-aarch64:3.1.0",
-    "amd64": "esphome/esphome-hassio-base-amd64:3.1.0",
-    "armv7": "esphome/esphome-hassio-base-armv7:3.1.0"
-  }
-}
--- a/esphome-dev/build.yaml
+++ b/esphome-dev/build.yaml
@@ -0,0 +1,5 @@
+---
+build_from:
+  aarch64: ghcr.io/esphome/esphome-hassio:dev
+  amd64: ghcr.io/esphome/esphome-hassio:dev
+  armv7: ghcr.io/esphome/esphome-hassio:dev
--- a/esphome-dev/config.json
+++ b/esphome-dev/config.json
@@ -1,46 +0,0 @@
-{
-  "arch": [
-    "amd64",
-    "armv7",
-    "aarch64"
-  ],
-  "auth_api": true,
-  "description": "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files",
-  "hassio_api": true,
-  "host_network": true,
-  "ingress": true,
-  "ingress_port": 0,
-  "map": [
-    "ssl:ro",
-    "config:rw"
-  ],
-  "name": "ESPHome (dev)",
-  "options": {
-    "esphome_version": "dev"
-  },
-  "panel_icon": "mdi:chip",
-  "ports": {
-    "6052/tcp": null
-  },
-  "ports_description": {
-    "6052/tcp": "Web interface (Not required for Home Assistant Ingress)"
-  },
-  "schema": {
-    "certfile": "str?",
-    "esphome_version": "str?",
-    "keyfile": "str?",
-    "leave_front_door_open": "bool?",
-    "relative_url": "str?",
-    "ssl": "bool?",
-    "status_use_ping": "bool?",
-    "streamer_mode": "bool?"
-  },
-  "slug": "esphome-dev",
-  "snapshot_exclude": [
-    "*/*/"
-  ],
-  "stage": "experimental",
-  "uart": true,
-  "url": "https://next.esphome.io/",
-  "version": "dev"
-}
--- a/esphome-dev/config.yaml
+++ b/esphome-dev/config.yaml
@@ -0,0 +1,42 @@
+---
+url: https://next.esphome.io/
+arch:
+- amd64
+- armv7
+- aarch64
+hassio_api: true
+auth_api: true
+host_network: true
+ingress: true
+ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
+map:
+- ssl:ro
+- config:rw
+discovery:
+- esphome
+schema:
+  status_use_ping: bool?
+  streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  esphome_fork: str?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+startup: services
+name: ESPHome (dev)
+version: dev
+slug: esphome-dev
+description: Development version of ESPHome add-on
+stage: experimental
+advanced: true
+options:
+  home_assistant_dashboard_integration: false
--- a/esphome-dev/logo.png
+++ b/esphome-dev/logo.png
--- a/esphome-dev/rootfs/etc/cont-init.d/10-requirements.sh
+++ b/esphome-dev/rootfs/etc/cont-init.d/10-requirements.sh
@@ -1,41 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files check if all user configuration requirements are met
-# ==============================================================================
-
-# Check SSL requirements, if enabled
-if bashio::config.true 'ssl'; then
-    if ! bashio::config.has_value 'certfile'; then
-        bashio::fatal 'SSL is enabled, but no certfile was specified.'
-        bashio::exit.nok
-    fi
-
-    if ! bashio::config.has_value 'keyfile'; then
-        bashio::fatal 'SSL is enabled, but no keyfile was specified'
-        bashio::exit.nok
-    fi
-
-
-    certfile="/ssl/$(bashio::config 'certfile')"
-    keyfile="/ssl/$(bashio::config 'keyfile')"
-
-    if ! bashio::fs.file_exists "${certfile}"; then
-        if ! bashio::fs.file_exists "${keyfile}"; then
-            # Both files are missing, let's print a friendlier error message
-            bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
-            bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
-            bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
-            bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
-            bashio::log.fatal 'SSL by setting "ssl" to false."'
-            bashio::exit.nok
-        fi
-        bashio::log.fatal "The configured certfile '${certfile}' was not found."
-        bashio::exit.nok
-    fi
-
-    if ! bashio::fs.file_exists "/ssl/$(bashio::config 'keyfile')"; then
-        bashio::log.fatal "The configured keyfile '${keyfile}' was not found."
-        bashio::exit.nok
-    fi
-fi
--- a/esphome-dev/rootfs/etc/cont-init.d/20-nginx.sh
+++ b/esphome-dev/rootfs/etc/cont-init.d/20-nginx.sh
@@ -1,34 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Configures NGINX for use with ESPHome
-# ==============================================================================
-
-declare certfile
-declare keyfile
-declare direct_port
-declare ingress_interface
-declare ingress_port
-
-mkdir -p /var/log/nginx
-
-direct_port=$(bashio::addon.port 6052)
-if bashio::var.has_value "${direct_port}"; then
-    if bashio::config.true 'ssl'; then
-        certfile=$(bashio::config 'certfile')
-        keyfile=$(bashio::config 'keyfile')
-
-        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
-        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
-        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
-    else
-        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
-    fi
-
-    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
-fi
-
-ingress_port=$(bashio::addon.ingress_port)
-ingress_interface=$(bashio::addon.ip_address)
-sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
-sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
--- a/esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh
+++ b/esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh
@@ -0,0 +1,47 @@
+#!/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
--- a/esphome-dev/rootfs/etc/cont-init.d/30-esphome.sh
+++ b/esphome-dev/rootfs/etc/cont-init.d/30-esphome.sh
@@ -1,23 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files installs the user ESPHome version if specified
-# ==============================================================================
-
-declare esphome_version
-
-if bashio::config.has_value 'esphome_version'; then
-    esphome_version=$(bashio::config 'esphome_version')
-    if [[ $esphome_version == *":"* ]]; then
-      IFS=':' read -r -a array <<< "$esphome_version"
-      username=${array[0]}
-      ref=${array[1]}
-    else
-      username="esphome"
-      ref=$esphome_version
-    fi
-    full_url="https://github.com/${username}/esphome/archive/${ref}.zip"
-    bashio::log.info "Installing esphome version '${esphome_version}' (${full_url})..."
-    pip3 install -U --no-cache-dir "${full_url}" \
-      || bashio::exit.nok "Failed installing esphome pinned version."
-fi
--- a/esphome-dev/rootfs/etc/cont-init.d/40-migrate.sh
+++ b/esphome-dev/rootfs/etc/cont-init.d/40-migrate.sh
@@ -1,11 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files migrates the esphome config directory from the old path
-# ==============================================================================
-
-if [[ ! -d /config/esphome && -d /config/esphomeyaml ]]; then
-    echo "Moving config directory from /config/esphomeyaml to /config/esphome"
-    mv /config/esphomeyaml /config/esphome
-    mv /config/esphome/.esphomeyaml /config/esphome/.esphome
-fi
--- a/esphome-dev/rootfs/etc/nginx/includes/mime.types
+++ b/esphome-dev/rootfs/etc/nginx/includes/mime.types
@@ -1,96 +0,0 @@
-types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
-
-    text/mathml                                      mml;
-    text/plain                                       txt;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
-
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
-
-    font/woff                                        woff;
-    font/woff2                                       woff2;
-
-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
-
-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
-
-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
-
-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
-}
--- a/esphome-dev/rootfs/etc/nginx/includes/proxy_params.conf
+++ b/esphome-dev/rootfs/etc/nginx/includes/proxy_params.conf
@@ -1,16 +0,0 @@
-proxy_http_version 1.1;
-proxy_ignore_client_abort off;
-proxy_read_timeout 86400s;
-proxy_redirect off;
-proxy_send_timeout 86400s;
-proxy_max_temp_file_size 0;
-
-proxy_set_header Accept-Encoding "";
-proxy_set_header Connection $connection_upgrade;
-proxy_set_header Host $http_host;
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
-proxy_set_header X-NginX-Proxy true;
-proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header Authorization "";
--- a/esphome-dev/rootfs/etc/nginx/includes/server_params.conf
+++ b/esphome-dev/rootfs/etc/nginx/includes/server_params.conf
@@ -1,6 +0,0 @@
-root /dev/null;
-server_name $hostname;
-
-add_header X-Content-Type-Options nosniff;
-add_header X-XSS-Protection "1; mode=block";
-add_header X-Robots-Tag none;
--- a/esphome-dev/rootfs/etc/nginx/includes/ssl_params.conf
+++ b/esphome-dev/rootfs/etc/nginx/includes/ssl_params.conf
@@ -1,9 +0,0 @@
-ssl_protocols TLSv1.2;
-ssl_prefer_server_ciphers on;
-ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
-ssl_ecdh_curve secp384r1;
-ssl_session_timeout  10m;
-ssl_session_cache shared:SSL:10m;
-ssl_session_tickets off;
-ssl_stapling on;
-ssl_stapling_verify on;
--- a/esphome-dev/rootfs/etc/nginx/nginx.conf
+++ b/esphome-dev/rootfs/etc/nginx/nginx.conf
@@ -1,33 +0,0 @@
-daemon off;
-user root;
-pid /var/run/nginx.pid;
-worker_processes 1;
-# Hass.io addon log
-error_log /proc/1/fd/1 error;
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /etc/nginx/includes/mime.types;
-    access_log stdout;
-    default_type application/octet-stream;
-    gzip on;
-    keepalive_timeout 65;
-    sendfile on;
-    server_tokens off;
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-    # Use Hass.io supervisor as resolver
-    resolver 172.30.32.2;
-
-    upstream esphome {
-        server unix:/var/run/esphome.sock;
-    }
-
-    include /etc/nginx/servers/*.conf;
-}
--- a/esphome-dev/rootfs/etc/nginx/servers/direct-ssl.disabled
+++ b/esphome-dev/rootfs/etc/nginx/servers/direct-ssl.disabled
@@ -1,22 +0,0 @@
-server {
-    listen %%port%% default_server ssl http2;
-
-    include /etc/nginx/includes/server_params.conf;
-    include /etc/nginx/includes/proxy_params.conf;
-    include /etc/nginx/includes/ssl_params.conf;
-
-    ssl on;
-    ssl_certificate /ssl/%%certfile%%;
-    ssl_certificate_key /ssl/%%keyfile%%;
-
-    # Clear Hass.io Ingress header
-    proxy_set_header X-Hassio-Ingress "";
-
-    # Redirect http requests to https on the same port.
-    # https://rageagainstshell.com/2016/11/redirect-http-to-https-on-the-same-port-in-nginx/
-    error_page 497 https://$http_host$request_uri;
-
-    location / {
-        proxy_pass http://esphome;
-    }
-}
--- a/esphome-dev/rootfs/etc/nginx/servers/direct.disabled
+++ b/esphome-dev/rootfs/etc/nginx/servers/direct.disabled
@@ -1,12 +0,0 @@
-server {
-    listen %%port%% default_server;
-
-    include /etc/nginx/includes/server_params.conf;
-    include /etc/nginx/includes/proxy_params.conf;
-    # Clear Hass.io Ingress header
-    proxy_set_header X-Hassio-Ingress "";
-
-    location / {
-        proxy_pass http://esphome;
-    }
-}
--- a/esphome-dev/rootfs/etc/nginx/servers/ingress.conf
+++ b/esphome-dev/rootfs/etc/nginx/servers/ingress.conf
@@ -1,16 +0,0 @@
-server {
-    listen %%interface%%:%%port%% default_server;
-
-    include /etc/nginx/includes/server_params.conf;
-    include /etc/nginx/includes/proxy_params.conf;
-    # Set Hass.io Ingress header
-    proxy_set_header X-Hassio-Ingress "YES";
-
-    location / {
-        # Only allow from Hass.io supervisor
-        allow   172.30.32.2;
-        deny    all;
-
-        proxy_pass http://esphome;
-    }
-}
--- a/esphome-dev/rootfs/etc/services.d/esphome/finish
+++ b/esphome-dev/rootfs/etc/services.d/esphome/finish
@@ -1,9 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when ESPHome fails
-# ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
-
-s6-svscanctl -t /var/run/s6/services
--- a/esphome-dev/rootfs/etc/services.d/esphome/run
+++ b/esphome-dev/rootfs/etc/services.d/esphome/run
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Runs the ESPHome dashboard
-# ==============================================================================
-
-export ESPHOME_IS_HASSIO=true
-
-if bashio::config.true 'leave_front_door_open'; then
-    export DISABLE_HA_AUTHENTICATION=true
-fi
-
-if bashio::config.true 'streamer_mode'; then
-    export ESPHOME_STREAMER_MODE=true
-fi
-
-if bashio::config.true 'status_use_ping'; then
-    export ESPHOME_DASHBOARD_USE_PING=true
-fi
-
-if bashio::config.has_value 'relative_url'; then
-    export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
-fi
-
-bashio::log.info "Starting ESPHome dashboard..."
-exec esphome /config/esphome dashboard --socket /var/run/esphome.sock --hassio
--- a/esphome-dev/rootfs/etc/services.d/nginx/finish
+++ b/esphome-dev/rootfs/etc/services.d/nginx/finish
@@ -1,9 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
-
-s6-svscanctl -t /var/run/s6/services
--- a/esphome-dev/rootfs/etc/services.d/nginx/run
+++ b/esphome-dev/rootfs/etc/services.d/nginx/run
@@ -1,14 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Runs the NGINX proxy
-# ==============================================================================
-
-bashio::log.info "Waiting for dashboard to come up..."
-
-while [[ ! -S /var/run/esphome.sock ]]; do
-  sleep 0.5
-done
-
-bashio::log.info "Starting NGINX..."
-exec nginx
--- a/esphome-dev/translations/en.yaml
+++ b/esphome-dev/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1 +1,179 @@
-See https://esphome.io/changelog/index.html
+## 2024.3.0
+
+## Full list of changes
+
+### New Components
+
+- New component: ADE7880 voltage/current/power/energy sensor [esphome#5242](https://github.com/esphome/esphome/pull/5242) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Add Uponor Smatrix component [esphome#5769](https://github.com/esphome/esphome/pull/5769) by [@kroimon](https://github.com/kroimon) (new-integration)
+- Support for MS8607 PHT (Pressure Humidity Temperature) sensor [esphome#3307](https://github.com/esphome/esphome/pull/3307) by [@e28eta](https://github.com/e28eta) (new-integration)
+- Add datetime date entities [esphome#6191](https://github.com/esphome/esphome/pull/6191) by [@RFDarter](https://github.com/RFDarter) (new-integration)
+- Add AGS10 Sensor [esphome#6070](https://github.com/esphome/esphome/pull/6070) by [@mak-42](https://github.com/mak-42) (new-integration)
+- ads1118 component [esphome#5711](https://github.com/esphome/esphome/pull/5711) by [@solomondg1](https://github.com/solomondg1) (new-integration)
+- Add CST816 touchscreen driver [esphome#5941](https://github.com/esphome/esphome/pull/5941) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- AM2315C Temperature + Humidity Sensor [esphome#6266](https://github.com/esphome/esphome/pull/6266) by [@swoboda1337](https://github.com/swoboda1337) (new-integration)
+- Touchscreen: add support for CST226 controller chip [esphome#6151](https://github.com/esphome/esphome/pull/6151) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- Drivers for RGB 16 bit parallel displays [esphome#5872](https://github.com/esphome/esphome/pull/5872) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- VEML7700 and VEML6030 light sensors [esphome#6067](https://github.com/esphome/esphome/pull/6067) by [@latonita](https://github.com/latonita) (new-integration)
+- Add Seeed Studio mmWave Kit MR24HPC1 [esphome#5761](https://github.com/esphome/esphome/pull/5761) by [@limengdu](https://github.com/limengdu) (new-integration)
+- Add driver for quad SPI AMOLED displays [esphome#6354](https://github.com/esphome/esphome/pull/6354) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- feat: Add HTU31D Support [esphome#5805](https://github.com/esphome/esphome/pull/5805) by [@betterengineering](https://github.com/betterengineering) (new-integration)
+- Emmeti infrared climate support [esphome#5197](https://github.com/esphome/esphome/pull/5197) by [@E440QF](https://github.com/E440QF) (new-integration)
+- Added Kamstrup Multical 40x component [esphome#4200](https://github.com/esphome/esphome/pull/4200) by [@cfeenstra1024](https://github.com/cfeenstra1024) (new-integration)
+
+### New Platforms
+
+- Additional sensors and binary sensors support for Haier Climate [esphome#6257](https://github.com/esphome/esphome/pull/6257) by [@paveldn](https://github.com/paveldn) (breaking-change) (new-platform)
+- add template fan [esphome#6310](https://github.com/esphome/esphome/pull/6310) by [@ssieb](https://github.com/ssieb) (breaking-change) (new-platform)
+
+### Breaking Changes
+
+- LTR390 - Multiple bugfixes [esphome#6161](https://github.com/esphome/esphome/pull/6161) by [@sjtrny](https://github.com/sjtrny) (breaking-change)
+- Touchscreen component and driver fixes [esphome#5997](https://github.com/esphome/esphome/pull/5997) by [@nielsnl68](https://github.com/nielsnl68) (breaking-change)
+- Additional sensors and binary sensors support for Haier Climate [esphome#6257](https://github.com/esphome/esphome/pull/6257) by [@paveldn](https://github.com/paveldn) (breaking-change) (new-platform)
+- add template fan [esphome#6310](https://github.com/esphome/esphome/pull/6310) by [@ssieb](https://github.com/ssieb) (breaking-change) (new-platform)
+
+### Beta Changes
+
+- SPI: Revert clk_pin to standard output pin schema [esphome#6368](https://github.com/esphome/esphome/pull/6368) by [@clydebarrow](https://github.com/clydebarrow)
+- Allow actions in web_server to be executed via GET method [esphome#5938](https://github.com/esphome/esphome/pull/5938) by [@afarago](https://github.com/afarago)
+- fix servo restore [esphome#6370](https://github.com/esphome/esphome/pull/6370) by [@ssieb](https://github.com/ssieb)
+- Don't try to get IPv6 addresses when disabled [esphome#6366](https://github.com/esphome/esphome/pull/6366) by [@HeMan](https://github.com/HeMan)
+- Use AQI device class [esphome#6376](https://github.com/esphome/esphome/pull/6376) by [@fgsch](https://github.com/fgsch)
+- Fix list-components when PR is not targeting dev [esphome#6375](https://github.com/esphome/esphome/pull/6375) by [@jesserockz](https://github.com/jesserockz)
+- allow negative ppm for sensair [esphome#6385](https://github.com/esphome/esphome/pull/6385) by [@ssieb](https://github.com/ssieb)
+- microWakeWord - add new ops and small improvements [esphome#6360](https://github.com/esphome/esphome/pull/6360) by [@kahrendt](https://github.com/kahrendt)
+- Fix compilation for uponor_smatrix without time component [esphome#6389](https://github.com/esphome/esphome/pull/6389) by [@kroimon](https://github.com/kroimon)
+- Shows component operation time in `ms` [esphome#6388](https://github.com/esphome/esphome/pull/6388) by [@edwardtfn](https://github.com/edwardtfn)
+- IPv6 can't be enabled for libretiny [esphome#6387](https://github.com/esphome/esphome/pull/6387) by [@HeMan](https://github.com/HeMan)
+- Replace name and friendly name in full adopted configs [esphome#4456](https://github.com/esphome/esphome/pull/4456) by [@jesserockz](https://github.com/jesserockz)
+- Fix bug in `remote_base` conditional [esphome#6281](https://github.com/esphome/esphome/pull/6281) by [@swoboda1337](https://github.com/swoboda1337)
+- Fix sending packets to uponor_smatrix devices [esphome#6392](https://github.com/esphome/esphome/pull/6392) by [@kroimon](https://github.com/kroimon)
+- Fix wrong initialization of vectors in ade7953_i2c [esphome#6393](https://github.com/esphome/esphome/pull/6393) by [@kroimon](https://github.com/kroimon)
+- ld2420: Firmware v1.5.4+ bug workaround [esphome#6168](https://github.com/esphome/esphome/pull/6168) by [@descipher](https://github.com/descipher)
+- Require xsrf/csrf when using a password [esphome#6396](https://github.com/esphome/esphome/pull/6396) by [@jesserockz](https://github.com/jesserockz)
+- AHT10: Use state machine to avoid blocking delay [esphome#6401](https://github.com/esphome/esphome/pull/6401) by [@clydebarrow](https://github.com/clydebarrow)
+- Show component warnings and errors in the log; [esphome#6400](https://github.com/esphome/esphome/pull/6400) by [@clydebarrow](https://github.com/clydebarrow)
+- web_server support for v3 [esphome#6203](https://github.com/esphome/esphome/pull/6203) by [@RFDarter](https://github.com/RFDarter)
+
+### All changes
+
+- Bump openssh-client to 1:9.2p1-2+deb12u2 [esphome#6216](https://github.com/esphome/esphome/pull/6216) by [@jesserockz](https://github.com/jesserockz)
+- Add support for 1.8V-powered devices [esphome#6234](https://github.com/esphome/esphome/pull/6234) by [@bisbastuner](https://github.com/bisbastuner)
+- Adjust HeatpumpIR dependency [esphome#6222](https://github.com/esphome/esphome/pull/6222) by [@ivankravets](https://github.com/ivankravets)
+- INA226 - fixed improper work with signed values, added configurable ADC parameters [esphome#6172](https://github.com/esphome/esphome/pull/6172) by [@latonita](https://github.com/latonita)
+- Prevent network config on rpipico board [esphome#5832](https://github.com/esphome/esphome/pull/5832) by [@carlosV2](https://github.com/carlosV2)
+- Bump pytest-asyncio from 0.23.3 to 0.23.5 [esphome#6201](https://github.com/esphome/esphome/pull/6201) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- New component: ADE7880 voltage/current/power/energy sensor [esphome#5242](https://github.com/esphome/esphome/pull/5242) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Add some components to the new testing framework (D) [esphome#6175](https://github.com/esphome/esphome/pull/6175) by [@kbx81](https://github.com/kbx81)
+- Provide example devcontainer config for mdns and USB passthrough [esphome#6094](https://github.com/esphome/esphome/pull/6094) by [@linkedupbits](https://github.com/linkedupbits)
+- Bump black from 23.12.1 to 24.2.0 [esphome#6221](https://github.com/esphome/esphome/pull/6221) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest from 7.4.4 to 8.0.1 [esphome#6246](https://github.com/esphome/esphome/pull/6246) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump codecov/codecov-action from 3 to 4 [esphome#6160](https://github.com/esphome/esphome/pull/6160) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump peter-evans/create-pull-request from 5.0.2 to 6.0.0 [esphome#6159](https://github.com/esphome/esphome/pull/6159) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump frenck/action-yamllint from 1.4.2 to 1.5.0 [esphome#6236](https://github.com/esphome/esphome/pull/6236) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump voluptuous from 0.14.1 to 0.14.2 [esphome#6181](https://github.com/esphome/esphome/pull/6181) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pyupgrade from 3.15.0 to 3.15.1 [esphome#6247](https://github.com/esphome/esphome/pull/6247) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- LTR390 - Multiple bugfixes [esphome#6161](https://github.com/esphome/esphome/pull/6161) by [@sjtrny](https://github.com/sjtrny) (breaking-change)
+- Fix yamllint [esphome#6253](https://github.com/esphome/esphome/pull/6253) by [@jesserockz](https://github.com/jesserockz)
+- Improve the error message on OTA version mismatch [esphome#6259](https://github.com/esphome/esphome/pull/6259) by [@sybrenstuvel](https://github.com/sybrenstuvel)
+- Bump aioesphomeapi from 21.0.2 to 22.0.0 [esphome#6263](https://github.com/esphome/esphome/pull/6263) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Allow ESP8266 to use multiple i2c busses [esphome#6145](https://github.com/esphome/esphome/pull/6145) by [@LouDou](https://github.com/LouDou)
+- Add Uponor Smatrix component [esphome#5769](https://github.com/esphome/esphome/pull/5769) by [@kroimon](https://github.com/kroimon) (new-integration)
+- Fix test_build_components for macOS sed [esphome#6278](https://github.com/esphome/esphome/pull/6278) by [@kbx81](https://github.com/kbx81)
+- Allow to specify global build directory [esphome#6276](https://github.com/esphome/esphome/pull/6276) by [@werwolfby](https://github.com/werwolfby)
+- Add device class support to text sensor [esphome#6202](https://github.com/esphome/esphome/pull/6202) by [@dougiteixeira](https://github.com/dougiteixeira)
+- Bump pytest from 8.0.1 to 8.0.2 [esphome#6288](https://github.com/esphome/esphome/pull/6288) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Improve dualstack and IPv6 support [esphome#5449](https://github.com/esphome/esphome/pull/5449) by [@HeMan](https://github.com/HeMan)
+- Waveshare e-ink 2IN9_V2 - fix full and partial update based on vendor… [esphome#5481](https://github.com/esphome/esphome/pull/5481) by [@darianndd](https://github.com/darianndd)
+- Add RTTTL volume control. [esphome#5968](https://github.com/esphome/esphome/pull/5968) by [@nielsnl68](https://github.com/nielsnl68)
+- Touchscreen component and driver fixes [esphome#5997](https://github.com/esphome/esphome/pull/5997) by [@nielsnl68](https://github.com/nielsnl68) (breaking-change)
+- Add `on_update` trigger for Project versions [esphome#6298](https://github.com/esphome/esphome/pull/6298) by [@jesserockz](https://github.com/jesserockz)
+- Bump peter-evans/create-pull-request from 6.0.0 to 6.0.1 [esphome#6302](https://github.com/esphome/esphome/pull/6302) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- CSE7766 Apparent Power & Power Factor calculations [esphome#6292](https://github.com/esphome/esphome/pull/6292) by [@DAVe3283](https://github.com/DAVe3283)
+- Adding W5500 support to ethernet component [esphome#4424](https://github.com/esphome/esphome/pull/4424) by [@JeroenVanOort](https://github.com/JeroenVanOort)
+- Fix numbering of ip_address sensors [esphome#6305](https://github.com/esphome/esphome/pull/6305) by [@HeMan](https://github.com/HeMan)
+- Bump aioesphomeapi from 22.0.0 to 23.0.0 [esphome#6293](https://github.com/esphome/esphome/pull/6293) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Add regular polygon shapes to display component [esphome#6108](https://github.com/esphome/esphome/pull/6108) by [@mathieu-mp](https://github.com/mathieu-mp)
+- Fix return value in `core/automation.h` [esphome#6314](https://github.com/esphome/esphome/pull/6314) by [@FlyingFeng2021](https://github.com/FlyingFeng2021)
+- aht10: Added new CMD and renamed existing CMD to match datasheet [esphome#6303](https://github.com/esphome/esphome/pull/6303) by [@cptskippy](https://github.com/cptskippy)
+- handling with the negative temperature in the sensor tmp102 [esphome#6316](https://github.com/esphome/esphome/pull/6316) by [@FlyingFeng2021](https://github.com/FlyingFeng2021)
+- x9c: fix off by 1 error [esphome#6318](https://github.com/esphome/esphome/pull/6318) by [@andynumber2](https://github.com/andynumber2)
+- Support for MS8607 PHT (Pressure Humidity Temperature) sensor [esphome#3307](https://github.com/esphome/esphome/pull/3307) by [@e28eta](https://github.com/e28eta) (new-integration)
+- Separate logger implementations for each hardware platform into different files [esphome#6167](https://github.com/esphome/esphome/pull/6167) by [@tomaszduda23](https://github.com/tomaszduda23)
+- Additional sensors and binary sensors support for Haier Climate [esphome#6257](https://github.com/esphome/esphome/pull/6257) by [@paveldn](https://github.com/paveldn) (breaking-change) (new-platform)
+- Add toggle command to cover web_server endpoint [esphome#6319](https://github.com/esphome/esphome/pull/6319) by [@heythisisnate](https://github.com/heythisisnate)
+- Improv: support connecting to hidden networks [esphome#6322](https://github.com/esphome/esphome/pull/6322) by [@jesserockz](https://github.com/jesserockz)
+- Update mDNS for IDF >= 5.0 [esphome#6328](https://github.com/esphome/esphome/pull/6328) by [@HeMan](https://github.com/HeMan)
+- DFPlayer: refix Bug created with PR 4758 [esphome#5861](https://github.com/esphome/esphome/pull/5861) by [@sandronidi](https://github.com/sandronidi)
+- Fix build failures on host platform caused by #6167 [esphome#6338](https://github.com/esphome/esphome/pull/6338) by [@clydebarrow](https://github.com/clydebarrow)
+- Update bang_bang to log two decimal places in config dump [esphome#6304](https://github.com/esphome/esphome/pull/6304) by [@rafalw1277](https://github.com/rafalw1277)
+- Add datetime date entities [esphome#6191](https://github.com/esphome/esphome/pull/6191) by [@RFDarter](https://github.com/RFDarter) (new-integration)
+- Add AGS10 Sensor [esphome#6070](https://github.com/esphome/esphome/pull/6070) by [@mak-42](https://github.com/mak-42) (new-integration)
+- Bump aioesphomeapi from 23.0.0 to 23.1.0 [esphome#6332](https://github.com/esphome/esphome/pull/6332) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest-asyncio from 0.23.5 to 0.23.5.post1 [esphome#6334](https://github.com/esphome/esphome/pull/6334) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump docker/setup-buildx-action from 3.0.0 to 3.1.0 [esphome#6295](https://github.com/esphome/esphome/pull/6295) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Set dependabot to look at composite actions versions [esphome#6343](https://github.com/esphome/esphome/pull/6343) by [@jesserockz](https://github.com/jesserockz)
+- ads1118 component [esphome#5711](https://github.com/esphome/esphome/pull/5711) by [@solomondg1](https://github.com/solomondg1) (new-integration)
+- Bump actions/cache from 4.0.0 to 4.0.1 [esphome#6306](https://github.com/esphome/esphome/pull/6306) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump docker/build-push-action from 5.0.0 to 5.2.0 in /.github/actions/build-image [esphome#6347](https://github.com/esphome/esphome/pull/6347) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- fix: modbus_textsensor response is too long in some cases [esphome#6333](https://github.com/esphome/esphome/pull/6333) by [@NewoPL](https://github.com/NewoPL)
+- add template fan [esphome#6310](https://github.com/esphome/esphome/pull/6310) by [@ssieb](https://github.com/ssieb) (breaking-change) (new-platform)
+- dump config after logging CDC port is opened by host [esphome#6169](https://github.com/esphome/esphome/pull/6169) by [@tomaszduda23](https://github.com/tomaszduda23)
+- Add IRK support to allow tracking of devices with random MAC addresses [esphome#6335](https://github.com/esphome/esphome/pull/6335) by [@chbmuc](https://github.com/chbmuc)
+- [Fingerprint_grow] Implements Sleep Mode feature [esphome#6116](https://github.com/esphome/esphome/pull/6116) by [@alexborro](https://github.com/alexborro)
+- cleanup ili9xxx component by removing data rate define [esphome#6350](https://github.com/esphome/esphome/pull/6350) by [@nielsnl68](https://github.com/nielsnl68)
+- web_server_idf: support x-www-form-urlencoded POST requests [esphome#6037](https://github.com/esphome/esphome/pull/6037) by [@dentra](https://github.com/dentra)
+- feat(MQTT): Add QoS option for each MQTT component [esphome#6279](https://github.com/esphome/esphome/pull/6279) by [@Rapsssito](https://github.com/Rapsssito)
+- Check permissions [esphome#6255](https://github.com/esphome/esphome/pull/6255) by [@OdileVidrine](https://github.com/OdileVidrine)
+- Add CST816 touchscreen driver [esphome#5941](https://github.com/esphome/esphome/pull/5941) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- ILI9XXX: Lazily allocate buffer [esphome#6352](https://github.com/esphome/esphome/pull/6352) by [@clydebarrow](https://github.com/clydebarrow)
+- AM2315C Temperature + Humidity Sensor [esphome#6266](https://github.com/esphome/esphome/pull/6266) by [@swoboda1337](https://github.com/swoboda1337) (new-integration)
+- Add ble_presence binary sensor timeout config value. [esphome#6024](https://github.com/esphome/esphome/pull/6024) by [@clydebarrow](https://github.com/clydebarrow)
+- Add state listeners to `rotary_encoder` [esphome#6035](https://github.com/esphome/esphome/pull/6035) by [@clydebarrow](https://github.com/clydebarrow)
+- ili9xxx: Add support for GC9A01A display [esphome#6351](https://github.com/esphome/esphome/pull/6351) by [@clydebarrow](https://github.com/clydebarrow)
+- Touchscreen: add support for CST226 controller chip [esphome#6151](https://github.com/esphome/esphome/pull/6151) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- font: add anti-aliasing and other features [esphome#6198](https://github.com/esphome/esphome/pull/6198) by [@clydebarrow](https://github.com/clydebarrow)
+- Mhz19 warmup [esphome#6214](https://github.com/esphome/esphome/pull/6214) by [@fornellas](https://github.com/fornellas)
+- Refactor ATM90E32 to reduce blocking time and improve accuracy. [esphome#5670](https://github.com/esphome/esphome/pull/5670) by [@descipher](https://github.com/descipher)
+- Bump aioesphomeapi from 23.1.0 to 23.1.1 [esphome#6348](https://github.com/esphome/esphome/pull/6348) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest from 8.0.2 to 8.1.1 [esphome#6346](https://github.com/esphome/esphome/pull/6346) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Add support for Waveshare 2.13" V2 display [esphome#6337](https://github.com/esphome/esphome/pull/6337) by [@manuelkasper](https://github.com/manuelkasper)
+- Mitsubishi Climate updates [esphome#3886](https://github.com/esphome/esphome/pull/3886) by [@RubyBailey](https://github.com/RubyBailey)
+- Drivers for RGB 16 bit parallel displays [esphome#5872](https://github.com/esphome/esphome/pull/5872) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- hydreon_rgxx - add resolution option [esphome#6077](https://github.com/esphome/esphome/pull/6077) by [@mrtoy-me](https://github.com/mrtoy-me)
+- SPI schema now uses typed_schema with `type` key  [esphome#6353](https://github.com/esphome/esphome/pull/6353) by [@clydebarrow](https://github.com/clydebarrow)
+- VEML7700 and VEML6030 light sensors [esphome#6067](https://github.com/esphome/esphome/pull/6067) by [@latonita](https://github.com/latonita) (new-integration)
+- Add Seeed Studio mmWave Kit MR24HPC1 [esphome#5761](https://github.com/esphome/esphome/pull/5761) by [@limengdu](https://github.com/limengdu) (new-integration)
+- Add getter for font glyph data [esphome#6355](https://github.com/esphome/esphome/pull/6355) by [@clydebarrow](https://github.com/clydebarrow)
+- Require reset_pin for certain waveshare_epaper models in YAML validation [esphome#6357](https://github.com/esphome/esphome/pull/6357) by [@manuelkasper](https://github.com/manuelkasper)
+- touchscreen driver fixes [esphome#6356](https://github.com/esphome/esphome/pull/6356) by [@clydebarrow](https://github.com/clydebarrow)
+- Make USE_HOST compilable on msys2 [esphome#6359](https://github.com/esphome/esphome/pull/6359) by [@maruel](https://github.com/maruel)
+- download font from url on build [esphome#5254](https://github.com/esphome/esphome/pull/5254) by [@landonr](https://github.com/landonr)
+- Add driver for quad SPI AMOLED displays [esphome#6354](https://github.com/esphome/esphome/pull/6354) by [@clydebarrow](https://github.com/clydebarrow) (new-integration)
+- ADE7953: Add the ability to use accumulating energy registers, more precise power reporting [esphome#6311](https://github.com/esphome/esphome/pull/6311) by [@isorin](https://github.com/isorin)
+- feat: Add HTU31D Support [esphome#5805](https://github.com/esphome/esphome/pull/5805) by [@betterengineering](https://github.com/betterengineering) (new-integration)
+- Emmeti infrared climate support [esphome#5197](https://github.com/esphome/esphome/pull/5197) by [@E440QF](https://github.com/E440QF) (new-integration)
+- Added Kamstrup Multical 40x component [esphome#4200](https://github.com/esphome/esphome/pull/4200) by [@cfeenstra1024](https://github.com/cfeenstra1024) (new-integration)
+- add possibility to provide different conversion times for Bus Voltage… [esphome#6327](https://github.com/esphome/esphome/pull/6327) by [@kev300](https://github.com/kev300)
+- SPI: Revert clk_pin to standard output pin schema [esphome#6368](https://github.com/esphome/esphome/pull/6368) by [@clydebarrow](https://github.com/clydebarrow)
+- Allow actions in web_server to be executed via GET method [esphome#5938](https://github.com/esphome/esphome/pull/5938) by [@afarago](https://github.com/afarago)
+- fix servo restore [esphome#6370](https://github.com/esphome/esphome/pull/6370) by [@ssieb](https://github.com/ssieb)
+- Don't try to get IPv6 addresses when disabled [esphome#6366](https://github.com/esphome/esphome/pull/6366) by [@HeMan](https://github.com/HeMan)
+- Use AQI device class [esphome#6376](https://github.com/esphome/esphome/pull/6376) by [@fgsch](https://github.com/fgsch)
+- Fix list-components when PR is not targeting dev [esphome#6375](https://github.com/esphome/esphome/pull/6375) by [@jesserockz](https://github.com/jesserockz)
+- allow negative ppm for sensair [esphome#6385](https://github.com/esphome/esphome/pull/6385) by [@ssieb](https://github.com/ssieb)
+- microWakeWord - add new ops and small improvements [esphome#6360](https://github.com/esphome/esphome/pull/6360) by [@kahrendt](https://github.com/kahrendt)
+- Fix compilation for uponor_smatrix without time component [esphome#6389](https://github.com/esphome/esphome/pull/6389) by [@kroimon](https://github.com/kroimon)
+- Shows component operation time in `ms` [esphome#6388](https://github.com/esphome/esphome/pull/6388) by [@edwardtfn](https://github.com/edwardtfn)
+- IPv6 can't be enabled for libretiny [esphome#6387](https://github.com/esphome/esphome/pull/6387) by [@HeMan](https://github.com/HeMan)
+- Replace name and friendly name in full adopted configs [esphome#4456](https://github.com/esphome/esphome/pull/4456) by [@jesserockz](https://github.com/jesserockz)
+- Fix bug in `remote_base` conditional [esphome#6281](https://github.com/esphome/esphome/pull/6281) by [@swoboda1337](https://github.com/swoboda1337)
+- Fix sending packets to uponor_smatrix devices [esphome#6392](https://github.com/esphome/esphome/pull/6392) by [@kroimon](https://github.com/kroimon)
+- Fix wrong initialization of vectors in ade7953_i2c [esphome#6393](https://github.com/esphome/esphome/pull/6393) by [@kroimon](https://github.com/kroimon)
+- ld2420: Firmware v1.5.4+ bug workaround [esphome#6168](https://github.com/esphome/esphome/pull/6168) by [@descipher](https://github.com/descipher)
+- Require xsrf/csrf when using a password [esphome#6396](https://github.com/esphome/esphome/pull/6396) by [@jesserockz](https://github.com/jesserockz)
+- AHT10: Use state machine to avoid blocking delay [esphome#6401](https://github.com/esphome/esphome/pull/6401) by [@clydebarrow](https://github.com/clydebarrow)
+- Show component warnings and errors in the log; [esphome#6400](https://github.com/esphome/esphome/pull/6400) by [@clydebarrow](https://github.com/clydebarrow)
+- web_server support for v3 [esphome#6203](https://github.com/esphome/esphome/pull/6203) by [@RFDarter](https://github.com/RFDarter)
+
--- a/esphome/DOCS.md
+++ b/esphome/DOCS.md
@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation

 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
@@ -51,15 +50,6 @@ The private key file to use for SSL. If this file doesn't exist, the add-on star
 Adding this option to the add-on configuration allows you to disable
 authentication by setting it to `true`.

-### Option: `esphome_version`
-
-Manually override which ESPHome version to use in the add-on.
-For example to install the latest development version, use `"esphome_version": "dev"`,
-or for version 1.14.0: `"esphome_version": "v1.14.0""`.
-
-Please note that this does not always work and is only meant for testing, usually the
-ESPHome add-on and dashboard version must match to guarantee a working system.
-
 ### Option: `relative_url`

 Host the ESPHome dashboard under a relative URL, so that it can be integrated
--- a/esphome/README.md
+++ b/esphome/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/
--- a/esphome/config.json
+++ b/esphome/config.json
@@ -1,43 +0,0 @@
-{
-  "arch": [
-    "amd64",
-    "armv7",
-    "aarch64"
-  ],
-  "auth_api": true,
-  "description": "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices",
-  "hassio_api": true,
-  "host_network": true,
-  "image": "esphome/esphome-hassio-{arch}",
-  "ingress": true,
-  "ingress_port": 0,
-  "map": [
-    "ssl:ro",
-    "config:rw"
-  ],
-  "name": "ESPHome",
-  "panel_icon": "mdi:chip",
-  "ports": {
-    "6052/tcp": null
-  },
-  "ports_description": {
-    "6052/tcp": "Web interface (not required for Home Assistant ingress)"
-  },
-  "schema": {
-    "certfile": "str?",
-    "esphome_version": "str?",
-    "keyfile": "str?",
-    "leave_front_door_open": "bool?",
-    "relative_url": "str?",
-    "ssl": "bool?",
-    "status_use_ping": "bool?",
-    "streamer_mode": "bool?"
-  },
-  "slug": "esphome",
-  "snapshot_exclude": [
-    "*/*/"
-  ],
-  "uart": true,
-  "url": "https://esphome.io/",
-  "version": "1.20.3"
-}
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -0,0 +1,38 @@
+---
+url: https://esphome.io/
+arch:
+- amd64
+- armv7
+- aarch64
+hassio_api: true
+auth_api: true
+host_network: true
+ingress: true
+ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
+map:
+- ssl:ro
+- config:rw
+discovery:
+- esphome
+schema:
+  status_use_ping: bool?
+  streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+startup: services
+name: ESPHome
+version: 2024.3.0
+slug: esphome
+description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
+image: ghcr.io/esphome/esphome-hassio
--- a/esphome/images/dht-example.png
+++ b/esphome/images/dht-example.png
--- a/esphome/images/screenshot.png
+++ b/esphome/images/screenshot.png
--- a/esphome/images/temperature-humidity.png
+++ b/esphome/images/temperature-humidity.png
--- a/esphome/logo.png
+++ b/esphome/logo.png
--- a/esphome/translations/en.yaml
+++ b/esphome/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)
--- a/repository.json
+++ b/repository.json
@@ -1,5 +1,5 @@
 {
-  "name": "ESPHome Home Assistant Add-Ons",
-  "url": "https://github.com/esphome/hassio",
+  "name": "ESPHome",
+  "url": "https://esphome.io",
  "maintainer": "ESPHome <esphome@nabucasa.com>"
 }
--- a/script/generate.py
+++ b/script/generate.py
@@ -4,54 +4,61 @@ import argparse
 import yaml
 from pathlib import Path
 from enum import Enum
-import json
 from shutil import copyfile
 import sys
+import os
+

 class Channel(Enum):
-    stable = 'stable'
-    beta = 'beta'
-    dev = 'dev'
+    stable = "stable"
+    beta = "beta"
+    dev = "dev"


 def main(args):
-    parser = argparse.ArgumentParser(description='Generate ESPHome Home Assistant config.json')
-    parser.add_argument('channels', nargs='+', type=Channel, choices=list(Channel))
+    parser = argparse.ArgumentParser(
+        description="Generate ESPHome Home Assistant config.json"
+    )
+    parser.add_argument("channels", nargs="+", type=Channel, choices=list(Channel))
    args = parser.parse_args(args)

    root = Path(__file__).parent.parent
-    templ = root / 'template'
+    templ = root / "template"

-    with open(templ / "addon_config.yaml", 'r') as f:
+    with open(templ / "addon_config.yaml", "r") as f:
        config = yaml.safe_load(f)

-    copyf = config['copy_files']
+    copyf = config["copy_files"]

    for channel in args.channels:
-        conf = config[f'esphome-{channel.value}']
-        base_image = conf.pop('base_image')
-        dir_ = root / conf.pop('directory')
-        path = dir_ / 'config.json'
-        with open(path, 'w') as f:
-            json.dump(conf, f, indent=2, sort_keys=True)
+        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:
+            yaml.dump(conf, f, indent=2, sort_keys=False, explicit_start=True)

-        for file_, conf_ in copyf.items():
-            copyfile(templ / file_, dir_ / file_)
+        for file_ in copyf:
+            os.makedirs(dir_ / Path(file_).parent, exist_ok=True)
+            if Path.exists(templ / channel.value / file_):
+                copyfile(templ / channel.value / file_, dir_ / file_)
+            else:
+                copyfile(templ / file_, dir_ / file_)

-        path = dir_ / 'FILES ARE GENERATED DO NOT EDIT'
-        with open(path, 'w') as f:
+        path = dir_ / "FILES ARE GENERATED DO NOT EDIT"
+        with open(path, "w") as f:
            f.write("Any edits should be made to the files in the 'template' directory")

        if channel == Channel.dev:
-            path = dir_ / 'build.json'
+            path = dir_ / "build.yaml"
            build_conf = {
-                "build_from": {arch: base_image.format(arch=arch) for arch in conf['arch']}
+                "build_from": {
+                    arch: base_image for arch in conf["arch"]
+                }
            }
-            with open(path, 'w') as f:
-                json.dump(build_conf, f, indent=2, sort_keys=True)
-
-        print(f"Wrote {path}")
+            with open(path, "w") as f:
+                yaml.dump(build_conf, f, indent=2, sort_keys=True, explicit_start=True)


-if __name__ == '__main__':
+if __name__ == "__main__":
    main(sys.argv[1:])
--- a/script/requirements.txt
+++ b/script/requirements.txt
@@ -1 +1 @@
-PyYAML==5.4
+PyYAML==6.0
--- a/template/DOCS.md
+++ b/template/DOCS.md
@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation

 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
@@ -51,15 +50,6 @@ The private key file to use for SSL. If this file doesn't exist, the add-on star
 Adding this option to the add-on configuration allows you to disable
 authentication by setting it to `true`.

-### Option: `esphome_version`
-
-Manually override which ESPHome version to use in the add-on.
-For example to install the latest development version, use `"esphome_version": "dev"`,
-or for version 1.14.0: `"esphome_version": "v1.14.0""`.
-
-Please note that this does not always work and is only meant for testing, usually the
-ESPHome add-on and dashboard version must match to guarantee a working system.
-
 ### Option: `relative_url`

 Host the ESPHome dashboard under a relative URL, so that it can be integrated
--- a/template/README.md
+++ b/template/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/
--- a/template/addon_config.yaml
+++ b/template/addon_config.yaml
@@ -1,6 +1,6 @@
 ---
 # When changing options in this file, please also run:
-#    python3 script/generate.py dev 
+#    python3 script/generate.py dev
 # to update the dev addon config (beta/stable configs will be updated on next release by release script)
 base: &base
  url: https://esphome.io/
@@ -21,23 +21,26 @@ base: &base
  uart: true
  ports:
    '6052/tcp': null
-  ports_description:
-    '6052/tcp': "Web interface (not required for Home Assistant ingress)"
  map:
    - ssl:ro
    - config:rw
+  discovery:
+    - esphome
  schema:
+    status_use_ping: bool?
+    streamer_mode: bool?
+    home_assistant_dashboard_integration: bool?
+    default_compile_process_limit: int(1,)?
    ssl: bool?
    certfile: str?
    keyfile: str?
    leave_front_door_open: bool?
-    esphome_version: str?
-    streamer_mode: bool?
-    relative_url: str?
-    status_use_ping: bool?
-  snapshot_exclude:
+  backup_exclude:
    - "*/*/"
-  base_image: esphome/esphome-hassio-base-{arch}:3.1.0
+  # Disable docker init for s6
+  init: false
+  # Make sure dashboard is available for core
+  startup: services

 esphome-dev:
  <<: *base
@@ -48,32 +51,50 @@ esphome-dev:
  description: "Development version of ESPHome add-on"
  url: https://next.esphome.io/
  stage: experimental
+  advanced: true
+  schema:
+    status_use_ping: bool?
+    streamer_mode: bool?
+    home_assistant_dashboard_integration: bool?
+    default_compile_process_limit: int(1,)?
+    esphome_fork: str?
+    ssl: bool?
+    certfile: str?
+    keyfile: str?
+    leave_front_door_open: bool?
+  base_image: ghcr.io/esphome/esphome-hassio:dev
  options:
-    esphome_version: dev
+      home_assistant_dashboard_integration: false

 esphome-beta:
  <<: *base
  directory: esphome-beta
  name: ESPHome (beta)
-  version: '1.20.3'  # BETA
+  version: '2024.3.0'  # BETA
  slug: esphome-beta
  description: "Beta version of ESPHome add-on"
  url: https://beta.esphome.io/
-  image: esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio
  stage: experimental
+  advanced: true
+  options:
+      home_assistant_dashboard_integration: false

 esphome-stable:
  <<: *base
  directory: esphome
  name: ESPHome
-  version: '1.20.3'  # STABLE
+  version: '2024.3.0'  # STABLE
  slug: esphome
  description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
-  image: esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio

 copy_files:
-  icon.png:
-  logo.png:
-  README.md:
-  DOCS.md:
-  CHANGELOG.md:
+  - DOCS.md
+  - icon.png
+  - logo.png
+  - README.md
+  - translations/en.yaml
+  - images/dht-example.png
+  - images/screenshot.png
+  - images/temperature-humidity.png
--- a/template/beta/README.md
+++ b/template/beta/README.md
@@ -0,0 +1,41 @@
+# ESPHome Beta Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+firmware. For example, to include a [DHT22][dht22].
+temperature and humidity sensor, you just need to include 8 lines of YAML
+in your configuration file:
+
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/dht-example.png" width="500px"></img>
+
+Then just click UPLOAD and the sensor will magically appear in Home Assistant:
+
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/
--- a/template/dev/DOCS.md
+++ b/template/dev/DOCS.md
@@ -0,0 +1,73 @@
+# ESPHome DEV add on
+
+This is **development** version of the ESPHome add on.
+
+To deploy production nodes please use mainstream release add on.
+
+The add on uses a version of ESPHome built automatically every day at 02:00 UTC. and is used to test components in development. See the `esphome_fork` configuration below to properly configure the add on. Once you update the configuration make sure to rebuild the image.
+
+## Configuration
+
+**Note**: _Remember to restart the add-on when the configuration is changed._
+
+### Option: `esphome_fork`
+
+Install ESPHome from a fork or branch.
+For example to test a pull request, use `pull/XXXX/head` where `XXXX` is the PR number,
+or you can specify the username of the fork owner and branch `username:branch` which
+assumes the repository is named `esphome` still.
+
+If you need to test the latest commit on dev branch before the image is updated you can enter `dev` here.
+
+Please note that the fork or branch you are using **must** be up to date with ESPHome dev
+or the add-on **will not start**.
+
+
+## General ESPHome add on configurations
+
+General options also available in other versions.
+
+### Option: `ssl`
+
+Enables or disables encrypted SSL/TLS (HTTPS) connections to the web server of this add-on.
+Set it to `true` to encrypt communications, `false` otherwise.
+Please note that if you set this to `true` you must also generate the key and certificate
+files for encryption. For example using [Let's Encrypt](https://www.home-assistant.io/addons/lets_encrypt/)
+or [Self-signed certificates](https://www.home-assistant.io/docs/ecosystem/certificates/tls_self_signed_certificate/).
+
+### Option: `certfile`
+
+The certificate file to use for SSL. If this file doesn't exist, the add-on start will fail.
+
+**Note**: The file MUST be stored in `/ssl/`, which is the default for Home Assistant
+
+### Option: `keyfile`
+
+The private key file to use for SSL. If this file doesn't exist, the add-on start will fail.
+
+**Note**: The file MUST be stored in `/ssl/`, which is the default for Home Assistant
+
+### Option: `leave_front_door_open`
+
+Adding this option to the add-on configuration allows you to disable
+authentication by setting it to `true`.
+
+### Option: `relative_url`
+
+Host the ESPHome dashboard under a relative URL, so that it can be integrated
+into existing web proxies like NGINX under a relative URL. Defaults to `/`.
+
+### Option: `status_use_ping`
+
+By default the dashboard uses mDNS to check if nodes are online. This does
+not work across subnets unless your router supports mDNS forwarding or avahi.
+
+Setting this to `true` will make ESPHome use ICMP ping requests to get the node status. Use this if all nodes always have offline status even when they're connected.
+
+### Option: `streamer_mode`
+
+If set to `true`, this will enable streamer mode, which makes ESPHome hide all
+potentially private information. So for example WiFi (B)SSIDs (which could be
+used to find your location), usernames, etc. Please note that you need to use
+the `!secret` tag in your YAML file to also prevent these from showing up
+while editing and validating.
--- a/template/dev/README.md
+++ b/template/dev/README.md
@@ -0,0 +1,41 @@
+# ESPHome Dev Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+firmware. For example, to include a [DHT22][dht22].
+temperature and humidity sensor, you just need to include 8 lines of YAML
+in your configuration file:
+
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/dht-example.png" width="500px"></img>
+
+Then just click UPLOAD and the sensor will magically appear in Home Assistant:
+
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/
--- a/template/images/dht-example.png
+++ b/template/images/dht-example.png
--- a/template/images/screenshot.png
+++ b/template/images/screenshot.png
--- a/template/images/temperature-humidity.png
+++ b/template/images/temperature-humidity.png
--- a/template/logo.png
+++ b/template/logo.png
--- a/template/translations/en.yaml
+++ b/template/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)