-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrating fransiouz switch class and cleanup code, updated code for…
… websockets 9
- Loading branch information
Showing
6 changed files
with
213 additions
and
34 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| websockets>=8.1 | ||
| websockets>=9.0.1 | ||
| requests>=2.22.0 | ||
| gmqtt>=0.6.1 |
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,114 @@ | ||
| import json | ||
| import time | ||
| from datetime import datetime | ||
| from sensors import sensor | ||
|
|
||
| switch_config_topic = "homeassistant/switch/tydom/{id}/config" | ||
| switch_state_topic = "switch/tydom/{id}/state" | ||
| switch_attributes_topic = "switch/tydom/{id}/attributes" | ||
| switch_command_topic = "switch/tydom/{id}/set_levelCmdGate" | ||
| switch_level_topic = "switch/tydom/{id}/current_level" | ||
| switch_set_level_topic = "switch/tydom/{id}/set_levelGate" | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| class Switch: | ||
| def __init__(self, tydom_attributes, set_level=None, mqtt=None): | ||
| self.attributes = tydom_attributes | ||
| self.device_id = self.attributes['device_id'] | ||
| self.endpoint_id = self.attributes['endpoint_id'] | ||
| self.id = self.attributes['id'] | ||
| self.name = self.attributes['switch_name'] | ||
|
|
||
| try: | ||
| self.current_level = self.attributes['level'] | ||
| except Exception as e: | ||
| print(e) | ||
| self.current_level = None | ||
| self.set_level = set_level | ||
|
|
||
| #try: | ||
| # self.current_state = self.attributes['state'] | ||
| #except Exception as e: | ||
| # print(e) | ||
| # self.current_state = 'On' | ||
| self.mqtt = mqtt | ||
|
|
||
|
|
||
| async def setup(self): | ||
| #availability: | ||
| # - topic: "home/bedroom/switch1/available" | ||
|
|
||
| self.device = {} | ||
| self.device['manufacturer'] = 'Delta Dore' | ||
| self.device['model'] = 'Porte' | ||
| self.device['name'] = self.name | ||
| self.device['identifiers'] = self.id | ||
|
|
||
| self.config_topic = switch_config_topic.format(id=self.id) | ||
| self.config = {} | ||
| self.config['name'] = self.name | ||
| self.config['unique_id'] = self.id | ||
| # self.config['attributes'] = self.attributes | ||
| self.config['command_topic'] = switch_command_topic.format(id=self.id) | ||
| self.config['state_topic'] = switch_state_topic.format(id=self.id) | ||
| self.config['json_attributes_topic'] = switch_attributes_topic.format(id=self.id) | ||
|
|
||
| self.config['payload_on'] = "TOGGLE" | ||
| self.config['payload_off'] = "TOGGLE" | ||
| #self.config['optimistic'] = 'false' | ||
| self.config['retain'] = 'false' | ||
| self.config['device'] = self.device | ||
| # print(self.config) | ||
|
|
||
| if (self.mqtt != None): | ||
| self.mqtt.mqtt_client.publish(self.config_topic, json.dumps(self.config), qos=0) | ||
| # setup_pub = '(self.config_topic, json.dumps(self.config), qos=0)' | ||
| # return(setup_pub) | ||
|
|
||
| async def update(self): | ||
| await self.setup() | ||
|
|
||
| try: | ||
| await self.update_sensors() | ||
| except Exception as e: | ||
| print("Switch sensors Error :") | ||
| print(e) | ||
|
|
||
|
|
||
| self.level_topic = switch_state_topic.format(id=self.id, current_level=self.current_level) | ||
|
|
||
| if (self.mqtt != None): | ||
| self.mqtt.mqtt_client.publish(self.level_topic, self.current_level, qos=0, retain=True) #Switch State | ||
| self.mqtt.mqtt_client.publish(self.config['json_attributes_topic'], self.attributes, qos=0) | ||
| print("Switch created / updated : ", self.name, self.id, self.current_level) | ||
|
|
||
|
|
||
| # update_pub = '(self.position_topic, self.current_position, qos=0, retain=True)' | ||
| # return(update_pub) | ||
|
|
||
|
|
||
| async def update_sensors(self): | ||
| # print('test sensors !') | ||
| for i, j in self.attributes.items(): | ||
| # sensor_name = "tydom_alarm_sensor_"+i | ||
| # print("name "+sensor_name, "elem_name "+i, "attributes_topic_from_device ",self.config['json_attributes_topic'], "mqtt",self.mqtt) | ||
| if not i == 'device_type' or not i == 'id': | ||
| new_sensor = None | ||
| new_sensor = sensor(elem_name=i, tydom_attributes_payload=self.attributes, attributes_topic_from_device=self.config['json_attributes_topic'], mqtt=self.mqtt) | ||
| await new_sensor.update() | ||
| # def __init__(self, name, elem_name, tydom_attributes_payload, attributes_topic_from_device, mqtt=None): | ||
|
|
||
|
|
||
|
|
||
| async def put_levelGate(tydom_client, device_id, switch_id, level): | ||
| print(switch_id, 'level', level) | ||
| if not (level == ''): | ||
| await tydom_client.put_devices_data(device_id, switch_id, 'level', level) | ||
|
|
||
| async def put_levelCmdGate(tydom_client, device_id, switch_id, levelCmd): | ||
| print(switch_id, 'levelCmd', levelCmd) | ||
| if not (levelCmd == ''): | ||
| await tydom_client.put_devices_data(device_id, switch_id, 'levelCmd', levelCmd) |
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
Oops, something went wrong.