summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
Diffstat (limited to 'files')
-rw-r--r--files/common/openwrt/sensors.module_lua54
1 files changed, 34 insertions, 20 deletions
diff --git a/files/common/openwrt/sensors.module_lua b/files/common/openwrt/sensors.module_lua
index 6c279188..d5d869d5 100644
--- a/files/common/openwrt/sensors.module_lua
+++ b/files/common/openwrt/sensors.module_lua
@@ -12,6 +12,12 @@ local _internal_ = {}
_internal_.setup = {}
_internal_.read = {}
+-- https://github.com/luaposix/luaposix/releases/tag/v34.1
+if glob.GLOB_NOCHECK == nil then
+ _internal_.glob = function(pattern, flags) return glob.glob(pattern) end
+else
+ _internal_.glob = glob.glob
+end
-- ############# utils ###########
@@ -26,15 +32,23 @@ function _internal_.write_to_file(path, data)
return ret, err
end
-function _internal_.read_from_file(path)
+function _internal_.read_from_file(path, what)
local f, err = io.open(path, "r")
if not f then return nil, err end
- local data, err = f:read("*a")
+ local data, err = f:read(what)
f:close()
return data, err
end
+function _internal_.read_line_from_file(path)
+ return _internal_.read_from_file(path, "*l")
+end
+
+function _internal_.read_whole_file(path)
+ return _internal_.read_from_file(path, "*a")
+end
+
-- ############# i2c ###########
@@ -67,8 +81,8 @@ function _M.i2c_add_or_replace_device(bus, address, name)
return true, nil
end
- local contents, _ = _internal_.read_from_file(_M.i2c_device_path(bus, address) .. "/name")
- if contents == nil or contents:gsub("%s+", "") ~= name then
+ local contents, _ = _internal_.read_line_from_file(_M.i2c_device_path(bus, address) .. "/name")
+ if contents == nil or contents ~= name then
local ret, err = _M.i2c_delete_device(bus, address)
if not ret then return nil, err end
@@ -83,7 +97,7 @@ function _M.i2c_add_or_replace_device(bus, address, name)
end
function _M.i2c_get_bus_number_from_name(name)
- local bus_paths, glob_result = glob.glob("/sys/bus/i2c/devices/i2c-*", 0)
+ local bus_paths, glob_result = _internal_.glob("/sys/bus/i2c/devices/i2c-*", 0)
if not bus_paths then
if glob_result == glob.GLOB_NOMATCH then return {} end
if glob_result == glob.GLOB_ABORTED then return nil, "glob(): aborted" end
@@ -95,14 +109,14 @@ function _M.i2c_get_bus_number_from_name(name)
local num = string.match(bus_path, '/i2c%-(%d+)$')
if not num then return nil, "unable to parse bus number from path: " .. bus_path end
- local contents, err = _internal_.read_from_file(bus_path .. "/name")
- if contents ~= nil and contents:gsub("%s+", "") == name then return num end
+ local contents, err = _internal_.read_line_from_file(bus_path .. "/name")
+ if contents ~= nil and contents == name then return num end
end
return nil, "unable to find i2c bus with name: " .. name
end
function _M.i2c_get_mux_channels(parent, address)
- local channel_paths, glob_result = glob.glob(_M.i2c_device_path(parent, address) .. "/channel-*", 0)
+ local channel_paths, glob_result = _internal_.glob(_M.i2c_device_path(parent, address) .. "/channel-*", 0)
if not channel_paths then
if glob_result == glob.GLOB_NOMATCH then return {} end
if glob_result == glob.GLOB_ABORTED then return nil, "glob(): aborted" end
@@ -281,7 +295,7 @@ function _M.gpio_setup_pin(number)
end
function _M.gpio_read_pin(number)
- local value, err = _internal_.read_from_file(_M.gpio_pin_path(number) .. "/value")
+ local value, err = _internal_.read_line_from_file(_M.gpio_pin_path(number) .. "/value")
if not value then return nil, err end
return value:match( "^%s*(.-)%s*$" )
end
@@ -318,7 +332,7 @@ end
-- ############# iio ###########
function _M.iio_device_path_from_i2c_device(bus, address)
- local device_paths, glob_result = glob.glob(_M.i2c_device_path(bus, address) .. "/iio:device*", 0)
+ local device_paths, glob_result = _internal_.glob(_M.i2c_device_path(bus, address) .. "/iio:device*", 0)
if not device_paths then
if glob_result == glob.GLOB_NOMATCH then return nil, "couldn't find iio device handle for i2c device " .. _M.i2c_device_name(bus, address) end
if glob_result == glob.GLOB_ABORTED then return nil, "glob(): aborted" end
@@ -348,12 +362,12 @@ function _M.iio_read_bmp280(bus, address)
if not iio_device then return end
local values = {}
- local tmp, err = _internal_.read_from_file(iio_device .. '/in_pressure_input')
+ local tmp, err = _internal_.read_line_from_file(iio_device .. '/in_pressure_input')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['pressure'] = val*1000 end
end
- tmp, err = _internal_.read_from_file(iio_device .. '/in_temp_input')
+ tmp, err = _internal_.read_line_from_file(iio_device .. '/in_temp_input')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['temperature'] = val/1000 end
@@ -384,17 +398,17 @@ function _M.iio_read_bme280(bus, address)
if not iio_device then return end
local values = {}
- local tmp, err = _internal_.read_from_file(iio_device .. '/in_humidityrelative_input')
+ local tmp, err = _internal_.read_line_from_file(iio_device .. '/in_humidityrelative_input')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['humidity'] = val/1000 end
end
- local tmp, err = _internal_.read_from_file(iio_device .. '/in_pressure_input')
+ local tmp, err = _internal_.read_line_from_file(iio_device .. '/in_pressure_input')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['pressure'] = val*1000 end
end
- tmp, err = _internal_.read_from_file(iio_device .. '/in_temp_input')
+ tmp, err = _internal_.read_line_from_file(iio_device .. '/in_temp_input')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['temperature'] = val/1000 end
@@ -415,13 +429,13 @@ function _M.iio_read_am2315(bus, address)
if not iio_device then return end
local values = {}
- local tmp, err = _internal_.read_from_file(iio_device .. '/in_humidityrelative_raw')
+ local tmp, err = _internal_.read_line_from_file(iio_device .. '/in_humidityrelative_raw')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['humidity'] = val/10 end
end
time.nanosleep({tv_sec = 0, tv_nsec = 100000000})
- tmp, err = _internal_.read_from_file(iio_device .. '/in_temp_raw')
+ tmp, err = _internal_.read_line_from_file(iio_device .. '/in_temp_raw')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['temperature'] = val/10 end
@@ -436,7 +450,7 @@ _internal_.read['am2315'] = _M.iio_read_am2315
-- ############# hwmon ###########
function _M.hwmon_device_path_from_w1_device(address)
- local device_paths, glob_result = glob.glob(_M.w1_device_path(address) .. "/hwmon/hwmon*", 0)
+ local device_paths, glob_result = _internal_.glob(_M.w1_device_path(address) .. "/hwmon/hwmon*", 0)
if not device_paths then
if glob_result == glob.GLOB_NOMATCH then return nil, "couldn't find hwmon device handle for 1-wire device " .. address end
if glob_result == glob.GLOB_ABORTED then return nil, "glob(): aborted" end
@@ -462,7 +476,7 @@ function _M.hwmon_read_w1_therm(address)
if not hwmon_device then return end
local values = {}
- local tmp, err = _internal_.read_from_file(hwmon_device .. '/temp1_input')
+ local tmp, err = _internal_.read_line_from_file(hwmon_device .. '/temp1_input')
if tmp ~= nil then
local val = base.tonumber(tmp)
if val ~= nil then values['temperature'] = val/1000 end
@@ -481,7 +495,7 @@ _internal_.read['w1-42'] = function(address) return _M.hwmon_read_w1_therm(addre
-- ############# high-level interface ###########
function _M.read_config(path)
- sensors_json, err = _internal_.read_from_file(path)
+ sensors_json, err = _internal_.read_whole_file(path)
if not sensors_json then return nil, err end
return cjson.decode(sensors_json)