mirror of
https://github.com/MikaylaFischler/cc-mek-scada.git
synced 2024-08-30 18:22:34 +00:00
supression of warnings, added lua diagnostics global list
This commit is contained in:
parent
cd0d7aa5a3
commit
d7e38d6393
9
.vscode/settings.json
vendored
Normal file
9
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Lua.diagnostics.globals": [
|
||||||
|
"term",
|
||||||
|
"fs",
|
||||||
|
"peripheral",
|
||||||
|
"rs",
|
||||||
|
"bit"
|
||||||
|
]
|
||||||
|
}
|
@ -25,10 +25,12 @@ end
|
|||||||
-- TIME --
|
-- TIME --
|
||||||
|
|
||||||
util.time_ms = function ()
|
util.time_ms = function ()
|
||||||
|
---@diagnostic disable-next-line: undefined-field
|
||||||
return os.epoch('local')
|
return os.epoch('local')
|
||||||
end
|
end
|
||||||
|
|
||||||
util.time_s = function ()
|
util.time_s = function ()
|
||||||
|
---@diagnostic disable-next-line: undefined-field
|
||||||
return os.epoch('local') / 1000
|
return os.epoch('local') / 1000
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -41,6 +43,7 @@ end
|
|||||||
-- protected sleep call so we still are in charge of catching termination
|
-- protected sleep call so we still are in charge of catching termination
|
||||||
-- EVENT_CONSUMER: this function consumes events
|
-- EVENT_CONSUMER: this function consumes events
|
||||||
util.psleep = function (t)
|
util.psleep = function (t)
|
||||||
|
---@diagnostic disable-next-line: undefined-field
|
||||||
pcall(os.sleep, t)
|
pcall(os.sleep, t)
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -66,9 +69,14 @@ end
|
|||||||
-- ComputerCraft OS Timer based Watchdog
|
-- ComputerCraft OS Timer based Watchdog
|
||||||
-- triggers a timer event if not fed within 'timeout' seconds
|
-- triggers a timer event if not fed within 'timeout' seconds
|
||||||
util.new_watchdog = function (timeout)
|
util.new_watchdog = function (timeout)
|
||||||
|
---@diagnostic disable-next-line: undefined-field
|
||||||
|
local start_timer = os.startTimer
|
||||||
|
---@diagnostic disable-next-line: undefined-field
|
||||||
|
local cancel_timer = os.cancelTimer
|
||||||
|
|
||||||
local self = {
|
local self = {
|
||||||
_timeout = timeout,
|
_timeout = timeout,
|
||||||
_wd_timer = os.startTimer(timeout)
|
_wd_timer = start_timer(timeout)
|
||||||
}
|
}
|
||||||
|
|
||||||
local get_timer = function ()
|
local get_timer = function ()
|
||||||
@ -77,14 +85,14 @@ util.new_watchdog = function (timeout)
|
|||||||
|
|
||||||
local feed = function ()
|
local feed = function ()
|
||||||
if self._wd_timer ~= nil then
|
if self._wd_timer ~= nil then
|
||||||
os.cancelTimer(self._wd_timer)
|
cancel_timer(self._wd_timer)
|
||||||
end
|
end
|
||||||
self._wd_timer = os.startTimer(self._timeout)
|
self._wd_timer = start_timer(self._timeout)
|
||||||
end
|
end
|
||||||
|
|
||||||
local cancel = function ()
|
local cancel = function ()
|
||||||
if self._wd_timer ~= nil then
|
if self._wd_timer ~= nil then
|
||||||
os.cancelTimer(self._wd_timer)
|
cancel_timer(self._wd_timer)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user