Skip to content

Commit

Permalink
2.1.15
Browse files Browse the repository at this point in the history
  • Loading branch information
britkat1980 committed Jun 8, 2023
1 parent c99db7c commit 3ecfa44
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [2.1.15] - 2023-06-08
### Fixed
- Fixed SmartTarget error for solcast calls with a single array

## [2.1.14] - 2023-06-05
### Fixed
- REST /getCache endpoint fixed (incorrect json format)
Expand Down
5 changes: 4 additions & 1 deletion GivTCP/palm_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,16 @@ class GE:

# SolCast PV forecast generator. Up to two arrays are supported with a forecast for each
class Solcast:
def isBlank (myString):
return not (myString and myString.strip())

enable = True
key = str(os.getenv('SOLCASTAPI'))
url_se = "https://api.solcast.com.au/rooftop_sites/"+str(os.getenv('SOLCASTSITEID'))

# For single array installation uncomment the line below and comment out the subsequent line
#url_sw = ""
if not str(os.getenv('SOLCASTSITEID2')).strip():
if not isBlank(str(os.getenv('SOLCASTSITEID2'))):
url_sw = "https://api.solcast.com.au/rooftop_sites/"+str(os.getenv('SOLCASTSITEID2'))
else:
url_sw = ""
Expand Down
2 changes: 1 addition & 1 deletion buildx.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
::docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-dev:dev2 --push .
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:latest -t britkat/giv_tcp-ma:2.1.14 --push .
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:latest -t britkat/giv_tcp-ma:2.1.15 --push .
8 changes: 4 additions & 4 deletions config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "GivTCP"
description: "TCP Modbus connection to MQTT/JSON for Givenergy Battery/PV Invertors"
version: "2.1.14"
version: "2.1.15"
image: britkat/giv_tcp-ma
slug: "givtcp"
homeassistant_api: true
Expand Down Expand Up @@ -41,9 +41,9 @@ options:
MQTT_PORT: 1883
LOG_LEVEL: "Info"
PRINT_RAW: True
SELF_RUN: True #remove?
SELF_RUN: True
SELF_RUN_LOOP_TIMER: 5
HA_AUTO_D: True #remove?
HA_AUTO_D: True
DYNAMICTARIFF: False
DAYRATE: "0.155"
NIGHTRATE: "0.055"
Expand All @@ -60,7 +60,7 @@ options:
WEB_DASH: False
WEB_DASH_PORT: 3000
HOSTIP: "homeassistant.local"
CACHELOCATION: "/config/GivTCP" #remove?
CACHELOCATION: "/config/GivTCP"
DATASMOOTHER: "medium"
SMARTTARGET: False
PALM_WINTER: "01,02,11,12"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.9"
services:
GivTCP:
image: britkat/giv_tcp-ma:2.1.13
image: britkat/giv_tcp-ma:2.1.15
ports:
- "1883:1883" # MQTT
- "6345:6345" # REST (add increments for each invertor)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ pickle-mixin
flask-cors
rq
redis
git+https://github.com/jace/rq-dashboard.git@master
git+https://github.com/jace/rq-dashboard.git

0 comments on commit 3ecfa44

Please sign in to comment.