diff options
| -rwxr-xr-x | daemon.py | 6 | ||||
| -rw-r--r-- | foris/__init__.py | 10 | ||||
| -rw-r--r-- | foris/templates/javascript/ups_pfc8591/ups_pfc8591.js.tpl (renamed from foris/templates/javascript/i2c_collect/i2c_collect.js.tpl) | 2 | ||||
| -rw-r--r-- | foris/templates/ups_pfc8591/ups_pfc8591.tpl (renamed from foris/templates/i2c_collect/i2c_collect.tpl) | 2 |
4 files changed, 10 insertions, 10 deletions
@@ -22,7 +22,7 @@ battery_not_high = 250 i2c = I2C("/dev/i2c-7") # Initialize sqlite -db_connection = sqlite3.connect('/tmp/i2c-collect.db') +db_connection = sqlite3.connect('/tmp/ups-pfc8591.db') db = db_connection.cursor() # Initialize ubus @@ -36,7 +36,7 @@ def read_chunk(handler, data): handler.reply({"data": result}) ubus.add( - "i2c-collect", { + "ups-pfc8591", { "read_data": { "method": read_chunk, "signature": {"range": ubus.BLOBMSG_TYPE_INT32, "field": ubus.BLOBMSG_TYPE_STRING}, @@ -73,7 +73,7 @@ def db_data(data): def ubus_data(data): date = str(int(time.time())) for k in iter(data.keys()): - ubus.send("i2c-collect", {k: (date, data[k])}) + ubus.send("ups-pfc8591", {k: (date, data[k])}) notified_power_supply = False notified_low_battery = False diff --git a/foris/__init__.py b/foris/__init__.py index a70f760..8eff4ce 100644 --- a/foris/__init__.py +++ b/foris/__init__.py @@ -14,7 +14,7 @@ class SamplePluginConfigHandler(BaseConfigHandler): class SamplePluginPage(ConfigPageMixin, SamplePluginConfigHandler): menu_order = 70 - template = "i2c_collect/i2c_collect.tpl" + template = "ups_pfc8591/ups_pfc8591.tpl" userfriendly_title = gettext("I2C collect") def _prepare_render_args(self, args): @@ -24,7 +24,7 @@ class SamplePluginPage(ConfigPageMixin, SamplePluginConfigHandler): args['PLUGIN_DYNAMIC_SCRIPTS'] = SamplePluginPlugin.PLUGIN_DYNAMIC_SCRIPTS args['data'] = {} for fld in ["voltage", "light", "temperature", "trimmer"]: - args['data'][fld] = ubus_call("i2c-collect", "read_data", {"range": 172800, "field": fld})[0]['data'] + args['data'][fld] = ubus_call("ups-pfc8591", "read_data", {"range": 172800, "field": fld})[0]['data'] for _, dt in enumerate(args['data'][fld]): dt[0] = time.strftime('%H:%M:%S', time.gmtime(int(dt[0]))) if fld == "voltage": @@ -42,7 +42,7 @@ class SamplePluginPage(ConfigPageMixin, SamplePluginConfigHandler): class SamplePluginPlugin(ForisPlugin): - PLUGIN_NAME = "i2c_collect" + PLUGIN_NAME = "ups_pfc8591" DIRNAME = os.path.dirname(os.path.abspath(__file__)) PLUGIN_STYLES = [ @@ -51,9 +51,9 @@ class SamplePluginPlugin(ForisPlugin): "js/Chart.bundle.min.js" ] PLUGIN_DYNAMIC_SCRIPTS = [ - "i2c_collect.js" + "ups_pfc8591.js" ] def __init__(self, app): super(SamplePluginPlugin, self).__init__(app) - add_config_page("i2c_collect", SamplePluginPage, top_level=True) + add_config_page("ups_pfc8591", SamplePluginPage, top_level=True) diff --git a/foris/templates/javascript/i2c_collect/i2c_collect.js.tpl b/foris/templates/javascript/ups_pfc8591/ups_pfc8591.js.tpl index 0ca8108..5ee281d 100644 --- a/foris/templates/javascript/i2c_collect/i2c_collect.js.tpl +++ b/foris/templates/javascript/ups_pfc8591/ups_pfc8591.js.tpl @@ -66,7 +66,7 @@ $(document).ready(function() { }); /* -Foris.WS["i2c-collect"] = function (data) { +Foris.WS["ups-pfc8591"] = function (data) { for (d in data) { Foris.lineChartData[d].datasets[0].data.push(data[d][0]); Foris.lineChartData[d].datasets[0].data.shift(); diff --git a/foris/templates/i2c_collect/i2c_collect.tpl b/foris/templates/ups_pfc8591/ups_pfc8591.tpl index 12226a5..e2ae1ef 100644 --- a/foris/templates/i2c_collect/i2c_collect.tpl +++ b/foris/templates/ups_pfc8591/ups_pfc8591.tpl @@ -1,7 +1,7 @@ %rebase("config/base.tpl", **locals()) -<div id="page-i2c-collect" class="config-page"> +<div id="page-ups-pfc8591" class="config-page"> %include("_messages.tpl") <div id="canvas-container"> %for fld in ["voltage", "light", "temperature", "trimmer"]: |