Skip to content

Commit 1b660f6

Browse files
committed
Merge branch 'current' into beta
2 parents 50ec829 + 4a61ed4 commit 1b660f6

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

.claude/instructions.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ Use GitHub-style alert syntax:
197197
- **Bug fixes and documentation corrections**: Target the `current` branch
198198
- **New features and new component docs**: Target the `next` branch
199199
- **Create separate branches** for each pull request (one PR per feature/fix)
200+
- **Always branch from the target branch**: Use `git checkout -b <branch-name> current` or `git checkout -b <branch-name> next` to ensure you're branching from the correct base, not whatever branch is currently checked out
200201

201202
### Commit Messages
202203
- Use clear, descriptive commit messages
@@ -209,8 +210,9 @@ Use GitHub-style alert syntax:
209210
### Pull Request Process
210211
1. Ensure all changes are committed to the feature branch
211212
2. Push to origin: `git push -u origin <branch-name>`
212-
3. All automated tests must pass before review
213-
4. Follow retry logic for network failures (exponential backoff: 2s, 4s, 8s, 16s)
213+
3. Create the PR using the `.github/PULL_REQUEST_TEMPLATE.md` template - fill out all sections completely without removing any parts of the template
214+
4. All automated tests must pass before review
215+
5. Follow retry logic for network failures (exponential backoff: 2s, 4s, 8s, 16s)
214216

215217
## Testing and Preview
216218

.github/workflows/auto-label-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Generate a token
3232
id: generate-token
33-
uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
33+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
3434
with:
3535
app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
3636
private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

content/components/openthread.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,12 @@ openthread:
5858
- **channel** (int): Channel number from 11 to 26
5959
- **network_name** (string): A human-readable Network Name
6060
- **network_key** (string): OpenThread network key
61-
- **panid** (string): 2-byte Personal Area Network ID (PAN ID)
62-
- **extpanid** (string): 8-byte Extended Personal Area Network ID (XPAN ID)
61+
- **pan_id** (string): 2-byte Personal Area Network ID (PAN ID)
62+
- **ext_pan_id** (string): 8-byte Extended Personal Area Network ID (XPAN ID)
6363
- **pskc** (string): PSKc is used to authenticate an external Thread Commissioner to a Thread network
6464
- **mesh_local_prefix** (ipv6network): Used to build Mesh-Local IPv6 addresses (ML-EIDs), which are unique to each Thread device within the network partition
65+
- **force_dataset** (*Optional*, bool): Forces ESPHome configuration to override any previously stored OpenThread
66+
network dataset on the device, ensuring configured parameters are always applied at startup. Defaults to `false`
6567
- **use_address** (*Optional*, string): Manually override what address to use to connect
6668
to the ESP. Defaults to auto-generated value.
6769
- **poll_period** (*Optional*, [Time](/guides/configuration-types#config-time)): When Poll_Period is set on an MTD device, the parent router will enqueue any messages and wait for the child to submit a poll data request

content/components/output/ac_dimmer.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ params:
77
image: ac_dimmer.svg
88
---
99

10-
> [!WARNING]
11-
> This component has not been fully tested yet, if you are testing this component
12-
> please share your experience with the dimmer hardware and light model and
13-
> configuration here <https://github.com/esphome/feature-requests/issues/278>
14-
>
15-
> Thanks!
16-
1710
The `ac_dimmer` component allows you to connect a dimmable light or other load
1811
which supports phase control dimming to your ESPHome project.
1912

content/components/update/esp32_hosted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ firmware should be built using the ESP-IDF framework and the resulting `.bin` fi
6464
configuration directory.
6565

6666
```sh
67-
# Build instructions for IDF 5.5.1 and ESP Hosted 2.6.1
67+
# Build instructions for IDF 5.5.1 and ESP Hosted 2.7.0
6868
git clone -b v5.5.1 --recursive https://github.com/espressif/esp-idf.git
6969
cd esp-idf
7070
./install.sh esp32c6
7171
source export.sh # for Linux/macOS
7272
export.bat # for Windows
7373
cd ..
74-
idf.py create-project-from-example "espressif/esp_hosted^2.6.1:slave"
74+
idf.py create-project-from-example "espressif/esp_hosted^2.7.0:slave"
7575
cd slave/
7676
idf.py set-target esp32c6
7777
idf.py build

0 commit comments

Comments
 (0)