-
Notifications
You must be signed in to change notification settings - Fork 91
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove HEMS an EEBus devices and change TCU handling to gateway #364
Merged
woehrl01
merged 10 commits into
openviess:master
from
Nibot1:fix/e3_tcu-hems-eebus_handling
Apr 2, 2024
+142
−19
Merged
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
3123505
change E3_TCU autodetect-handler to gateway
Nibot1 33fcf09
remove hems and eebus devices and fix tcu handling
Nibot1 3f867be
remove empty lines
Nibot1 996a688
add TCU300 from VX3 with Ethernet response
Nibot1 d8b647c
remove unnecessary if statement
Nibot1 3cd2335
add test
Nibot1 4ae52fd
fix comment
Nibot1 d40712c
add AutoDetect test
Nibot1 507f169
remove empty line
Nibot1 56e113a
fix pylint error
Nibot1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
{ | ||
"data": [ | ||
{ | ||
"feature": "gateway.devices", | ||
"gatewayId": "################", | ||
"timestamp": "2024-03-17T18:55:46.182Z", | ||
"isEnabled": true, | ||
"isReady": true, | ||
"apiVersion": 1, | ||
"uri": "https://api.viessmann.com/iot/v1/features/installations/252756/gateways/################/features/gateway.devices", | ||
"properties": { | ||
"devices": { | ||
"type": "DeviceList", | ||
"value": [ | ||
{ | ||
"id": "gateway", | ||
"fingerprint": "####", | ||
"modelId": "E3_TCU10_x07", | ||
"modelVersion": "####", | ||
"name": "TCU", | ||
"type": "tcu", | ||
"roles": [ | ||
"capability:hems", | ||
"capability:zigbeeCoordinator", | ||
"type:E3", | ||
"type:gateway;TCU300" | ||
], | ||
"status": "online" | ||
}, | ||
{ | ||
"id": "HEMS", | ||
"fingerprint": "###", | ||
"modelId": "E3_HEMS", | ||
"modelVersion": "###", | ||
"name": "Home Energy Management System", | ||
"type": "hems", | ||
"roles": [ | ||
"type:E3", | ||
"type:virtual;hems" | ||
], | ||
"status": "online" | ||
}, | ||
{ | ||
"id": "RoomControl-1", | ||
"fingerprint": "###", | ||
"modelId": "E3_RoomControl_One_525", | ||
"modelVersion": "####", | ||
"name": "E3_RoomControl_One_525", | ||
"type": "roomControl", | ||
"roles": [ | ||
"capability:monetization;FTDC", | ||
"capability:monetization;OWD", | ||
"capability:zigbeeCoordinator", | ||
"type:E3", | ||
"type:virtual;smartRoomControl" | ||
], | ||
"status": "online" | ||
}, | ||
{ | ||
"id": "EEBUS", | ||
"fingerprint": "#####", | ||
"modelId": "E3_EEBus", | ||
"modelVersion": "#####", | ||
"name": "accessories", | ||
"type": "EEBus", | ||
"roles": [ | ||
"type:E3", | ||
"type:accessory;eeBus" | ||
], | ||
"status": "online" | ||
}, | ||
{ | ||
"id": "0", | ||
"fingerprint": "ecu;#####", | ||
"modelId": "E3_VitoCharge_03", | ||
"modelVersion": "####", | ||
"name": "E3 device", | ||
"type": "electricityStorage", | ||
"roles": [ | ||
"capability:hems", | ||
"type:E3", | ||
"type:ess", | ||
"type:photovoltaic;Internal", | ||
"type:product;Vitocharge" | ||
], | ||
"status": "online" | ||
}, | ||
{ | ||
"id": "eebus-1", | ||
"fingerprint": "eebus:wallbox;########", | ||
"modelId": "E3_HEMS_VCS", | ||
"modelVersion": "####", | ||
"name": "Home Energy Management System", | ||
"type": "vehicleChargingStation", | ||
"roles": [ | ||
"type:E3", | ||
"type:accessory;vehicleChargingStation" | ||
], | ||
"status": "online" | ||
} | ||
] | ||
} | ||
}, | ||
"commands": {} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import unittest | ||
|
||
from PyViCare.PyViCareGateway import Gateway | ||
from PyViCare.PyViCareUtils import PyViCareNotSupportedFeatureError | ||
from tests.ViCareServiceMock import ViCareServiceMock | ||
|
||
|
||
class TCU300_ethernet(unittest.TestCase): | ||
def setUp(self): | ||
self.service = ViCareServiceMock('response/TCU300_ethernet.json') | ||
self.device = Gateway(self.service) | ||
|
||
def test_getSerial(self): | ||
self.assertEqual( | ||
self.device.getSerial(), "################") | ||
|
||
def test_getWifiSignalStrength(self): | ||
with self.assertRaises(PyViCareNotSupportedFeatureError): | ||
self.device.getWifiSignalStrength() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The TCU could probably also be ignored in the HA integration, right?
https://github.com/home-assistant/core/blob/dev/homeassistant/components/vicare/const.py#L18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the TCU does not provide any information
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you create the PR in the Home Assistant Repo?