Merge pull request #33 from Valar-Systems/rewire/valar-core

Consume valar-core + scheduling as remote packages (retire self-contained core)

Author: daniel-frenkel

.github/workflows/build-release.yml

@@ -0,0 +1,62 @@
+# Build the Ropener firmware for every board and, on a tag, attach the factory
+# + OTA binaries (and the .ota.bin.md5 the on-device "Update Firmware" button
+# needs) to the GitHub release. Field units self-update by asset name, so keep
+# the Ropener-VAL3000 / Ropener-VAL3100 names stable.
+name: Build firmware
+
+on:
+  push:
+    branches: [main, 'rewire/valar-core']   # rewire/* verifies the branch pre-merge; remove after merge
+    tags: ['v*']
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - config: firmware/VAL3000/Ropener-VAL3000.yml
+            asset: Ropener-VAL3000
+          - config: firmware/VAL3100/Ropener-VAL3100.yml
+            asset: Ropener-VAL3100
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - name: Install ESPHome
+        run: pip install esphome
+
+      # On a tag build, stamp the release version (strip a leading "v") so the
+      # on-device "Firmware Version" matches the release the unit is running.
+      - name: Compile ${{ matrix.asset }}
+        run: |
+          if [ "${{ github.ref_type }}" = "tag" ]; then
+            V="${{ github.ref_name }}"; V="${V#v}"
+            esphome -s fw_version "$V" compile "${{ matrix.config }}"
+          else
+            esphome compile "${{ matrix.config }}"
+          fi
+
+      - name: Collect binaries + md5
+        run: |
+          mkdir -p dist
+          F=$(find . -path "*/.pioenvs/*/firmware.factory.bin" | head -1)
+          O=$(find . -path "*/.pioenvs/*/firmware.ota.bin" | head -1)
+          cp "$F" "dist/${{ matrix.asset }}.factory.bin"
+          cp "$O" "dist/${{ matrix.asset }}.ota.bin"
+          md5sum "dist/${{ matrix.asset }}.ota.bin" | cut -d' ' -f1 > "dist/${{ matrix.asset }}.ota.bin.md5"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.asset }}
+          path: dist/*
+
+      - name: Attach to release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          files: dist/*

.gitignore

@@ -16,3 +16,4 @@ docs/dist/
 # Python bytecode cache
 __pycache__/
 *.pyc
+secrets.yaml

firmware/VAL3000/Ropener-VAL3000-2.6.4.yml

@@ -0,0 +1,41 @@
+# =============================================================================
+# Ropener — VAL3000 (ESP32-C3)
+# =============================================================================
+# Board wrapper: pulls valar-core + scheduling from Valar-Systems/valar-motion
+# as remote packages and layers the Ropener product on top. No status LED.
+# =============================================================================
+substitutions:
+  device_name: "ropener"
+  friendly_name: "Ropener Curtain"
+  board_id: "VAL3000 (ESP32-C3)"
+  esp_board: "esp32-c3-devkitm-1"
+  log_uart: "USB_SERIAL_JTAG"
+  ota_repo: "Valar-Systems/Ropener"
+  ota_asset: "Ropener-VAL3000"
+  fw_version: "2.7.0"
+  pin_uart_tx: "6"
+  pin_uart_rx: "5"
+  pin_enn: "8"
+  pin_index: "0"
+  pin_diag: "1"
+  pin_btn1: "4"
+  pin_btn2: "3"
+  pin_btn_wifi: "7"
+
+esphome:
+  project:
+    name: "valar-systems.ropener"
+    version: "${fw_version}"
+
+packages:
+  valar_core:
+    url: https://github.com/Valar-Systems/valar-motion
+    ref: v0.2.0
+    files: [common/valar-core.yaml]
+    refresh: 1d
+  scheduling:
+    url: https://github.com/Valar-Systems/valar-motion
+    ref: v0.2.0
+    files: [common/scheduling.yaml]
+    refresh: 1d
+  product: !include ../common/ropener-product.yaml

firmware/VAL3000/Ropener-VAL3000.yml

@@ -0,0 +1,51 @@
+# =============================================================================
+# Ropener — VAL3100 (ESP32-C6)
+# =============================================================================
+# Board wrapper: sets this board's chip, GPIO map, and OTA identity, then pulls
+# in the shared valar-core + scheduling from Valar-Systems/valar-motion as remote
+# packages and layers the Ropener product on top. No board firmware is copied.
+# =============================================================================
+substitutions:
+  device_name: "ropener"
+  friendly_name: "Ropener Curtain"
+  board_id: "VAL3100 (ESP32-C6)"
+  esp_board: "esp32-c6-devkitc-1"
+  log_uart: "USB_SERIAL_JTAG"
+  ota_repo: "Valar-Systems/Ropener"     # field units self-update from Ropener's own releases
+  ota_asset: "Ropener-VAL3100"
+  fw_version: "2.7.0"
+  pin_uart_tx: "0"
+  pin_uart_rx: "1"
+  pin_enn: "5"
+  pin_index: "7"
+  pin_diag: "6"
+  pin_btn1: "3"
+  pin_btn2: "19"
+  pin_btn_wifi: "4"
+
+esphome:
+  project:
+    name: "valar-systems.ropener"
+    version: "${fw_version}"
+
+packages:
+  valar_core:
+    url: https://github.com/Valar-Systems/valar-motion
+    ref: v0.2.0
+    files: [common/valar-core.yaml]
+    refresh: 1d
+  scheduling:
+    url: https://github.com/Valar-Systems/valar-motion
+    ref: v0.2.0
+    files: [common/scheduling.yaml]
+    refresh: 1d
+  product: !include ../common/ropener-product.yaml
+
+light:
+  - platform: status_led
+    name: "Status LED"
+    id: status_led_light
+    web_server: { sorting_weight: 5, sorting_group_id: group_diagnostics }
+    pin:
+      number: GPIO23
+      inverted: false