Cleanup

javalikescript · Dec 1, 2024 · 5646f10 · 5646f10
1 parent 61a69bb
commit 5646f10
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 31 deletions.
diff --git a/extensions/conbee-2/HueBridgeV1.lua b/extensions/conbee-2/HueBridgeV1.lua
@@ -18,8 +18,9 @@ return require('jls.lang.class').create(function(hueBridge)
     self.url = Url:new(apiUrl)
     self.user = user or ''
     self.mapping = utils.replaceRefs(mapping or {}, {
-      Thing = Thing,
-      color = utils,
+      Thing = Thing, -- TODO remove
+      color = utils, -- TODO remove
+      utils = utils,
       math = math,
       BUTTON_EVENT = {'pressed', 'hold', 'released', 'long-released'}
     })

diff --git a/extensions/conbee-2/mapping-v1.json b/extensions/conbee-2/mapping-v1.json
@@ -88,8 +88,8 @@
       {
         "path": "state/xy",
         "name": "color",
-        "adapter": "$lua:return Thing.formatRgbHex(color.xyBriToRgb(value[1], value[2], 1.0))",
-        "setAdapter": "$lua:return {color.rgbToXy(Thing.parseRgbHex(value))}"
+        "adapter": "$lua:return utils.formatRgbHex(utils.xyBriToRgb(value[1], value[2], 1.0))",
+        "setAdapter": "$lua:return {utils.rgbToXy(utils.parseRgbHex(value))}"
       }
     ],
     "TemperatureSensor": [
@@ -181,7 +181,7 @@
     ]
   },
   "adapters": {
-    "mirek": "$lua:return color.mirekToColorTemperature(value)"
+    "mirek": "$lua:return utils.mirekToColorTemperature(value)"
   },
   "metadata": {
     "button": {

diff --git a/extensions/hue-v2/HueBridgeV2.lua b/extensions/hue-v2/HueBridgeV2.lua
@@ -28,8 +28,9 @@ return require('jls.lang.class').create(function(hueBridge)
       ['hue-application-key'] = self.key
     }
     self.mapping = utils.replaceRefs(mapping or {}, {
-      Thing = Thing,
-      color = utils,
+      Thing = Thing, -- TODO remove
+      color = utils, -- TODO remove
+      utils = utils,
       math = math,
       -- one of initial_press, repeat, short_release, long_release, double_short_release, long_press
       BUTTON_EVENT = {

diff --git a/extensions/hue-v2/mapping-v2.json b/extensions/hue-v2/mapping-v2.json
@@ -12,8 +12,8 @@
         {
           "path": "color/xy",
           "name": "color",
-          "adapter": "$lua:return Thing.formatRgbHex(color.xyBriToRgb(value.x, value.y, 1.0))",
-          "setAdapter": "$lua:local x, y = color.rgbToXy(Thing.parseRgbHex(value)); return {x = x, y = y}"
+          "adapter": "$lua:return utils.formatRgbHex(utils.xyBriToRgb(value.x, value.y, 1.0))",
+          "setAdapter": "$lua:local x, y = utils.rgbToXy(utils.parseRgbHex(value)); return {x = x, y = y}"
         },
         {
           "path": "dimming/brightness",
@@ -126,7 +126,7 @@
     }
   },
   "adapters": {
-    "mirek": "$lua:return color.mirekToColorTemperature(value)"
+    "mirek": "$lua:return utils.mirekToColorTemperature(value)"
   },
   "metadata": {
     "button": {

diff --git a/extensions/zwave-js-ws/ZWaveJs.lua b/extensions/zwave-js-ws/ZWaveJs.lua
@@ -15,8 +15,9 @@ return require('jls.lang.class').create(function(zWaveJs)
   function zWaveJs:initialize(url, mapping)
     self.url = url
     self.mapping = utils.replaceRefs(mapping or {}, {
-      Thing = Thing,
-      color = utils,
+      Thing = Thing, -- TODO remove
+      color = utils, -- TODO remove
+      utils = utils,
       math = math,
     })
   end

diff --git a/extensions/zwave-js-ws/mapping.json b/extensions/zwave-js-ws/mapping.json
@@ -57,7 +57,7 @@
     }
   ],
   "adapters": {
-    "mirek": "$lua:return color.mirekToColorTemperature(value)"
+    "mirek": "$lua:return utils.mirekToColorTemperature(value)"
   },
   "property": {
     "battery": {

diff --git a/lha/Thing.lua b/lha/Thing.lua
@@ -1,7 +1,5 @@
 local tables = require('jls.util.tables')
 local List = require('jls.util.List')
-local Codec = require('jls.util.Codec')
-local hex = Codec.getInstance('hex')
 
 local ThingProperty = require('lha.ThingProperty')
 local utils = require('lha.utils')
@@ -329,22 +327,6 @@ return require('jls.lang.class').create(function(thing)
 
 end, function(Thing)
 
-  function Thing.formatRgbHex(r, g, b)
-    return string.format('#%02X%02X%02X', math.floor(r * 255), math.floor(g * 255), math.floor(b * 255))
-  end
-
-  function Thing.parseRgbHex(rgbHex)
-    if string.sub(rgbHex, 1, 1) == '#' then
-      rgbHex = string.sub(rgbHex, 2)
-    end
-    if #rgbHex < 6 then
-      return 0, 0, 0
-    end
-    local rgb = hex:decode(rgbHex)
-    local r, g, b = string.byte(rgb, 1, 3)
-    return r / 255, g / 255, b / 255
-  end
-
   function Thing.getDefaultValueForType(valueType, value)
     if valueType == 'boolean' then
       return (type(value) == 'boolean') and value or false

diff --git a/lha/utils.lua b/lha/utils.lua
@@ -6,6 +6,8 @@ local File = require('jls.io.File')
 local Date = require('jls.util.Date')
 local json = require('jls.util.json')
 local tables = require('jls.util.tables')
+local Codec = require('jls.util.Codec')
+local hex = Codec.getInstance('hex')
 
 local utils = {}
 
@@ -366,4 +368,21 @@ function utils.rgbToHsv(r, g, b)
   return h, s, v
 end
 
+function utils.formatRgbHex(r, g, b)
+  return string.format('#%02X%02X%02X', math.floor(r * 255), math.floor(g * 255), math.floor(b * 255))
+end
+
+function utils.parseRgbHex(rgbHex)
+  if string.sub(rgbHex, 1, 1) == '#' then
+    rgbHex = string.sub(rgbHex, 2)
+  end
+  if #rgbHex < 6 then
+    return 0, 0, 0
+  end
+  local rgb = hex:decode(rgbHex)
+  local r, g, b = string.byte(rgb, 1, 3)
+  return r / 255, g / 255, b / 255
+end
+
+
 return utils