Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

Commit

Permalink
Merge pull request #190 from DewGew/beta
Browse files Browse the repository at this point in the history
Merge beta to master
  • Loading branch information
DewGew authored Sep 17, 2020
2 parents 537e618 + 4d9f9b5 commit fe26f62
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions const.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

"""Constants for Google Assistant."""
VERSION = '1.8.5'
VERSION = '1.8.6'
PUBLIC_URL = 'https://[your public url]'
CONFIGFILE = 'config/config.yaml'
LOGFILE = 'dzga.log'
Expand Down Expand Up @@ -95,7 +95,7 @@
'kettle': 'Kettle',
'light': 'Light',
'lock': 'DoorLock',
'lockinv': 'DoorLock',
'lockinv': 'DoorLockInv',
'media': 'Media',
'merged': 'Merged(Idx:',
'microwave': 'Microwave',
Expand Down
7 changes: 5 additions & 2 deletions smarthome.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,10 @@ def getAog(device):
logger.debug('Merge Error, Cant find thermostat device with idx %s', tc_idx)
hide = desc.get('hide', False)
if hide:
aog.domain = domains['hidden']
if aog.domain not in [domains['scene'], domains['group']]:
aog.domain = domains['hidden']
else:
logger.error('Scenes and Groups does not support function "hide" yet')

if aog.domain in [domains['camera']]:
aog.report_state = False
Expand Down Expand Up @@ -753,7 +756,7 @@ def settings_post(self, s):
else:
message = 'Homegraph api key not valid!'
else:
message = 'Add Homegraph api key or a Homegraph Service Account json file to sync devices here!'
message = 'Add Homegraph api key or a Homegraph Service Account json file to sync devices in the UI! You can still sync by voice eg. "Hey Google, Sync my devices".'
logs = readFile(os.path.join(logfilepath, LOGFILE))
template = TEMPLATE.format(message=message, uptime=uptime(), list=deviceList, meta=meta, code=code,
conf=confJSON, public_url=public_url, logs=logs, update=update,
Expand Down

0 comments on commit fe26f62

Please sign in to comment.