Refactor name from config-solo to openspool-mini

spuder · Nov 25, 2024 · 1d297b3 · 1d297b3
1 parent 7ab1a07
commit 1d297b3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/esphome.yaml b/.github/workflows/esphome.yaml
@@ -72,7 +72,7 @@ jobs:
       - name: Build OpenSpool-Mini firmware
         uses: esphome/build-action@v4.0.2
         with:
-          yaml-file: ${{ github.workspace }}/firmware/config-solo.yaml
+          yaml-file: ${{ github.workspace }}/firmware/openspool-mini.yaml
           release-summary: ${{ env.RELEASE_SUMMARY }}
           release-url: https://openspool.io/firmware
           complete-manifest: false
@@ -81,7 +81,7 @@ jobs:
       - name: Build OpenSpool-AMS firmware
         uses: esphome/build-action@v4.0.2
         with:
-          yaml-file: ${{ github.workspace }}/firmware/config-ams.yaml
+          yaml-file: ${{ github.workspace }}/firmware/openspool-ams.yaml
           release-summary: ${{ env.RELEASE_SUMMARY }}
           release-url: https://openspool.io/firmware
           complete-manifest: false

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,17 +7,17 @@ repos:
   #     - id: yamlfmt
   - repo: local
     hooks:
-      - id: esphome-config-solo
+      - id: esphome-openspool-mini
         name: ESPHome Validate Solo Config
-        # entry: bash -c 'podman run -v "$(pwd)/firmware:/data" --rm ghcr.io/esphome/esphome:2024.11.0 config /data/config-solo.yaml'
-        entry: esphome config firmware/config-solo.yaml
+        # entry: bash -c 'podman run -v "$(pwd)/firmware:/data" --rm ghcr.io/esphome/esphome:2024.11.0 config /data/openspool-mini.yaml'
+        entry: esphome config firmware/openspool-mini.yaml
         language: system
         pass_filenames: false
         files: ^firmware/
-      - id: esphome-config-ams
+      - id: esphome-openspool-ams
         name: ESPHome Validate AMS Config
-        # entry: bash -c 'podman run -v "$(pwd)/firmware:/data" --rm ghcr.io/esphome/esphome:2024.11.0 config /data/config-ams.yaml'
-        entry: esphome config firmware/config-ams.yaml
+        # entry: bash -c 'podman run -v "$(pwd)/firmware:/data" --rm ghcr.io/esphome/esphome:2024.11.0 config /data/openspool-ams.yaml'
+        entry: esphome config firmware/openspool-ams.yaml
         language: system
         pass_filenames: false
         files: ^firmware/
diff --git a/firmware/Makefile b/firmware/Makefile
@@ -14,19 +14,19 @@ build-pcb-solo: build-esp32s2-solo
 build-pcb-ams: build-esp32s2-ams
 
 clean:
-	esphome clean config-solo.yaml
-	esphome clean config-ams.yaml
+	esphome clean openspool-mini.yaml
+	esphome clean openspool-ams.yaml
 	rm -rf .esphome/idedata/*
 	rm -rf ~/.platformio/penv
 build-esp32:
 	esphome config config-esp32.yaml
 	esphome compile config-esp32.yaml
 build-esp32s2-solo:
-	esphome config config-solo.yaml
-	esphome compile config-solo.yaml
+	esphome config openspool-mini.yaml
+	esphome compile openspool-mini.yaml
 build-esp32s2-ams:
-	esphome config config-ams.yaml
-	esphome compile config-ams.yaml
+	esphome config openspool-ams.yaml
+	esphome compile openspool-ams.yaml
 build-d1-mini-s2-breadboard:
 	esphome \
 		-s version dev \ 
@@ -46,10 +46,10 @@ build-d1-mini-s2-breadboard:
 		compile config-esp32s2.yaml
 upload-solo:
 	@echo "Uploading to $(USB_ADDRESS)"
-	esphome upload config-solo.yaml --device $(USB_ADDRESS)
+	esphome upload openspool-mini.yaml --device $(USB_ADDRESS)
 upload-ams:
 	@echo "Uploading to $(USB_ADDRESS)"
-	esphome upload config-ams.yaml --device $(USB_ADDRESS)
+	esphome upload openspool-ams.yaml --device $(USB_ADDRESS)
 logs-solo:
 	@echo "Uploading to $(USB_ADDRESS)"
 	esphome logs config-esp32s2.yaml --device $(USB_ADDRESS)
@@ -62,10 +62,10 @@ run-usb-breadboard-solo:
 		-s spi2_mosi_pin "GPIO35" \
 		-s rfid0_ss_pin "GPIO33" \
 		-s spi2_type "any" \
-		run config-solo.yaml --device $(USB_ADDRESS)
+		run openspool-mini.yaml --device $(USB_ADDRESS)
 run-usb-pcb-solo:
 	esphome \
-		run config-solo.yaml --device $(USB_ADDRESS)
+		run openspool-mini.yaml --device $(USB_ADDRESS)
 run-usb-pcb-ams:
 	esphome \
-		run config-ams.yaml --device $(USB_ADDRESS)
+		run openspool-ams.yaml --device $(USB_ADDRESS)
diff --git a/firmware/config-ams.yaml → firmware/openspool-ams.yaml b/firmware/config-ams.yaml → firmware/openspool-ams.yaml
@@ -74,5 +74,5 @@ api:
   reboot_timeout: 0s #reboot_timeout must be 0 if api and mqtt are defined
   id: api_openspool
 dashboard_import:
-  package_import_url: github://spuder/openspool/firmware/config-ams.yaml@main
+  package_import_url: github://spuder/openspool/firmware/openspool-ams.yaml@main
   import_full_config: false
diff --git a/firmware/config-solo.yaml → firmware/openspool-mini.yaml b/firmware/config-solo.yaml → firmware/openspool-mini.yaml
@@ -29,5 +29,5 @@ api:
   reboot_timeout: 0s #reboot_timeout must be 0 if api and mqtt are defined
   id: api_openspool
 dashboard_import:
-  package_import_url: github://spuder/openspool/firmware/config-solo.yaml@main
+  package_import_url: github://spuder/openspool/firmware/openspool-mini.yaml@main
   import_full_config: false