Skip to content
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.

Sign up for GitHub

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

MappedDevice Phase II #370

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

MappedDevice Phase II #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d0ebd81
MappedDevice Phase II
uzlonewolf Jun 23, 2023
ffe3ce9
MappedDevice Phase II
uzlonewolf Jun 23, 2023
6122c81
MappedDevice updates
uzlonewolf Jun 24, 2023
6f279da
Tweak Wizard device list display
uzlonewolf Jun 24, 2023
97cf2be
MappedDevice updates
uzlonewolf Jun 24, 2023
dbf958b
More MappedDevice updates
uzlonewolf Jun 27, 2023
d38194e
MappedDevice updates, remove some debugging print()s and add "raw_dps…
uzlonewolf Jul 2, 2023
552c00c
More MappedDevice updates
uzlonewolf Jul 20, 2023
79f6733
Add 'settable' flag to mappings
uzlonewolf Jul 21, 2023
a845051
MappedDevice: Fix bug when setting values, and start groundwork for e…
uzlonewolf Jul 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions tinytuya/Cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,16 +791,18 @@ def format_timestamp( ts ):
return ts

@staticmethod
def _build_mapping( src, dst ):
def _build_mapping( src, dst, settable ):
# merge multiple DPS sets from result['status'] and result['functions'] into a single result
for mapp in src:
try:
code = mapp['code']
dp_id = code if 'dp_id' not in mapp else str(mapp['dp_id'])
if dp_id in dst:
if settable:
dst[dp_id]['settable'] = True
continue
data = { 'code': code, 'type': mapp['type'] }
if mapp['type'].lower() == 'string':
data = { 'code': code, 'type': mapp['type'], 'settable': settable }
if (mapp['type'].lower() == 'string') and (mapp['values'][0] != '{' or mapp['values'][-1] != '}'):
values = mapp['values']
else:
try:
Expand All @@ -827,7 +829,7 @@ def getmapping( self, productid, deviceid=None ):
if not self.mappings:
self.mappings = {} #load_mappings()

if productid in self.mappings:
if productid and (productid in self.mappings):
# already have this product id, so just return it
return self.mappings[productid]

Expand All @@ -841,13 +843,17 @@ def getmapping( self, productid, deviceid=None ):
dps = {}
# merge result['status'] and result['functions'] into a single result
if 'status' in result:
self._build_mapping( result['status'], dps )
self._build_mapping( result['status'], dps, False )
if 'functions' in result:
self._build_mapping( result['functions'], dps )
self._build_mapping( result['functions'], dps, True )
if not productid:
return dps
self.mappings[productid] = dps
log.debug( 'Downloaded mapping for device %r: %r', deviceid, dps)
elif ('code' in result and result['code'] == 2009) or ('msg' in result and result['msg'] == 'not support this device'):
# this device does not have any DPs!
if not productid:
return {}
self.mappings[productid] = {}

if productid in self.mappings:
Expand Down
Loading