@@ -1011,7 +1011,7 @@ def HomecoachDevice(self, id=""):
10111011 for device in self .rawData :
10121012 if id in device ['_id' ]:
10131013 return device
1014- self . HomecoachDevice = device
1014+ return None
10151015
10161016 def Dashboard (self , id = "" ):
10171017 #D = self.HomecoachDevice['dashboard_data']
@@ -1023,15 +1023,17 @@ def Dashboard(self, id=""):
10231023 def lastData (self , hid = None , exclude = 0 ):
10241024 for device in self .rawData :
10251025 if id == device ['_id' ]:
1026- #s = self.HomecoachDevice['dashboard_data']['time_utc']
1026+ # LastData in HomeCoach
1027+ #s = self.HomecoachDevice['dashboard_data']['time_utc']
10271028 # Define oldest acceptable sensor measure event
10281029 limit = (time .time () - exclude ) if exclude else 0
1029- ds = self .HomecoachDevice ['dashboard_data' ]
1030- if ds .get ('time_utc' ,limit + 10 ) > limit :
1031- _id = ds [id ]
1032- return {'When' :ds , '_id' :_id }
1030+ ds = device ['dashboard_data' ]['time_utc' ]
1031+ if device .get ('time_utc' ,limit + 10 ) > limit :
1032+ return {'When' : ds , '_id' : id }
1033+ else :
1034+ return {'When' : 0 , 'id' : hid }
10331035 else :
1034- return { 'When' : 0 , 'id' : id }
1036+ pass
10351037
10361038 def checkNotUpdated (self , res , hid , delay = 3600 ):
10371039 ret = []
0 commit comments