From 1ad935a8f7d522e1264f32ba46a24326bcbe3c8c Mon Sep 17 00:00:00 2001 From: ha-elguano <116376335+ha-elguano@users.noreply.github.com> Date: Fri, 18 Jul 2025 20:25:00 -0700 Subject: [PATCH 1/6] Fixed number of LEDs to 1 1. Existing code has MSR-1 as having 3 LEDs in the strip. Corrected this to 1. 2. Proposing a default rmt_symbols value of 48. This is not strictly needed, but helps anyone adding a second LED strip from having to extend the "RGB Light" entity. 48 is the only real choice due to ESP32-C3's limit of 92 symbols, assignable in 48-symbol chunks (so it might as well be a default, as adding another RMT LED would require that one to be 48 as well). --- Integrations/ESPHome/Core.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 11df89f..e96235b 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -1,5 +1,5 @@ substitutions: - version: "25.7.18.1" + version: "25.7.18.2" device_description: ${name} made by Apollo Automation - version ${version}. esp32: @@ -578,7 +578,8 @@ light: pin: GPIO3 default_transition_length: 0s chipset: WS2812 - num_leds: 3 + num_leds: 1 + rmt_symbols: 48 rgb_order: grb effects: - pulse: From a53370e71f45ac7fd9cf5b356850a2586164bb5d Mon Sep 17 00:00:00 2001 From: Ben Penkacik Date: Tue, 29 Jul 2025 15:14:57 -0400 Subject: [PATCH 2/6] add logger to ble fork --- Integrations/ESPHome/Core.yaml | 2 +- Integrations/ESPHome/MSR-1_BLE.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index e96235b..080d75b 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -1,5 +1,5 @@ substitutions: - version: "25.7.18.2" + version: "25.7.29.1" device_description: ${name} made by Apollo Automation - version ${version}. esp32: diff --git a/Integrations/ESPHome/MSR-1_BLE.yaml b/Integrations/ESPHome/MSR-1_BLE.yaml index eb0a071..95480e3 100644 --- a/Integrations/ESPHome/MSR-1_BLE.yaml +++ b/Integrations/ESPHome/MSR-1_BLE.yaml @@ -18,6 +18,8 @@ esphome: min_version: 2025.2.0 +logger: + dashboard_import: package_import_url: github://ApolloAutomation/MSR-1/Integrations/ESPHome/MSR-1_BLE.yaml import_full_config: false From 40a8d6624474300808824bc9ea429e63f6be1538 Mon Sep 17 00:00:00 2001 From: Justin Bunton <130115204+Bunton33@users.noreply.github.com> Date: Wed, 6 Aug 2025 14:02:42 -0400 Subject: [PATCH 3/6] CI Fix Fixed firmware building --- .github/workflows/build.yml | 2 +- Integrations/ESPHome/Core.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1af6af1..657c95a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: device-name: msr-2 yaml-files: | Integrations/ESPHome/MSR-1_Factory.yaml - firmware-names: "_Factory:firmware" + firmware-names: "1_Factory:firmware" core-yaml-path: Integrations/ESPHome/Core.yaml esphome-version: stable # Bypass check if manually triggered with bypass option diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 080d75b..a056afd 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -1,5 +1,5 @@ substitutions: - version: "25.7.29.1" + version: "25.8.6.1" device_description: ${name} made by Apollo Automation - version ${version}. esp32: From 680bfd48793c4688239ec5d469bd17ba6760c710 Mon Sep 17 00:00:00 2001 From: Brandon Harvey <8107750+bharvey88@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:13:43 -0600 Subject: [PATCH 4/6] Change auto-assign assignee from TrevorSchirmer to bharvey88 --- .github/workflows/autoassign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autoassign.yml b/.github/workflows/autoassign.yml index 0158e68..314c179 100644 --- a/.github/workflows/autoassign.yml +++ b/.github/workflows/autoassign.yml @@ -15,5 +15,5 @@ jobs: uses: pozil/auto-assign-issue@v1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - assignees: TrevorSchirmer + assignees: bharvey88 numOfAssignee: 1 From c9f84bf178819bf2a0f93e599c5e8105fb7d981b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jan 2026 00:25:45 +0000 Subject: [PATCH 5/6] chore(ci): bump the github-actions group across 1 directory with 2 updates Bumps the github-actions group with 2 updates in the / directory: [pozil/auto-assign-issue](https://github.com/pozil/auto-assign-issue) and [actions/checkout](https://github.com/actions/checkout). Updates `pozil/auto-assign-issue` from 1 to 2 - [Release notes](https://github.com/pozil/auto-assign-issue/releases) - [Commits](https://github.com/pozil/auto-assign-issue/compare/v1...v2) Updates `actions/checkout` from 4.2.2 to 5.0.0 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.2...v5.0.0) --- updated-dependencies: - dependency-name: pozil/auto-assign-issue dependency-version: '2' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/checkout dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/autoassign.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autoassign.yml b/.github/workflows/autoassign.yml index 314c179..604d6d5 100644 --- a/.github/workflows/autoassign.yml +++ b/.github/workflows/autoassign.yml @@ -12,7 +12,7 @@ jobs: pull-requests: write steps: - name: 'Auto-assign issue' - uses: pozil/auto-assign-issue@v1 + uses: pozil/auto-assign-issue@v2 with: repo-token: ${{ secrets.GITHUB_TOKEN }} assignees: bharvey88 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc90609..f02c6d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - dev steps: - name: Checkout source code - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v6.0.2 - name: Build ESPHome firmware to verify configuration uses: esphome/build-action@v7 with: From 40066380a9ddd70f0a0b83ec4b29775f09e1f1bb Mon Sep 17 00:00:00 2001 From: Brandon Harvey Date: Fri, 17 Apr 2026 16:18:03 -0500 Subject: [PATCH 6/6] Fix duplicate logger key in MSR-1_BLE.yaml Git merge auto-resolved MSR-1_BLE.yaml but left a duplicate logger: key from main's PR #62 addition alongside beta's existing one. --- Integrations/ESPHome/MSR-1_BLE.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Integrations/ESPHome/MSR-1_BLE.yaml b/Integrations/ESPHome/MSR-1_BLE.yaml index 269da6c..4465d8e 100644 --- a/Integrations/ESPHome/MSR-1_BLE.yaml +++ b/Integrations/ESPHome/MSR-1_BLE.yaml @@ -26,7 +26,6 @@ dashboard_import: package_import_url: github://ApolloAutomation/MSR-1/Integrations/ESPHome/MSR-1_BLE.yaml import_full_config: false -logger: ota: - platform: esphome