Skip to content

Commit

Permalink
#94 add charging time and charge kWh
Browse files Browse the repository at this point in the history
  • Loading branch information
@leeyuentuen
leeyuentuen committed Apr 19, 2024
1 parent c71fc5b commit 9009cfb
Show file tree
Hide file tree
Showing 2 changed files with 250 additions and 12 deletions.
54 changes: 46 additions & 8 deletions custom_components/alfen_wallbox/alfen.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,28 +329,66 @@ async def _get_transaction(self):

try:
if "version" in line:
#_LOGGER.debug("Version line" + line)
line = line.split(":2,", 2)[1]

splitline = line.split(" ")

if "txstart" in line:
#_LOGGER.debug("start line: " + line)
tid = line.split(":", 2)[0].split("_", 2)[0]
socket = line.split(", ", 2)[1]
tag = line.split("kWh ", 2)[1].split(" ", 2)[0]

tid = splitline[0].split("_", 2)[0]
socket = splitline[3] + " " + splitline[4].split(",", 2)[0]

date = splitline[5] + " " + splitline[6]
kWh = splitline[7].split('kWh', 2)[0]
tag= splitline[8]

# 3: transaction id
# 9: 1
# 10: y


if self.latest_tag is None:
self.latest_tag = {}
self.latest_tag[socket,"start"] = tag
self.latest_tag[socket,"start", "tag"] = tag
self.latest_tag[socket,"start","date"] = date
self.latest_tag[socket,"start","kWh"] = kWh

elif "txstop" in line:
tid = line.split(":", 2)[0].split("_", 2)[0]
socket = line.split(", ", 2)[1]
tag = line.split("kWh ", 2)[1].split(" ", 2)[0]
#_LOGGER.debug("stop line: " + line)

tid = splitline[0].split("_", 2)[0]
socket = splitline[3] + " " + splitline[4].split(",", 2)[0]

date = splitline[5] + " " + splitline[6]
kWh = splitline[7].split('kWh', 2)[0]
tag= splitline[8]

# 2: transaction id
# 9: y

if self.latest_tag is None:
self.latest_tag = {}
self.latest_tag[socket,"stop"] = tag
self.latest_tag[socket,"stop","tag"] = tag
self.latest_tag[socket,"stop","date"] = date
self.latest_tag[socket,"stop","kWh"] = kWh

elif "mv" in line:
tid = line.split("_", 2)[0]
#_LOGGER.debug("mv line: " + line)
tid = splitline[0].split("_", 2)[0]
socket = splitline[1] + " " + splitline[2].split(",", 2)[0]
date = splitline[3] + " " + splitline[4]
kWh = splitline[5]

if self.latest_tag is None:
self.latest_tag = {}
self.latest_tag[socket,"mv","date"] = date
self.latest_tag[socket,"mv","kWh"] = kWh

#_LOGGER.debug(self.latest_tag)

elif 'dto' in line:
continue
else:
Expand Down
208 changes: 204 additions & 4 deletions custom_components/alfen_wallbox/sensor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,40 @@ class AlfenSensorDescription(
unit=None,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_1_charging",
name="Tag Socket 1 Charging",
icon="mdi:battery-charging",
api_param=None,
unit=UnitOfEnergy.KILO_WATT_HOUR,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_1_charging_time",
name="Tag Socket 1 Charging Time",
icon="mdi:clock",
api_param=None,
unit=UnitOfTime.MINUTES,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_1_charged",
name="Tag Socket 1 Last Charge",
icon="mdi:battery-charging",
api_param=None,
unit=UnitOfEnergy.KILO_WATT_HOUR,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_1_charged_time",
name="Tag Socket 1 Last Charge Time",
icon="mdi:clock",
api_param=None,
unit=UnitOfTime.MINUTES,
round_digits=None,
),


)

ALFEN_SENSOR_DUAL_SOCKET_TYPES: Final[tuple[AlfenSensorDescription, ...]] = (
Expand Down Expand Up @@ -1442,6 +1476,38 @@ class AlfenSensorDescription(
unit=None,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_2_charging",
name="Tag Socket 2 Charging",
icon="mdi:battery-charging",
api_param=None,
unit=UnitOfEnergy.KILO_WATT_HOUR,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_2_charging_time",
name="Tag Socket 2 Charging Time",
icon="mdi:clock",
api_param=None,
unit=UnitOfTime.MINUTES,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_2_charged",
name="Tag Socket 2 Last Charge",
icon="mdi:battery-charging",
api_param=None,
unit=UnitOfEnergy.KILO_WATT_HOUR,
round_digits=None,
),
AlfenSensorDescription(
key="custom_tag_socket_2_charged_time",
name="Tag Socket 2 Last Charge Time",
icon="mdi:clock",
api_param=None,
unit=UnitOfTime.MINUTES,
round_digits=None,
),
)


Expand Down Expand Up @@ -1641,31 +1707,165 @@ def state(self) -> StateType:
if self._device.latest_tag is None:
return "No Tag"
for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 1" and key[1] == "start":
if key[0] == "socket 1" and key[1] == "start" and key[2] == "tag":
return value
return "No Tag"

if self.entity_description.key in ("custom_tag_socket_1_charging", "custom_tag_socket_1_charged"):
if self._device.latest_tag is None:
return "Unknown"
## calculate the usage
startkWh = None
mvkWh = None
stopkWh = None

