diff options
author | 2018-10-02 13:54:46 -0500 | |
---|---|---|
committer | 2018-10-02 13:54:46 -0500 | |
commit | 80d7461a7591eb5d3b5407ce0937a1a9277e69a8 (patch) | |
tree | 26f13dba30762889970e240907f7ab01ba11c092 /plugins/portname | |
parent | 2df6e6865d52fce4dbcbcf5fd80313a020dc5528 (diff) |
portname: use hex values for mask (nw)
Diffstat (limited to 'plugins/portname')
-rw-r--r-- | plugins/portname/init.lua | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/portname/init.lua b/plugins/portname/init.lua index 35769acdb76..e231931a347 100644 --- a/plugins/portname/init.lua +++ b/plugins/portname/init.lua @@ -57,7 +57,8 @@ function portname.startplugin() if ioport then for mask, label in pairs(port.labels) do for num3, field in pairs(ioport.fields) do - if tonumber(mask) == field.mask and label.player == field.player then + local nummask = tonumber(mask, 16) + if nummask == field.mask and label.player == field.player then field.live.name = label.name end end @@ -77,18 +78,18 @@ function portname.startplugin() local labels = {} local sort = {} for fname, field in pairs(port.fields) do - local mask = tostring(field.mask) + local mask = string.format("%x", field.mask) if not labels[mask] then sort[#sort + 1] = mask labels[mask] = { name = fname, player = field.player } setmetatable(labels[mask], { __tojson = function(v,s) local label = { name = v.name, player = v.player } setmetatable(label, { __jsonorder = { "player", "name" }}) - return json.stringify({ name = v.name, player = v.player }) end }) + return json.stringify(label) end }) end end if #sort > 0 then - table.sort(sort, function(i, j) return tonumber(i) < tonumber(j) end) + table.sort(sort, function(i, j) return tonumber(i, 16) < tonumber(j, 16) end) setmetatable(labels, { __jsonorder = sort }) ports[pname] = { labels = labels } end |