feat: add version sensor and fix up some other sensors

wolffshots · Apr 9, 2024 · 43fa6c5 · 43fa6c5
1 parent 8247554
commit 43fa6c5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,9 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-
-    - name: Print event JSON
-      run: cat $GITHUB_EVENT_PATH
 
     - name: Cache Go modules
       uses: actions/cache@v4

diff --git a/.github/workflows/svelte.yml b/.github/workflows/svelte.yml
@@ -25,9 +25,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Print event JSON
-        run: cat $GITHUB_EVENT_PATH
-
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:

diff --git a/main.go b/main.go
@@ -19,7 +19,7 @@ import (
 	serial "github.com/wolffshots/phocus/v2/serial"     // comms with inverter
 )
 
-const version = "v2.11.0"
+const version = "v2.11.1"
 
 type Configuration struct {
 	Serial struct {
@@ -101,6 +101,12 @@ func main() {
 		log.Printf("Failed to clear previous error: %v\n", pubErr)
 	}
 
+	// send new version
+	pubErr = mqtt.Send(client, "phocus/stats/version", 0, false, version, 10)
+	if pubErr != nil {
+		log.Printf("Failed to set phocus version: %v\n", pubErr)
+	}
+
 	// serial
 	port, err := serial.Setup(
 		configuration.Serial.Port,

diff --git a/sensors/sensors.go b/sensors/sensors.go
@@ -27,6 +27,17 @@ type Sensor struct {
 }
 
 var sensors = []Sensor{
+	{
+		SensorTopic:   "homeassistant/sensor/phocus/version/config",
+		UniqueId:      "phocus_version",
+		Unit:          units.None,
+		StateClass:    state_classes.None,
+		DeviceClass:   device_classes.None,
+		Name:          "Phocus Version",
+		ValueTemplate: "",
+		StateTopic:    "phocus/stats/version",
+		Icon:          "mdi:source-branch",
+	},
 	{
 		SensorTopic:   "homeassistant/sensor/phocus/start_time/config",
 		UniqueId:      "phocus_start_time",
@@ -212,7 +223,7 @@ var sensors = []Sensor{
 		Name:          "QPGS1 PV Input Current",
 		ValueTemplate: "{{ value_json.PVInputCurrent }}",
 		StateTopic:    "phocus/stats/qpgs1",
-		Icon:          "mdi:current",
+		Icon:          "mdi:current-dc",
 	},
 	{
 		SensorTopic:   "homeassistant/sensor/phocus/qpgs2_pv_input_current/config",
@@ -223,7 +234,7 @@ var sensors = []Sensor{
 		Name:          "QPGS2 PV Input Current",
 		ValueTemplate: "{{ value_json.PVInputCurrent }}",
 		StateTopic:    "phocus/stats/qpgs2",
-		Icon:          "mdi:current",
+		Icon:          "mdi:current-dc",
 	},
 	{
 		SensorTopic:   "homeassistant/sensor/phocus/qpgs1_battery_discharge_current/config",
@@ -234,7 +245,7 @@ var sensors = []Sensor{
 		Name:          "QPGS1 Battery Discharge Current",
 		ValueTemplate: "{{ value_json.BatteryDischargeCurrent }}",
 		StateTopic:    "phocus/stats/qpgs1",
-		Icon:          "mdi:current",
+		Icon:          "mdi:current-dc",
 	},
 	{
 		SensorTopic:   "homeassistant/sensor/phocus/qpgs2_battery_discharge_current/config",
@@ -245,7 +256,7 @@ var sensors = []Sensor{
 		Name:          "QPGS2 Battery Discharge Current",
 		ValueTemplate: "{{ value_json.BatteryDischargeCurrent }}",
 		StateTopic:    "phocus/stats/qpgs2",
-		Icon:          "mdi:current",
+		Icon:          "mdi:current-dc",
 	},
 	{
 		SensorTopic:   "homeassistant/sensor/phocus/qpgs1_battery_charge_current/config",
@@ -256,7 +267,7 @@ var sensors = []Sensor{
 		Name:          "QPGS1 Battery Charge Current",
 		ValueTemplate: "{{ value_json.BatteryChargingCurrent }}",
 		StateTopic:    "phocus/stats/qpgs1",
-		Icon:          "mdi:current",
+		Icon:          "mdi:current-dc",
 	},
 	{
 		SensorTopic:   "homeassistant/sensor/phocus/qpgs2_battery_charge_current/config",
@@ -267,7 +278,7 @@ var sensors = []Sensor{
 		Name:          "QPGS2 Battery Charge Current",
 		ValueTemplate: "{{ value_json.BatteryChargingCurrent }}",
 		StateTopic:    "phocus/stats/qpgs2",
-		Icon:          "mdi:current",
+		Icon:          "mdi:current-dc",
 	},
 	{
 		SensorTopic:   "homeassistant/sensor/phocus/qpgs1_ac_input_mode/config",