Hyperion/HyperionOS
6
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

spm works maybe?

Browse Source
This commit is contained in:
Astronand
2026-08-14 20:44:11 -04:00
parent 56646625c0
commit 10aa0c62ff
82 changed files with 1706 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Hyperion-firmware-cct/data/boot/cct/boot.lua
+56 -32
View File
@@ -55,11 +55,12 @@ local function displaySuperBadError(err)
lterm.write("A critical error occurred while loading the system:")
lterm.setCursorPos(1, 3)
write(err, lterm)
while true do end
coroutine.yield("key")
end
term.setCursorBlink(false)
local ok, err = xpcall(function()
--p
local apis = {BOOT_DRIVE_PATH = BOOT_DRIVE_PATH}
local lua = {
@@ -100,6 +101,7 @@ local ok, err = xpcall(function()
_G[i] = nil
end
end
--p
local acekeys={
[apis.keys.enter]="\n",
@@ -248,11 +250,12 @@ local ok, err = xpcall(function()
return value
end
local peripheral={}
--p
local p={}
local native = apis.peripheral
local sides = {"top", "bottom", "left", "right", "front", "back"}
function peripheral.getNames()
function p.getNames()
local results = {}
for n = 1, #sides do
local side = sides[n]
@@ -269,7 +272,7 @@ local ok, err = xpcall(function()
return results
end
function peripheral.isPresent(name)
function p.isPresent(name)
if native.isPresent(name) then
return true
end
@@ -283,7 +286,7 @@ local ok, err = xpcall(function()
return false
end
function peripheral.getType(peripheral)
function p.getType(peripheral)
if type(peripheral) == "string" then
if native.isPresent(peripheral) then
return native.getType(peripheral)
@@ -304,7 +307,7 @@ local ok, err = xpcall(function()
end
end
function peripheral.hasType(peripheral, peripheral_type)
function p.hasType(peripheral, peripheral_type)
if type(peripheral) == "string" then
if native.isPresent(peripheral) then
return native.hasType(peripheral, peripheral_type)
@@ -325,7 +328,7 @@ local ok, err = xpcall(function()
end
end
function peripheral.getMethods(name)
function p.getMethods(name)
if native.isPresent(name) then
return native.getMethods(name)
end
@@ -338,7 +341,7 @@ local ok, err = xpcall(function()
return nil
end
function peripheral.getName(peripheral)
function p.getName(peripheral)
local mt = getmetatable(peripheral)
if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
error("bad argument #1 (table is not a peripheral)", 2)
@@ -346,7 +349,7 @@ local ok, err = xpcall(function()
return mt.name
end
function peripheral.call(name, method, ...)
function p.call(name, method, ...)
if native.isPresent(name) then
return native.call(name, method, ...)
end
@@ -360,13 +363,13 @@ local ok, err = xpcall(function()
return nil
end
function peripheral.wrap(name)
local methods = peripheral.getMethods(name)
function p.wrap(name)
local methods = p.getMethods(name)
if not methods then
return nil
end
local types = { peripheral.getType(name) }
local types = { p.getType(name) }
for i = 1, #types do types[types[i]] = true end
local result = setmetatable({}, {
__name = "peripheral",
@@ -376,17 +379,17 @@ local ok, err = xpcall(function()
})
for _, method in ipairs(methods) do
result[method] = function(...)
return peripheral.call(name, method, ...)
return p.call(name, method, ...)
end
end
return result
end
function peripheral.find(ty, filter)
function p.find(ty, filter)
local results = {}
for _, name in ipairs(peripheral.getNames()) do
if peripheral.hasType(name, ty) then
local wrapped = peripheral.wrap(name)
for _, name in ipairs(p.getNames()) do
if p.hasType(name, ty) then
local wrapped = p.wrap(name)
if filter == nil or filter(name, wrapped) then
table.insert(results, wrapped)
end
@@ -394,8 +397,8 @@ local ok, err = xpcall(function()
end
return table.unpack(results)
end
local allscreens = {peripheral.find("monitor")}
--p
local allscreens = {p.find("monitor")}
for i=1, #allscreens do
allscreens[i].setTextScale(.5)
allscreens[i].clear()
@@ -404,6 +407,17 @@ local ok, err = xpcall(function()
allscreens[#allscreens+1] = apis.term
local callAsyncQueue = {}
local callAsyncReturn = {}
apis.callAsyncReturn = callAsyncReturn
local callidx=0
function apis.callAsync(func, ...)
callidx=callidx+1
callAsyncQueue[#callAsyncQueue+1] = {callidx, func, ...}
return callidx
end
local EFI = {
getEpochMs = function() return apis.os.epoch("utc") end,
getUptime = function() return apis.os.clock() * 1000 end,
@@ -489,7 +503,8 @@ local ok, err = xpcall(function()
apis.term.setCursorPos(1, 1)
local kernelCoro = coroutine.create(function()
---@diagnostic disable-next-line: param-type-mismatch
--pf
---@diagnostic disable-next-line: param-type-mismatch-
local ok, err = xpcall(Kernel, debug.traceback, EFI)
if not ok and not EFI.reboot then displaySuperBadError(err) end
if err then
@@ -518,6 +533,7 @@ local ok, err = xpcall(function()
end
EFI.screenCtl:print("Loaded in " .. tostring(apis.os.clock()) .. " seconds.\n")
--p
while true do
local status, err = coroutine.resumeWithTimeout(kernelCoro, 50)
@@ -526,28 +542,30 @@ local ok, err = xpcall(function()
while not exit do
local event = {coroutine.yield()}
if event[1] == "key" then
queueEvent(table.unpack(event))
queueEvent("keyPressed", 1, event[2])
if acekeys[event[2]] then
queueEvent("keyTyped", 1, acekeys[event[2]])
end
elseif event[1] == "char" then
queueEvent(table.unpack(event))
queueEvent("keyTyped", 1, event[2])
elseif event[1] == "key_up" then
queueEvent(table.unpack(event))
queueEvent("keyReleased", 1, event[2])
elseif event[1] == "disk" then
queueEvent("componentAdded", "disk")
elseif event[1] == "disk_eject" then
queueEvent("componentRemoved", "disk")
elseif event[1] == "modem_message" then
queueEvent("modem_message", table.unpack(event, 2))
elseif event[1] == "rednet_message" then
queueEvent("rednet_message", table.unpack(event, 2))
elseif event[1] == "http_success" then
queueEvent("http_success", table.unpack(event, 2))
elseif event[1] == "http_failure" then
queueEvent("http_failure", table.unpack(event, 2))
elseif event[1] == "NoSleep" then
exit = true
else
queueEvent(table.unpack(event))
end
end
while #callAsyncQueue>0 do
local bundle = table.remove(callAsyncQueue, 1)
local ret = {xpcall(bundle[2], debug.traceback, table.unpack(bundle, 3))}
if not ret[1] then
callAsyncReturn[bundle[1]]={false, ret[2]}
else
callAsyncReturn[bundle[1]]={true, table.unpack(ret,2)}
end
end
if status == "error" or coroutine.status(kernelCoro) == "dead" then
@@ -556,6 +574,12 @@ local ok, err = xpcall(function()
end
displaySuperBadError("Kernel error: " .. tostring(err))
coroutine.yield("key")
elseif status == "success" then
if EFI.reboot then
apis.os.reboot()
end
displaySuperBadError("Kernel error: Attempted to yield main thread\n"..debug.traceback(kernelCoro, "Attempted to yield main thread"))
coroutine.yield("key")
end
initFs:refresh()
end
Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/01_periph.kmod
+48 -5
View File
@@ -3,6 +3,7 @@
local kernel=...
kernel.cct={}
kernel.cct.peripheral={}
kernel.cct.callAsync=kernel.apis.callAsync
local peripheral=kernel.cct.peripheral
local apis = kernel.apis
local native = apis.peripheral
@@ -103,6 +104,40 @@ function peripheral.getName(peripheral)
end
function peripheral.call(name, method, ...)
if native.isPresent(name) then
local id = kernel.cct.callAsync(native.call, name, method, ...)
kernel.currentTask.io=function()
if kernel.apis.callAsyncReturn[id] then
local r=kernel.apis.callAsyncReturn[id]
if not r[1] then error(r[2]) end
kernel.apis.callAsyncReturn[id]=nil
return table.unpack(r,2)
end
end
kernel.currentTask.status="D"
return
end
for n = 1, #sides do
local side = sides[n]
if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
local id = kernel.cct.callAsync(native.call, side, "callRemote", name, method, ...)
kernel.currentTask.io=function()
if kernel.apis.callAsyncReturn[id] then
local r=kernel.apis.callAsyncReturn[id]
if not r[1] then error(r[2]) end
kernel.apis.callAsyncReturn[id]=nil
return table.unpack(r,2)
end
end
kernel.currentTask.status="D"
return
end
end
return nil
end
function peripheral.callnative(name, method, ...)
if native.isPresent(name) then
return native.call(name, method, ...)
end
@@ -116,7 +151,7 @@ function peripheral.call(name, method, ...)
return nil
end
function peripheral.wrap(name)
function peripheral.wrap(name, wrap)
local methods = peripheral.getMethods(name)
if not methods then
return nil
@@ -130,9 +165,17 @@ function peripheral.wrap(name)
type = types[1],
types = types,
})
for _, method in ipairs(methods) do
result[method] = function(...)
return peripheral.call(name, method, ...)
if wrap then
for _, method in ipairs(methods) do
result[method] = function(...)
return peripheral.call(name, method, ...)
end
end
else
for _, method in ipairs(methods) do
result[method] = function(...)
return peripheral.callnative(name, method, ...)
end
end
end
return result
@@ -149,4 +192,4 @@ function peripheral.find(ty, filter)
end
end
return table.unpack(results)
end
end
Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/13_devraw.kmod
+26
View File
@@ -0,0 +1,26 @@
--:Minify:--
local kernel=...
local peripheral=kernel.cct.peripheral
local function wrap(p)
return function(op, mode)
if op=="type" then
return "device"
elseif op=="open" then
if kernel.uid~=0 then error("EACCES") end
return peripheral.wrap(p, true)
end
end
end
local peripherals=peripheral.getNames()
for i=1, #peripherals do
local p=peripherals[i]
local typ=peripheral.getType(p)
local file=wrap(p)
kernel.devfs.data["raw"][p]=file
local typefolder=kernel.devfs.data["raw"]["by-type"][typ]
if not typefolder then typefolder={} end
typefolder[tostring(#table.keys(typefolder)+1)] = file
kernel.devfs.data["raw"]["by-type"][typ]=typefolder
end
Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/22_http.kmod
+7 -2
View File
@@ -120,6 +120,7 @@ function handler.connect(fd, address)
end
fdo.socket.active=true
fdo.socket.url=url
fdo.socket.loaded=false
return true
end
@@ -129,10 +130,11 @@ function handler.connect(fd, address)
return
end
if not kernel.cct.httpqueue[fdo.socket.url] then
if not kernel.cct.httpqueue[fdo.socket.url] and not fdo.socket.loaded then
fdo.socket.file=kernel.sfile(buildResponse(kernel.cct.httpresponse[fdo.socket.url]))
kernel.cct.httpqueue[fdo.socket.url]=nil
kernel.cct.httpresponse[fdo.socket.url]=nil
fdo.socket.loaded=true
end
if not fdo.socket.file then
@@ -141,6 +143,7 @@ function handler.connect(fd, address)
fdo.socket.file=kernel.sfile(buildResponse(kernel.cct.httpresponse[fdo.socket.url]))
kernel.cct.httpqueue[fdo.socket.url]=nil
kernel.cct.httpresponse[fdo.socket.url]=nil
fdo.socket.loaded=true
return fdo.socket.file.read(count)
end
end
@@ -156,10 +159,11 @@ function handler.connect(fd, address)
return
end
if not kernel.cct.httpqueue[fdo.socket.url] then
if not kernel.cct.httpqueue[fdo.socket.url] and not fdo.socket.loaded then
fdo.socket.file=kernel.sfile(buildResponse(kernel.cct.httpresponse[fdo.socket.url]))
kernel.cct.httpqueue[fdo.socket.url]=nil
kernel.cct.httpresponse[fdo.socket.url]=nil
fdo.socket.loaded=true
end
if not fdo.socket.file then
@@ -168,6 +172,7 @@ function handler.connect(fd, address)
fdo.socket.file=kernel.sfile(buildResponse(kernel.cct.httpresponse[fdo.socket.url]))
kernel.cct.httpqueue[fdo.socket.url]=nil
kernel.cct.httpresponse[fdo.socket.url]=nil
fdo.socket.loaded=true
return fdo.socket.file.seek(whence, offset)
end
end
Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/25_tty.kmod
-1
View File
@@ -144,7 +144,6 @@ local function write(text, term)
term.setCursorPos(x, y)
end
kernel.devfs.data.tty={}
kernel.cct.ctrl,kernel.cct.alt = false, false
local function serializeBool(bool)
Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/30_deamon.kmod → Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/30_daemon.kmod
+11 -3
View File
@@ -1,10 +1,11 @@
--:Minify:--
local kernel=...
local keys=kernel.apis.keys
kernel.cct.eventhooks={}
kernel.processes.cctdeamon = function()
kernel.processes.cctdaemon = function()
local timeout = false
kernel.log("CCT deamon started")
kernel.log("CCT daemon started")
while true do
local event = {kernel.EFI:getMachineEvent()}
@@ -84,6 +85,13 @@ kernel.processes.cctdeamon = function()
kernel.cct.httperror[event[2]]=event[3]
kernel.cct.httpresponse[event[2]]=event[4]
end
else
if kernel.cct.eventhooks[eventType] then
local ok,err = xpcall(kernel.cct.eventhooks[eventType], debug.traceback, table.unpack(event))
if not ok then
kernel.log("Error on eventhook "..eventType.."\n"..err)
end
end
end
timeout = false
@@ -97,4 +105,4 @@ kernel.processes.cctdeamon = function()
end
end
kernel.log("CCT deamon queued for execution")
kernel.log("CCT daemon queued for execution")