From 5d5df85e8bee5c31200da555d19fdab6b7467112 Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Wed, 27 Jul 2022 12:37:45 +0200 Subject: [PATCH 1/4] Update main.lua --- Basalt/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Basalt/main.lua b/Basalt/main.lua index 7cdbf9d..cfae473 100644 --- a/Basalt/main.lua +++ b/Basalt/main.lua @@ -205,6 +205,7 @@ local basalt = {} basalt = { setTheme = setTheme, getTheme = getTheme, + stopUpdate = stop, getVersion = function() return version end, From 763d30a5417b8fa1e0ab7452ad19c65341212f89 Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Wed, 27 Jul 2022 13:21:02 +0200 Subject: [PATCH 2/4] fixed bad typing on schedule --- Basalt/main.lua | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Basalt/main.lua b/Basalt/main.lua index cfae473..afbe682 100644 --- a/Basalt/main.lua +++ b/Basalt/main.lua @@ -11,7 +11,7 @@ local debugger = true local projectDirectory = fs.getDir(table.pack(...)[2] or "") -local activeKey, frames, monFrames, variables, shedules = {}, {}, {}, {}, {} +local activeKey, frames, monFrames, variables, schedules = {}, {}, {}, {}, {} local mainFrame, activeFrame, focusedObject, updaterActive if not term.isColor or not term.isColor() then @@ -122,13 +122,13 @@ local basaltError = function(errMsg) baseTerm.setCursorPos(1,yPos+1) end -local function handleShedules(event, p1, p2, p3, p4) - if(#shedules>0)then +local function handleSchedules(event, p1, p2, p3, p4) + if(#schedules>0)then local finished = {} - for n=1,#shedules do - if(shedules[n]~=nil)then - if (coroutine.status(shedules[n]) == "suspended")then - local ok, result = coroutine.resume(shedules[n], event, p1, p2, p3, p4) + for n=1,#schedules do + if(schedules[n]~=nil)then + if (coroutine.status(schedules[n]) == "suspended")then + local ok, result = coroutine.resume(schedules[n], event, p1, p2, p3, p4) if not(ok)then basaltError(result) end @@ -138,7 +138,7 @@ local function handleShedules(event, p1, p2, p3, p4) end end for n=1,#finished do - table.remove(shedules, finished[n]-(n-1)) + table.remove(schedules, finished[n]-(n-1)) end end end @@ -197,7 +197,7 @@ local function basaltUpdateEvent(event, p1, p2, p3, p4) for _, v in pairs(frames) do v:eventHandler(event, p1, p2, p3, p4) end - handleShedules(event, p1, p2, p3, p4) + handleSchedules(event, p1, p2, p3, p4) drawFrames() end @@ -205,7 +205,6 @@ local basalt = {} basalt = { setTheme = setTheme, getTheme = getTheme, - stopUpdate = stop, getVersion = function() return version end, @@ -273,13 +272,13 @@ basalt = { end end, - shedule = function(f) - assert(f~="function", "Shedule needs a function in order to work!") + schedule = function(f) + assert(f~="function", "Schedule needs a function in order to work!") return function(...) local co = coroutine.create(f) local ok, result = coroutine.resume(co, ...) if(ok)then - table.insert(shedules, co) + table.insert(schedules, co) else basaltError(result) end From 83a27fbd09347e028a16fe0cb201727405178575 Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Wed, 27 Jul 2022 13:22:04 +0200 Subject: [PATCH 3/4] Update Basalt.md --- docs/objects/Basalt.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/objects/Basalt.md b/docs/objects/Basalt.md index e80aeaf..844f211 100644 --- a/docs/objects/Basalt.md +++ b/docs/objects/Basalt.md @@ -171,8 +171,8 @@ end)