for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 1" and key[1] == "start" and key[2] == "kWh":
startkWh = value
continue
if key[0] == "socket 1" and key[1] == "mv" and key[2] == "kWh":
mvkWh = value
continue
if key[0] == "socket 1" and key[1] == "stop" and key[2] == "kWh":
stopkWh = value
continue

if startkWh is not None and mvkWh is not None and self.entity_description.key == 'custom_tag_socket_1_charging':
# if we have stopkWh and it is higher then mvkWh, then we are not charging anymore and we should return 0
if stopkWh is not None and float(stopkWh) >= float(mvkWh):
return 0
return round(float(mvkWh) - float(startkWh), 2)

if startkWh is not None and stopkWh is not None and self.entity_description.key == 'custom_tag_socket_1_charged':
return round(float(stopkWh) - float(startkWh), 2)

if self.entity_description.key in ["custom_tag_socket_1_charging_time", "custom_tag_socket_1_charged_time"]:
if self._device.latest_tag is None:
return "Unknown"

startDate = None
mvDate = None
stopDate = None


for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 1" and key[1] == "start" and key[2] == "date":
startDate = value
continue
if key[0] == "socket 1" and key[1] == "mv" and key[2] == "date":
mvDate = value
continue
if key[0] == "socket 1" and key[1] == "stop" and key[2] == "date":
stopDate = value
continue

if startDate is not None and stopDate is not None and self.entity_description.key == 'custom_tag_socket_1_charged_time':
startDate = datetime.datetime.strptime(startDate, '%Y-%m-%d %H:%M:%S')
stopDate = datetime.datetime.strptime(stopDate, '%Y-%m-%d %H:%M:%S')

if stopDate < startDate:
return 0
# return the value in minutes
return round((stopDate - startDate).total_seconds() / 60, 2)

if startDate is not None and mvDate is not None and self.entity_description.key == 'custom_tag_socket_1_charging_time':
startDate = datetime.datetime.strptime(startDate, '%Y-%m-%d %H:%M:%S')
mvDate = datetime.datetime.strptime(mvDate, '%Y-%m-%d %H:%M:%S')

if mvDate < startDate:
return 0
# return the value in minutes
return round((mvDate - startDate).total_seconds() / 60, 2)


if self.entity_description.key == "custom_tag_socket_1_stop":
if self._device.latest_tag is None:
return "No Tag"
for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 1" and key[1] == "stop":
if key[0] == "socket 1" and key[1] == "stop" and key[2] == "tag":
return value
return "No Tag"

if self.entity_description.key == "custom_tag_socket_2_start":
if self._device.latest_tag is None:
return "No Tag"
for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 2" and key[1] == "start":
if key[0] == "socket 2" and key[1] == "start" and key[2] == "tag":
return value
return "No Tag"

if self.entity_description.key in ("custom_tag_socket_2_charging", "custom_tag_socket_2_charged"):
if self._device.latest_tag is None:
return "Unknown"
## calculate the usage
startkWh = None
mvkWh = None
stopkWh = None

for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 2" and key[1] == "start" and key[2] == "kWh":
startkWh = value
continue
if key[0] == "socket 2" and key[1] == "mv" and key[2] == "kWh":
mvkWh = value
continue
if key[0] == "socket 2" and key[1] == "stop" and key[2] == "kWh":
stopkWh = value
continue

if startkWh is not None and mvkWh is not None and self.entity_description.key == 'custom_tag_socket_2_charging':
# if we have stopkWh and it is higher then mvkWh, then we are not charging anymore and we should return 0
if stopkWh is not None and float(stopkWh) >= float(mvkWh):
return 0
return round(float(mvkWh) - float(startkWh), 2)

if startkWh is not None and stopkWh is not None and self.entity_description.key == 'custom_tag_socket_2_charged':
return round(float(stopkWh) - float(startkWh), 2)

if self.entity_description.key in ["custom_tag_socket_2_charging_time", "custom_tag_socket_2_charged_time"]:
if self._device.latest_tag is None:
return "Unknown"

startDate = None
mvDate = None
stopDate = None


for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 2" and key[1] == "start" and key[2] == "date":
startDate = value
continue
if key[0] == "socket 2" and key[1] == "mv" and key[2] == "date":
mvDate = value
continue
if key[0] == "socket 2" and key[1] == "stop" and key[2] == "date":
stopDate = value
continue

if startDate is not None and stopDate is not None and self.entity_description.key == 'custom_tag_socket_2_charged_time':
startDate = datetime.datetime.strptime(startDate, '%Y-%m-%d %H:%M:%S')
stopDate = datetime.datetime.strptime(stopDate, '%Y-%m-%d %H:%M:%S')

if stopDate < startDate:
return 0
# return the value in minutes
return round((stopDate - startDate).total_seconds() / 60, 2)

if startDate is not None and mvDate is not None and self.entity_description.key == 'custom_tag_socket_2_charging_time':
startDate = datetime.datetime.strptime(startDate, '%Y-%m-%d %H:%M:%S')
mvDate = datetime.datetime.strptime(mvDate, '%Y-%m-%d %H:%M:%S')

if mvDate < startDate:
return 0
# return the value in minutes
return round((mvDate - startDate).total_seconds() / 60, 2)


if self.entity_description.key == "custom_tag_socket_2_stop":
if self._device.latest_tag is None:
return "No Tag"
for (key,value) in self._device.latest_tag.items():
if key[0] == "socket 2" and key[1] == "stop":
if key[0] == "socket 2" and key[1] == "stop" and key[2] == "tag":
return value
return "No Tag"

Expand Down

0 comments on commit 9009cfb

Please sign in to comment.