Merge pull request #10 from ApolloAutomation/ManagedUpdates

Managed Updates, Improv, Action

.github/workflows/build.yml

@@ -0,0 +1,142 @@
+name: Build
+env:
+  DEVICE_NAME: mtr-1
+  RELEASE_URL: ${{ github.server_url }}/${{ github.repository }}/releases/latest
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Build And Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set uppercase DEVICE_NAME
+        run: |
+          echo "UPPERCASE_DEVICE_NAME=$(echo $DEVICE_NAME | tr '[:lower:]' '[:upper:]')" >> $GITHUB_ENV
+
+      - name: Build Firmware
+        uses: esphome/[email protected]
+        id: esphome-build
+        with:
+          yaml_file: Integrations/ESPHome/${{ env.UPPERCASE_DEVICE_NAME }}.yaml
+          version: 'latest'
+          cache: true
+
+      - name: Read version from YAML file
+        id: read_version
+        run: |
+          version=$(awk '/substitutions:/ {found=1} found && /version:/ {print $2; exit}' Integrations/ESPHome/${{ env.UPPERCASE_DEVICE_NAME }}.yaml | tr -d '"')
+          echo "project_version=$version" >> $GITHUB_ENV
+      
+      - name: Move generated files to output
+        run: |
+          mkdir -p output
+          mv ${{ steps.esphome-build.outputs.name }}/* output/
+          echo ${{ steps.esphome-build.outputs.version }} > output/version
+          # Extract MD5 checksum of firmware.ota.bin
+          MD5_CHECKSUM=$(jq -r '.ota.md5' output/manifest.json)
+          echo "MD5_CHECKSUM=$MD5_CHECKSUM" >> $GITHUB_ENV
+
+          # Create new manifest.json with jq
+          jq -n --arg name "${{ env.DEVICE_NAME }}" \
+                 --arg version "${{ env.project_version }}" \
+                 --arg md5 "$MD5_CHECKSUM" \
+                 '{name: $name, version: $version, home_assistant_domain: "esphome", new_install_prompt_erase: false, builds: [{chipFamily: "ESP32-C3", parts: [{path: "apollo-${{ env.DEVICE_NAME }}-esp32c3.factory.bin", offset: 0}], ota: {path: "apollo-${{ env.DEVICE_NAME }}-esp32c3.ota.bin", md5: $md5}}]}' > output/manifest.json
+
+
+      - uses: actions/[email protected]
+        with:
+          path: output/
+          retention-days: 1
+
+      - name: Collect merge commits
+        id: collect_commits
+        run: |
+          MERGE_COMMITS=$(git log --merges --pretty=format:"%h %s" $(git describe --tags --abbrev=0 @^)..@)
+          echo "MERGE_COMMITS=$MERGE_COMMITS" >> $GITHUB_ENV
+
+      - name: Create Release
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
+        with:
+          tag_name: ${{ env.project_version }}
+          release_name: "Release ${{ env.project_version }}"
+          body: Release of version ${{ env.project_version }}
+
+          draft: false
+          prerelease: false
+
+      - name: Upload firmware.factory.bin to Release
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: output/apollo-${{ env.DEVICE_NAME }}-esp32c3.factory.bin
+          asset_name: apollo-${{ env.DEVICE_NAME }}-esp32c3.factory.bin
+          asset_content_type: application/octet-stream
+
+      - name: Upload firmware.ota.bin to Release
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: output/apollo-${{ env.DEVICE_NAME }}-esp32c3.ota.bin
+          asset_name: apollo-${{ env.DEVICE_NAME }}-esp32c3.ota.bin
+          asset_content_type: application/octet-stream
+      - name: Upload firmware.ota.bin to Release
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: output/manifest.json
+          asset_name: manifest.json
+          asset_content_type: application/octet-stream
+
+
+  prep:
+    name: Consolidate firmwares
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/[email protected]
+        with:
+          path: output
+      - run: cp -R static/* output/
+      - uses: actions/[email protected]
+        with:
+          path: output
+          retention-days: 1
+
+  deploy:
+    if: contains(fromJSON('["workflow_dispatch", "push", "schedule"]'), github.event_name) && github.ref == 'refs/heads/main'
+    name: Deploy to GitHub Pages
+    runs-on: ubuntu-latest
+    needs: prep
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/[email protected]

Integrations/ESPHome/MTR-1.yaml

@@ -1,7 +1,7 @@
 #Define Project
 substitutions:
   name: apollo-mtr-1
-  version: "24.6.20.1"
+  version: "24.7.2.1"
   device_description: ${name} made by Apollo Automation - version ${version}.
 
 esphome:
@@ -97,10 +97,34 @@ logger:
 
 ota:
   - platform: esphome
+    password: "apolloautomation"
+    id: ota_default
+  - platform: http_request
+    id: ota_managed
+
+http_request:
+  useragent: esphome/device
+  timeout: 10s
+  verify_ssl: false
+
+update:
+  - platform: http_request
+    id: firmware_update
+    name: Firmware Update
+    source: https://apolloautomation.github.io/MTR-1/artifact/manifest.json
+
+improv_serial:
+
+esp32_improv:
+  authorizer: none
 
 
 wifi:
-  power_save_mode: none
+  on_connect:
+    - delay: 5s  # Gives time for improv results to be transmitted
+    - ble.disable:
+  on_disconnect:
+    - ble.enable:
   ap:
     ssid: "Apollo MTR1 Hotspot"
 
@@ -227,6 +251,7 @@ binary_sensor:
     pin:
       number: GPIO9
       inverted: true
+      ignore_strapping_warning: true
       mode:
         input: true
         pullup: true

PULL_REQUEST_TEMPLATE.md

@@ -10,6 +10,4 @@ Breaks:
 
 Checks:
 - [ ] Documentation Updated
-- [ ] Build Number Incremented In MTR-1.yaml
-- [ ] Build Number Incremented In manifest.json
-- [ ] firmware-factory.bin Updated
+- [ ] Build Number Incremented In AIR-1.yaml

README.md

@@ -1,10 +1,10 @@
-# Apollo Multi-target Motion Multisensor
+# Apollo Multi-target Motion Multisensor (MTR-1)`
 
 
 
 This sensor offers a wide range of functionality for Home Assistant in a very tiny package.
 
 Links: \
 Discord (Support/feedback/discussion/future products): [https://discord.gg/8PpS4yUaUh](https://discord.gg/mMNgQPyF94) \
-Shop: https://apolloautomation.com \
-Wiki: https://wiki.apolloautomation.com 
+Shop: [https://apolloautomation.com](https://apolloautomation.com) \
+Wiki: [https://wiki.apolloautomation.com](https://wiki.apolloautomation.com/)

index.html → static/index.html

@@ -82,7 +82,7 @@
       <h1>Apollo MTR-1 Installer</h1>
 
       <p class="button-row" align="center">
-        <esp-web-install-button manifest="./Integrations/ESPHome/manifest.json">
+        <esp-web-install-button manifest="./artifact/manifest.json">
         </esp-web-install-button>
       </p>