Add quarter time period, Laundry Room air
This commit is contained in:
15
main.py
15
main.py
@@ -461,6 +461,9 @@ async def history(request):
|
||||
elif duration == 'month':
|
||||
start = end - timedelta(days=30)
|
||||
window = '1d'
|
||||
elif duration == 'quarter':
|
||||
start = end - timedelta(days=90)
|
||||
window = '1d'
|
||||
elif duration == 'year':
|
||||
start = end - timedelta(days=365)
|
||||
window = '1d'
|
||||
@@ -468,7 +471,7 @@ async def history(request):
|
||||
raise
|
||||
|
||||
window = request.rel_url.query.get('window', window)
|
||||
if window not in ['1m', '3m', '10m', '1h', '2h', '1d', '7d', '30d']:
|
||||
if window not in ['1m', '3m', '10m', '30m', '1h', '2h', '1d', '7d', '30d']:
|
||||
raise
|
||||
|
||||
if name == 'Water':
|
||||
@@ -482,9 +485,9 @@ async def history(request):
|
||||
end = int(end.timestamp())
|
||||
|
||||
if share_authed:
|
||||
if start < int(share_start):
|
||||
if start <= int(share_start):
|
||||
start = int(share_start)
|
||||
if end > int(share_end):
|
||||
if end >= int(share_end):
|
||||
end = int(share_end)
|
||||
|
||||
|
||||
@@ -677,11 +680,15 @@ if __name__ == '__main__':
|
||||
app.router.add_route('OPTIONS', '/search/{measurement}/{name}', options_handler)
|
||||
app.router.add_get('/latest', latest)
|
||||
|
||||
# serial, name
|
||||
# API look up is done by name
|
||||
# when retiring / reassigning a serial, change it to something impossible ie. 9999
|
||||
sensors.add(ThermostatSensor('thermostat2', '192.168.69.152', 'Venstar'))
|
||||
sensors.add(ERTSCMSensor('31005493', 'Water'))
|
||||
sensors.add(ERTSCMSensor('78628180', 'Gas'))
|
||||
sensors.add(OwnTracksSensor('owntracks1', 'OwnTracks'))
|
||||
sensors.add(AirSensor('air1', 'Living Room'))
|
||||
sensors.add(AirSensor('air9999', 'Living Room'))
|
||||
sensors.add(AirSensor('air1', 'Laundry Room'))
|
||||
sensors.add(AirSensor('air2', 'Bedroom'))
|
||||
sensors.add(AirSensor('air3', 'Kitchen'))
|
||||
sensors.add(Acurite606TX('185', 'Outside', 0.0))
|
||||
|
||||
Reference in New Issue
Block a user