diff --git a/.gitignore b/.gitignore
index 9f849e863..4350d522f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@ bin/GoSungrow
AppService_*.json
WebAppService_*.json
+/*.txt
+/GoSungrow
+/data/
+/dist/
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6817ac29..4a2c1f3b2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,36 +5,9 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -100,7 +73,7 @@
-
+
@@ -108,14 +81,6 @@
-
-
-
-
-
-
-
-
@@ -162,36 +127,11 @@
95
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 119
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 124
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 134
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go
- 200
+ 201
-
- file://$PROJECT_DIR$/iSolarCloud/funcs.go
- 135
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/funcs.go
- 123
-
-
file://$PROJECT_DIR$/iSolarCloud/api/struct_endpoint.go
105
@@ -219,24 +159,14 @@
file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 239
+ 207
file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 238
+ 206
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 375
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 391
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go
107
@@ -247,31 +177,11 @@
142
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 412
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 422
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 405
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailWithPsType/data.go
260
-
- file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 461
-
-
file://$PROJECT_DIR$/iSolarCloud/api/struct_points.go
288
@@ -284,33 +194,48 @@
file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 170
+ 138
file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 266
+ 234
- file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 259
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go
- 290
-
+ file://$PROJECT_DIR$/iSolarCloud/highlevel.go
+ 492
+
file://$PROJECT_DIR$/iSolarCloud/highlevel.go
- 417
-
+ 54
+
- file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go
- 123
-
+ file://$PROJECT_DIR$/iSolarCloud/highlevel.go
+ 136
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go
+ 485
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/web.go
+ 58
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/highlevel.go
+ 79
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/highlevel.go
+ 75
+
diff --git a/HA/CHANGELOG.md b/HA/CHANGELOG.md
new file mode 100644
index 000000000..c9b654fbf
--- /dev/null
+++ b/HA/CHANGELOG.md
@@ -0,0 +1,4 @@
+## [2.1.3] - 2022-03-14
+### Changed
+- GoSunGrow for HA ([fixes #1](https://github.com/MickMake/GoSunGrow/issues/1))
+
diff --git a/HA/Dockerfile b/HA/Dockerfile
new file mode 100644
index 000000000..32527c186
--- /dev/null
+++ b/HA/Dockerfile
@@ -0,0 +1,47 @@
+ARG BUILD_FROM
+FROM $BUILD_FROM
+
+# FROM alpine:latest
+MAINTAINER MickMake
+USER root
+
+LABEL \
+ io.hass.version="VERSION" \
+ io.hass.type="addon" \
+ io.hass.arch="armhf|aarch64|i386|amd64"
+
+
+ARG SUNGROW_APPKEY
+ENV SUNGROW_APPKEY ${SUNGROW_APPKEY}
+ARG SUNGROW_DEBUG
+ENV SUNGROW_DEBUG ${SUNGROW_DEBUG}
+ARG SUNGROW_HOST
+ENV SUNGROW_HOST ${SUNGROW_HOST}
+ARG SUNGROW_USER
+ENV SUNGROW_USER ${SUNGROW_USER}
+ARG SUNGROW_PASSWORD
+ENV SUNGROW_PASSWORD ${SUNGROW_PASSWORD}
+ARG SUNGROW_TIMEOUT
+ENV SUNGROW_TIMEOUT ${SUNGROW_TIMEOUT}
+
+ARG SUNGROW_MQTT_HOST
+ENV SUNGROW_MQTT_HOST ${SUNGROW_MQTT_HOST}
+ARG SUNGROW_MQTT_PASSWORD
+ENV SUNGROW_MQTT_PASSWORD ${SUNGROW_MQTT_PASSWORD}
+ARG SUNGROW_MQTT_PORT
+ENV SUNGROW_MQTT_PORT ${SUNGROW_MQTT_PORT}
+ARG SUNGROW_MQTT_USER
+ENV SUNGROW_MQTT_USER ${SUNGROW_MQTT_USER}
+
+ARG TZ
+ENV TZ ${TZ}
+
+COPY src/GoSungrow /usr/local/bin/GoSungrow
+COPY src/run.sh /usr/local/bin/run.sh
+RUN chmod a+x /usr/local/bin/GoSungrow /usr/local/bin/run.sh
+
+# ENTRYPOINT ["/usr/local/bin/GoSungrow"]
+# CMD ["crond", "-f", "-l", "2", "-L", "/var/log/cronlogs"]
+# CMD ["/usr/local/bin/GoSungrow", "mqtt", "sync"]
+CMD ["/usr/local/bin/run.sh"]
+
diff --git a/HA/GoSungrow b/HA/GoSungrow
new file mode 100755
index 000000000..c5f20dfe3
Binary files /dev/null and b/HA/GoSungrow differ
diff --git a/HA/build.yaml b/HA/build.yaml
new file mode 100644
index 000000000..8c79e08ad
--- /dev/null
+++ b/HA/build.yaml
@@ -0,0 +1,10 @@
+build_from:
+ aarch64: ghcr.io/home-assistant/aarch64-base:3.13
+ amd64: ghcr.io/home-assistant/amd64-base:3.13
+ armhf: ghcr.io/home-assistant/armhf-base:3.13
+ armv7: ghcr.io/home-assistant/armv7-base:3.13
+codenotary:
+ signer: mick@mickmake.com
+ base_image: mick@mickmake.com
+args:
+ GOSUNGROW_VERSION: 2.1.3
diff --git a/HA/config.yaml b/HA/config.yaml
new file mode 100644
index 000000000..bcee9a167
--- /dev/null
+++ b/HA/config.yaml
@@ -0,0 +1,42 @@
+name: "GoSungrow"
+description: "Fetch data from isolarcloud.com and push to HA."
+version: "2.1.3"
+stage: stable
+slug: "gosungrow"
+url: "https://github.com/MickMake/GoSunGrow/"
+codenotary: mick@mickmake.com
+arch:
+ - amd64
+ - aarch64
+ - armhf
+ - armv7
+map:
+ - config:rw
+panel_icon: mdi:puzzle
+auth_api: true
+startup: services
+hassio_api: true
+
+options:
+ sungrow_host: "https://augateway.isolarcloud.com"
+ sungrow_user: ""
+ sungrow_password: ""
+ sungrow_mqtt_host: "localhost"
+ sungrow_mqtt_port: "1883"
+ sungrow_mqtt_password: ""
+ sungrow_mqtt_user: ""
+ sungrow_debug: false
+ sungrow_appkey: "93D72E60331ABDCDC7B39ADC2D1F32B3"
+ sungrow_timeout: 60
+schema:
+ log_level: list(trace|debug|info|notice|warning|error|fatal)?
+ sungrow_host: str?
+ sungrow_user: str?
+ sungrow_password: str?
+ sungrow_mqtt_host: str?
+ sungrow_mqtt_port: str?
+ sungrow_mqtt_password: str?
+ sungrow_mqtt_user: str?
+ sungrow_debug: bool
+ sungrow_appkey: str?
+ sungrow_timeout: int
diff --git a/HA/src/GoSungrow b/HA/src/GoSungrow
new file mode 100755
index 000000000..56cbb3059
Binary files /dev/null and b/HA/src/GoSungrow differ
diff --git a/HA/src/run.sh b/HA/src/run.sh
new file mode 100644
index 000000000..9f84111aa
--- /dev/null
+++ b/HA/src/run.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bashio
+set -e
+
+CONFIG_PATH="/data/options.json"
+
+bashio::log.info "Setting up GoSungrow config ..."
+
+export SUNGROW_HOST=$(bashio::config 'sungrow_host')
+export SUNGROW_USER=$(bashio::config 'sungrow_user')
+export SUNGROW_PASSWORD=$(bashio::config 'sungrow_password')
+export SUNGROW_APPKEY=$(bashio::config 'sungrow_appkey')
+export SUNGROW_DEBUG=$(bashio::config 'sungrow_debug')
+export SUNGROW_TIMEOUT=$(bashio::config 'sungrow_timeout')
+
+export SUNGROW_MQTT_HOST=$(bashio::config 'sungrow_mqtt_host')
+export SUNGROW_MQTT_PORT=$(bashio::config 'sungrow_mqtt_port')
+export SUNGROW_MQTT_USER=$(bashio::config 'sungrow_mqtt_user')
+export SUNGROW_MQTT_PASSWORD=$(bashio::config 'sungrow_mqtt_password')
+
+bashio::log.info "Writing GoSungrow config ..."
+
+/usr/local/bin/GoSungrow config write \
+ --host="${SUNGROW_HOST}" \
+ --user="${SUNGROW_USER}" \
+ --password="${SUNGROW_PASSWORD}" \
+ --appkey="${SUNGROW_APPKEY}" \
+ --timeout="${SUNGROW_TIMEOUT}s" \
+ --mqtt-host="${SUNGROW_MQTT_HOST}" \
+ --mqtt-port="${SUNGROW_MQTT_PORT}" \
+ --mqtt-user="${SUNGROW_MQTT_USER}" \
+ --mqtt-password="${SUNGROW_MQTT_PASSWORD}" \
+ --debug="${SUNGROW_DEBUG}"
+
+bashio::log.info "Login to iSolarCloud using gateway ${SUNGROW_HOST} ..."
+
+/usr/local/bin/GoSungrow api login
+
+bashio::log.info "Syncing data from gateway ${SUNGROW_HOST} ..."
+
+/usr/local/bin/GoSungrow mqtt sync
+
diff --git a/cmd/const.go b/cmd/const.go
index bc2a5708d..110313789 100644
--- a/cmd/const.go
+++ b/cmd/const.go
@@ -6,7 +6,7 @@ import "time"
//goland:noinspection SpellCheckingInspection
const (
DefaultBinaryName = "GoSungrow"
- EnvPrefix = "SunGrow"
+ EnvPrefix = "SUNGROW"
defaultConfigFile = "config.json"
defaultTokenFile = "AuthToken.json"
diff --git a/docs/SungrowEnergy-Arrows+45.gif b/docs/SungrowEnergy-Arrows+45.gif
new file mode 100644
index 000000000..494335d7b
Binary files /dev/null and b/docs/SungrowEnergy-Arrows+45.gif differ
diff --git a/docs/SungrowEnergy-Arrows+90.gif b/docs/SungrowEnergy-Arrows+90.gif
new file mode 100644
index 000000000..7c209694b
Binary files /dev/null and b/docs/SungrowEnergy-Arrows+90.gif differ
diff --git a/docs/SungrowEnergy-Arrows-45.gif b/docs/SungrowEnergy-Arrows-45.gif
new file mode 100644
index 000000000..0a11668db
Binary files /dev/null and b/docs/SungrowEnergy-Arrows-45.gif differ
diff --git a/docs/SungrowEnergy-Arrows-90.gif b/docs/SungrowEnergy-Arrows-90.gif
new file mode 100644
index 000000000..5d99b758a
Binary files /dev/null and b/docs/SungrowEnergy-Arrows-90.gif differ
diff --git a/docs/SungrowEnergy-Arrows.gif b/docs/SungrowEnergy-Arrows.gif
new file mode 100644
index 000000000..61b540c6b
Binary files /dev/null and b/docs/SungrowEnergy-Arrows.gif differ
diff --git a/docs/SungrowEnergy.png b/docs/SungrowEnergy.png
new file mode 100644
index 000000000..15beedc1e
Binary files /dev/null and b/docs/SungrowEnergy.png differ
diff --git a/docs/SungrowEnergy.xcf b/docs/SungrowEnergy.xcf
new file mode 100644
index 000000000..1e1db8c56
Binary files /dev/null and b/docs/SungrowEnergy.xcf differ
diff --git a/docs/SungrowEnergy2-BatteryOff.png b/docs/SungrowEnergy2-BatteryOff.png
new file mode 100644
index 000000000..535dce936
Binary files /dev/null and b/docs/SungrowEnergy2-BatteryOff.png differ
diff --git a/docs/SungrowEnergy2-BatteryToGrid.png b/docs/SungrowEnergy2-BatteryToGrid.png
new file mode 100644
index 000000000..15fe65446
Binary files /dev/null and b/docs/SungrowEnergy2-BatteryToGrid.png differ
diff --git a/docs/SungrowEnergy2-BatteryToLoad.png b/docs/SungrowEnergy2-BatteryToLoad.png
new file mode 100644
index 000000000..11d2d2460
Binary files /dev/null and b/docs/SungrowEnergy2-BatteryToLoad.png differ
diff --git a/docs/SungrowEnergy2-GridOff.png b/docs/SungrowEnergy2-GridOff.png
new file mode 100644
index 000000000..05b8d9194
Binary files /dev/null and b/docs/SungrowEnergy2-GridOff.png differ
diff --git a/docs/SungrowEnergy2-GridToLoad.png b/docs/SungrowEnergy2-GridToLoad.png
new file mode 100644
index 000000000..7351684d3
Binary files /dev/null and b/docs/SungrowEnergy2-GridToLoad.png differ
diff --git a/docs/SungrowEnergy2-LoadOff.png b/docs/SungrowEnergy2-LoadOff.png
new file mode 100644
index 000000000..6b983aa95
Binary files /dev/null and b/docs/SungrowEnergy2-LoadOff.png differ
diff --git a/docs/SungrowEnergy2-PVOff.png b/docs/SungrowEnergy2-PVOff.png
new file mode 100644
index 000000000..b0b9c6d8a
Binary files /dev/null and b/docs/SungrowEnergy2-PVOff.png differ
diff --git a/docs/SungrowEnergy2-PVToBattery.png b/docs/SungrowEnergy2-PVToBattery.png
new file mode 100644
index 000000000..549d912a2
Binary files /dev/null and b/docs/SungrowEnergy2-PVToBattery.png differ
diff --git a/docs/SungrowEnergy2-PVToGrid.png b/docs/SungrowEnergy2-PVToGrid.png
new file mode 100644
index 000000000..6d867046c
Binary files /dev/null and b/docs/SungrowEnergy2-PVToGrid.png differ
diff --git a/docs/SungrowEnergy2-PVToLoad.png b/docs/SungrowEnergy2-PVToLoad.png
new file mode 100644
index 000000000..a6c4bf517
Binary files /dev/null and b/docs/SungrowEnergy2-PVToLoad.png differ
diff --git a/docs/SungrowEnergy2.png b/docs/SungrowEnergy2.png
new file mode 100644
index 000000000..374bd7ae1
Binary files /dev/null and b/docs/SungrowEnergy2.png differ
diff --git a/docs/SungrowEnergy2.xcf b/docs/SungrowEnergy2.xcf
new file mode 100644
index 000000000..f252c744c
Binary files /dev/null and b/docs/SungrowEnergy2.xcf differ
diff --git a/iSolarCloud/AppService/queryDeviceList/data.go b/iSolarCloud/AppService/queryDeviceList/data.go
index 1969e42a6..ee1c11681 100644
--- a/iSolarCloud/AppService/queryDeviceList/data.go
+++ b/iSolarCloud/AppService/queryDeviceList/data.go
@@ -7,6 +7,7 @@ import (
"GoSungrow/iSolarCloud/api/output"
"fmt"
"strconv"
+ "strings"
)
const Url = "/v1/devService/queryDeviceList"
@@ -276,18 +277,52 @@ func (e *EndPoint) GetData() api.Data {
var ret api.Data
for range Only.Once {
+ // Used for virtual entries.
+ // 0 - sungrow_battery_charging_power
+ var BatteryChargingPower float64
+ // sensor.sungrow_battery_discharging_power
+ var BatteryDischargingPower float64
+ // 0 - sensor.sungrow_total_export_active_power
+ var TotalExportActivePower float64
+ // sensor.sungrow_purchased_power
+ var PurchasedPower float64
+
+ // 0 - sensor.sungrow_daily_battery_charging_energy_from_pv
+ var DailyBatteryChargingEnergyFromPv float64
+ // sensor.sungrow_daily_battery_discharging_energy
+ var DailyBatteryDischargingEnergy float64
+ // 0 - sensor.sungrow_daily_feed_in_energy_pv
+ var DailyFeedInEnergyPv float64
+ // sensor.sungrow_daily_purchased_energy
+ var DailyPurchasedEnergy float64
+
+ var TotalDcPower float64
+
index := 0
for _, d := range e.Response.ResultData.PageList {
for _, p := range d.PointData {
if p.Unit == "W" {
- fv, err := strconv.ParseFloat(p.Value, 64)
- fv = fv / 1000
+ fv, err := api.DivideByThousand(p.Value)
+ // fv, err := strconv.ParseFloat(p.Value, 64)
+ // fv = fv / 1000
if err == nil {
- p.Value = fmt.Sprintf("%.3f", fv)
+ // p.Value = fmt.Sprintf("%.3f", fv)
+ p.Value = fv
p.Unit = "kW"
}
}
+ if p.Unit == "Wh" {
+ fv, err := api.DivideByThousand(p.Value)
+ // fv, err := strconv.ParseFloat(p.Value, 64)
+ // fv = fv / 1000
+ if err == nil {
+ // p.Value = fmt.Sprintf("%.3f", fv)
+ p.Value = fv
+ p.Unit = "kWh"
+ }
+ }
+
ret.Entries = append(ret.Entries, api.DataEntry {
Date: api.NewDateTime(p.TimeStamp),
PointId: api.NameDevicePointInt(d.PsKey, p.PointID),
@@ -300,8 +335,152 @@ func (e *EndPoint) GetData() api.Data {
})
index++
+
+ // Handle virtual results.
+ switch strings.ReplaceAll(p.PointName, " ", "") {
+ case "BatteryChargingPower":
+ BatteryChargingPower, _ = strconv.ParseFloat(p.Value, 64)
+ case "BatteryDischargingPower":
+ BatteryDischargingPower, _ = strconv.ParseFloat(p.Value, 64)
+ case "TotalExportActivePower":
+ TotalExportActivePower, _ = strconv.ParseFloat(p.Value, 64)
+ case "PurchasedPower":
+ PurchasedPower, _ = strconv.ParseFloat(p.Value, 64)
+ case "DailyBatteryChargingEnergyFromPv":
+ DailyBatteryChargingEnergyFromPv, _ = strconv.ParseFloat(p.Value, 64)
+ case "DailyBatteryDischargingEnergy":
+ DailyBatteryDischargingEnergy, _ = strconv.ParseFloat(p.Value, 64)
+ case "DailyFeedInEnergyPv":
+ DailyFeedInEnergyPv, _ = strconv.ParseFloat(p.Value, 64)
+ case "DailyPurchasedEnergy":
+ DailyPurchasedEnergy, _ = strconv.ParseFloat(p.Value, 64)
+ case "TotalDCPower":
+ TotalDcPower, _ = strconv.ParseFloat(p.Value, 64)
+ }
}
}
+
+ if len(ret.Entries) == 0 {
+ break
+ }
+
+ // Add virtual entries.
+ ts := ret.Entries[0].Date
+ var value string
+
+ if BatteryChargingPower > 0 {
+ value = api.Float64ToString(0 - BatteryChargingPower)
+ } else {
+ value = api.Float64ToString(BatteryDischargingPower)
+ }
+ ret.Entries = append(ret.Entries, api.DataEntry {
+ Date: ts,
+ PointId: "virtual.battery_power",
+ PointGroupName: "Virtual",
+ PointName: "Battery Power",
+ Value: value,
+ Unit: "kW",
+ ValueType: &api.Point {
+ PsKey: "virtual",
+ Id: "battery_power",
+ Description: "Battery Power",
+ Unit: "kW",
+ Type: "PointTypeInstant",
+ },
+ Index: index,
+ })
+ index++
+
+ if TotalExportActivePower > 0 {
+ value = api.Float64ToString(0 - TotalExportActivePower)
+ } else {
+ value = api.Float64ToString(PurchasedPower)
+ }
+ ret.Entries = append(ret.Entries, api.DataEntry {
+ Date: ts,
+ PointId: "virtual.grid_power",
+ PointGroupName: "Virtual",
+ PointName: "Grid Power",
+ Value: value,
+ Unit: "kW",
+ ValueType: &api.Point {
+ PsKey: "virtual",
+ Id: "grid_power",
+ Description: "Grid Power",
+ Unit: "kW",
+ Type: "PointTypeInstant",
+ },
+ Index: index,
+ })
+ index++
+
+
+ if DailyBatteryChargingEnergyFromPv > 0 {
+ value = api.Float64ToString(0 - DailyBatteryChargingEnergyFromPv)
+ } else {
+ value = api.Float64ToString(DailyBatteryDischargingEnergy)
+ }
+ ret.Entries = append(ret.Entries, api.DataEntry {
+ Date: ts,
+ PointId: "virtual.battery_energy",
+ PointGroupName: "Virtual",
+ PointName: "Battery Energy",
+ Value: value,
+ Unit: "kWh",
+ ValueType: &api.Point {
+ PsKey: "virtual",
+ Id: "battery_energy",
+ Description: "Battery Energy",
+ Unit: "kWh",
+ Type: "PointTypeInstant",
+ },
+ Index: index,
+ })
+ index++
+
+ if DailyFeedInEnergyPv > 0 {
+ value = api.Float64ToString(0 - DailyFeedInEnergyPv)
+ } else {
+ value = api.Float64ToString(DailyPurchasedEnergy)
+ }
+ ret.Entries = append(ret.Entries, api.DataEntry {
+ Date: ts,
+ PointId: "virtual.grid_energy",
+ PointGroupName: "Virtual",
+ PointName: "Grid Energy",
+ Value: value,
+ Unit: "kWh",
+ ValueType: &api.Point {
+ PsKey: "virtual",
+ Id: "grid_energy",
+ Description: "Grid Energy",
+ Unit: "kWh",
+ Type: "PointTypeInstant",
+ },
+ Index: index,
+ })
+ index++
+
+
+ value = api.Float64ToString(TotalDcPower - BatteryChargingPower - TotalExportActivePower)
+ ret.Entries = append(ret.Entries, api.DataEntry {
+ Date: ts,
+ PointId: "virtual.pv_to_load",
+ PointGroupName: "Virtual",
+ PointName: "PV To Load Power",
+ Value: value,
+ Unit: "kW",
+ ValueType: &api.Point {
+ PsKey: "virtual",
+ Id: "pv_to_load",
+ Description: "PV To Load Power",
+ Unit: "kW",
+ Type: "PointTypeInstant",
+ },
+ Index: index,
+ })
+ index++
+
}
return ret