Skip to content

Commit 8a752d1

Browse files
committed
Merge branch 'main' into ble_apply_charge_limit
2 parents c010926 + 6c41416 commit 8a752d1

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

lib/TWCManager/Vehicle/TeslaBLE.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,14 @@ def _is_already_satisfied(self, output):
312312
output_lower = output.lower()
313313
return any(
314314
("car could not execute command: " + reason) in output_lower
315-
for reason in ("complete", "is_charging", "charging", "requested", "disconnected")
315+
for reason in (
316+
"complete",
317+
"is_charging",
318+
"charging",
319+
"requested",
320+
"disconnected",
321+
"already_set",
322+
)
316323
)
317324

318325
def parseCommandOutput(self, output):

requirements.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
cryptography>=2.6
22
build
3-
growattServer>=0.1.1
3+
growattServer>=0.1.1,<1.7.1; python_version < '3.10'
4+
growattServer>=1.7.1,<2.0.0; python_version == '3.10'
5+
growattServer>=1.7.1,<2.2.0; python_version == '3.11'
6+
growattServer>=2.2.0; python_version >= '3.12'
47
jinja2>=2.11.2
58
ocpp
69
paho_mqtt>=1.5.0

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
# Dependencies
1414
install_requires=[
1515
"cryptography>=2.6",
16-
"growattServer>=0.1.1",
16+
"growattServer>=0.1.1,<1.7.1; python_version < '3.10'",
17+
"growattServer>=1.7.1,<2.0.0; python_version == '3.10'",
18+
"growattServer>=1.7.1,<2.2.0; python_version == '3.11'",
19+
"growattServer>=2.2.0; python_version >= '3.12'",
1720
"jinja2>=2.11.2",
1821
"ocpp",
1922
"paho_mqtt>=1.5.0",

0 commit comments

Comments
 (0)