From 5fb455bf2840626d23a9861978a1a2027c313b41 Mon Sep 17 00:00:00 2001 From: javalikescript Date: Sun, 5 Jan 2025 09:02:07 +0100 Subject: [PATCH] Cleanup --- extensions/ecowatt/ecowatt.lua | 3 ++- extensions/owm/owm.lua | 2 +- extensions/tic-serial/tic-serial.lua | 18 ++++++++++++++++-- extensions/users/users.lua | 2 +- extensions/web-base/addon.lua | 2 +- extensions/web-base/addons.lua | 6 +++--- extensions/web-chart/web-chart.lua | 2 +- extensions/web-notes/web-notes.lua | 2 +- extensions/web-scripts/view-script.lua | 2 +- extensions/web-scripts/web-scripts.lua | 2 +- extensions/web-tools/web-tools.lua | 2 +- 11 files changed, 29 insertions(+), 14 deletions(-) diff --git a/extensions/ecowatt/ecowatt.lua b/extensions/ecowatt/ecowatt.lua index 1c0a5d4..cbaaed7 100644 --- a/extensions/ecowatt/ecowatt.lua +++ b/extensions/ecowatt/ecowatt.lua @@ -26,7 +26,8 @@ local function updateHourValue(thing, name, values, hour) end --- 1 vert, 2 orange, 3 rouge +-- dvalue + hvalue: 1 vert, 2 orange, 3 rouge +-- hvalue uniquement: 0 vert + production décarbonée local SIGNAL_ENUM = {0, 1, 2, 3} local function createThing(targetName) diff --git a/extensions/owm/owm.lua b/extensions/owm/owm.lua index 06d9952..311b2b1 100644 --- a/extensions/owm/owm.lua +++ b/extensions/owm/owm.lua @@ -10,7 +10,7 @@ local utils = require('lha.utils') local adapter = extension:require('adapter') local webBaseAddons = extension:require('web-base.addons', true) -webBaseAddons.registerAddonExtension(extension) +webBaseAddons.register(extension) local function createWeatherThing(title, description) local thing = Thing:new(title or 'Weather', description or 'Weather Data', { diff --git a/extensions/tic-serial/tic-serial.lua b/extensions/tic-serial/tic-serial.lua index 3801599..5fb8a2f 100644 --- a/extensions/tic-serial/tic-serial.lua +++ b/extensions/tic-serial/tic-serial.lua @@ -46,6 +46,21 @@ local function closeSerial() updateConnected(false) end +--[[ +Format d'un groupe contenant une donnée horodatée + LF(0x0A) Etiquette SP Horodate SP Donnée SP Checksum CR(0x0D) +SP: séparateur tab (0x09) en standard et espace (0x20) en historique +Le format utilisé pour les horodates est SAAMMJJhhmmss, c'est-à-dire Saison, Année, Mois, Jour, heure, minute, seconde. +Checksum = (S1 & 0x3F) + 0x20 + +OPTARIF - Option tarifaire choisie + "BASE" Option Base; "HC.." Option Heures Creuses; "EJP." Option EJP; "BBRx" Option Tempo +PTEC - Période Tarifaire en cours + "TH.." Toutes les Heures; "HC.." Heures Creuses; "HP.." Heures Pleines; "HN.." Heures Normales; "PM.." Heures de Pointe Mobile +DEMAIN - Couleur du lendemain + "----" "BLEU" "BLAN" "ROUG" +]] + local function openSerial() local configuration = extension:getConfiguration() local modeHistorique = configuration.mode == 'historique' @@ -67,13 +82,12 @@ local function openSerial() closeSerial() return end + logger:fine('TiC data is %s', data) -- if string.sub(data, 1, 1) == '\x02' then data = string.sub(data, 2) end local alarm = false for line in string.gmatch(data, '\n([^\r]+)\r') do local fields = strings.split(line, fieldSeparator, true) local field, value - -- Le format utilisé pour les horodates est SAAMMJJhhmmss, c'est-à-dire Saison, Année, Mois, Jour, heure, minute, seconde. - -- Checksum = (S1 & 0x3F) + 0x20 if #fields == 3 or #fields == 4 then field, value = table.unpack(fields) end diff --git a/extensions/users/users.lua b/extensions/users/users.lua index 0a9f330..3ff6c56 100644 --- a/extensions/users/users.lua +++ b/extensions/users/users.lua @@ -9,7 +9,7 @@ local MessageDigest = require('jls.util.MessageDigest') local Codec = require('jls.util.Codec') local webBaseAddons = extension:require('web-base.addons', true) -webBaseAddons.registerAddonExtension(extension) +webBaseAddons.register(extension) local User = class.create(function(user) function user:initialize(configuration) diff --git a/extensions/web-base/addon.lua b/extensions/web-base/addon.lua index 29a8f7b..6c2ac4b 100644 --- a/extensions/web-base/addon.lua +++ b/extensions/web-base/addon.lua @@ -2,4 +2,4 @@ local extension = ... local webBaseAddons = extension:require('web-base.addons', true) -webBaseAddons.registerAddonExtension(extension) +webBaseAddons.register(extension) diff --git a/extensions/web-base/addons.lua b/extensions/web-base/addons.lua index 0fca2ff..4ec8e00 100644 --- a/extensions/web-base/addons.lua +++ b/extensions/web-base/addons.lua @@ -10,7 +10,7 @@ local function onWebBase(extension, script) end end -local function registerAddonExtension(extension, script) +local function register(extension, script) local started = false if script == nil then script = extension:getId()..'.js' @@ -31,6 +31,6 @@ local function registerAddonExtension(extension, script) end return { - registerAddonExtension = registerAddonExtension, - register = registerAddonExtension + registerAddonExtension = register, -- TODO Remove + register = register } diff --git a/extensions/web-chart/web-chart.lua b/extensions/web-chart/web-chart.lua index edf3a3e..ab554ad 100644 --- a/extensions/web-chart/web-chart.lua +++ b/extensions/web-chart/web-chart.lua @@ -10,7 +10,7 @@ local Date = require('jls.util.Date') local webBaseAddons = extension:require('web-base.addons', true) -webBaseAddons.registerAddonExtension(extension) +webBaseAddons.register(extension) local HistoricalDataHandler = class.create('jls.net.http.HttpHandler', function(tableHandler) diff --git a/extensions/web-notes/web-notes.lua b/extensions/web-notes/web-notes.lua index 1479856..f48cc7f 100644 --- a/extensions/web-notes/web-notes.lua +++ b/extensions/web-notes/web-notes.lua @@ -7,7 +7,7 @@ local Url = require('jls.net.Url') local webBaseAddons = extension:require('web-base.addons', true) -webBaseAddons.registerAddonExtension(extension) +webBaseAddons.register(extension) local function checkDir(dir) if not dir:isDirectory() then diff --git a/extensions/web-scripts/view-script.lua b/extensions/web-scripts/view-script.lua index 1e803f4..fb903c9 100644 --- a/extensions/web-scripts/view-script.lua +++ b/extensions/web-scripts/view-script.lua @@ -2,4 +2,4 @@ local extension = ... local loader = require('jls.lang.loader') local coreExtPath = extension:getEngine().lhaExtensionsDir:getPath() local webBaseAddons = loader.load('web-base.addons', coreExtPath) -webBaseAddons.registerAddonExtension(extension, 'init.js') \ No newline at end of file +webBaseAddons.register(extension, 'init.js') \ No newline at end of file diff --git a/extensions/web-scripts/web-scripts.lua b/extensions/web-scripts/web-scripts.lua index 2ff307f..2dafe42 100644 --- a/extensions/web-scripts/web-scripts.lua +++ b/extensions/web-scripts/web-scripts.lua @@ -11,7 +11,7 @@ local ZipFile = require('jls.util.zip.ZipFile') local webBaseAddons = extension:require('web-base.addons', true) -webBaseAddons.registerAddonExtension(extension) +webBaseAddons.register(extension) local function deployScript(exchange, engine, extId) local zipName = exchange:getRequest():getBody() or 'lha-ext.zip' diff --git a/extensions/web-tools/web-tools.lua b/extensions/web-tools/web-tools.lua index bdacb68..6b800f1 100644 --- a/extensions/web-tools/web-tools.lua +++ b/extensions/web-tools/web-tools.lua @@ -10,7 +10,7 @@ local LogHttpFilter = require('jls.net.http.filter.LogHttpFilter') local hasPermission = extension:require('users.hasPermission', true) local webBaseAddons = extension:require('web-base.addons', true) -webBaseAddons.registerAddonExtension(extension) +webBaseAddons.register(extension) local logFilter