- Refactoring

- Action Button with Parameter
- Actor Action with Parameter
- Sensor Action with Parameter
This commit is contained in:
Manuel83
2017-11-29 22:37:18 +01:00
parent 13836a5680
commit 9b7908c9c5
41 changed files with 8098 additions and 271 deletions
+16 -10
View File
@@ -1,12 +1,12 @@
import time
from flask_classy import route
from modules.core.core import cbpi
from modules import cbpi
from modules.core.db import DBModel
from modules.core.baseview import BaseView
from modules.core.baseview import RestApi
from modules.database.dbmodel import Sensor
from flask import request
class SensorView(BaseView):
class SensorView(RestApi):
model = Sensor
cache_key = "sensors"
@@ -34,7 +34,11 @@ class SensorView(BaseView):
200:
description: Sensor Action called
"""
cbpi.sensor.action(id, method)
data = request.json
if data:
cbpi.sensor.action(id, method, **data)
else:
cbpi.sensor.action(id, method)
return ('', 204)
def _post_post_callback(self, m):
@@ -51,17 +55,19 @@ class SensorView(BaseView):
@cbpi.addon.core.initializer(order=1000)
def init(cbpi):
SensorView.register(cbpi._app, route_base='/api/sensor')
SensorView.register(cbpi.web, route_base='/api/sensor')
SensorView.init_cache()
#@cbpi.backgroundtask(key="read_passiv_sensor", interval=5)
#@cbpi.addon.core.backgroundtask(key="read_passiv_sensor", interval=5)
def read_passive_sensor(api):
"""
background process that reads all passive sensors in interval of 1 second
:return: None
"""
for key, value in cbpi.cache.get("sensors").iteritems():
if value.mode == "P":
value.instance.read()
#for key, value in cbpi.cache.get("sensors").iteritems():
# if value.mode == "P":
# value.instance.read()