add arm64 docker image, fix buffer table

.github/workflows/dev.yml

@@ -0,0 +1,31 @@
+name: dev - Build only
+
+on:
+  workflow_dispatch:
+    branches:
+      - 'dev'
+  push:
+    branches:
+      - 'dev'
+
+jobs:
+  build:
+    runs-on: [ self-hosted ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build and push for AMD64/ARM64
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ secrets.DOCKER_USER }}/solis-s2-clickhouse:dev

.github/workflows/master.yml

@@ -1,10 +1,12 @@
-name: Master - Build and push to Docker Hub
+name: master - Build and push to Docker Hub
 
 on:
   workflow_dispatch:
-    branches: [ master ]
+    branches:
+      - 'master'
   push:
-    branches: [ master ]
+    branches:
+      - 'master'
 
 jobs:
   build:
@@ -15,7 +17,15 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}
-      - name: Build image
-        run: docker build -t ${{ secrets.DOCKER_USER }}/solis-s2-clickhouse:latest .
-      - name: Push to Docker Hub
-        run: docker push ${{ secrets.DOCKER_USER }}/solis-s2-clickhouse:latest
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build and push for AMD64/ARM64
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ secrets.DOCKER_USER }}/solis-s2-clickhouse:latest

tables.sql

@@ -45,22 +45,22 @@ CREATE TABLE solis_s2_buffer (
         amps Float32, -- MPPT current
         watts UInt32 -- MPPT power
     )),
-    mppt_calculated_watts UInt32, -- DC power calculated by summing MPPT power
-    mppt_actual_watts UInt32, -- DC power measured by inverter
+    dc_calculated_watts UInt32, -- DC power calculated by summing MPPT power
+    dc_actual_watts UInt32, -- DC power measured by inverter
     dc_busbar_voltage Float32, -- DC busbar voltage
     dc_half_busbar_voltage Float32, -- DC half busbar voltage
     ground_voltage Float32, -- Ground voltage
     ac_reactive_var UInt32, -- AC reactive power
     ac_apparent_va UInt32, -- AC apparent power
     ac_calculated_watts UInt32, -- AC calculated power
     ac_actual_watts UInt32, -- AC actual power
-    ac_phase Array(Nested(
+    ac_phases Array(Nested(
         id LowCardinality(String), -- Phase ID (A, B, C)
         voltage Float32, -- Phase voltage
         amps Float32, -- Phase current
         watts UInt32 -- Phase power
     )),
-    ac_frequency Float32, -- AC frequency
+    ac_frequency_hz Float32, -- AC frequency
     daily_yield_kwh Float32, -- Daily yield in kWh
     monthly_yield_kwh UInt32, -- Monthly yield in kWh
     annual_yield_kwh UInt64, -- Annual yield in kWh