formating better for spm packages

Src/Hyperion-firmware-cct/data/boot/cct/boot.lua

@@ -1,9 +1,8 @@
 --:Minify:--
 local BOOT_DRIVE_PATH = ({...})[1] or "/$"
 ---@diagnostic disable-next-line: undefined-global
-local term = term
-local os = os
-local function write(text)
+local lterm = term
+local function write(text, term)
     local x, y = term.getCursorPos()
     local w, h = term.getSize()
 
@@ -49,13 +48,13 @@ local function write(text)
 end
 
 local function displaySuperBadError(err)
-    term.setBackgroundColor(0x1)
-    term.setTextColor(0x4)
-    term.clear()
-    term.setCursorPos(1, 1)
-    term.write("A critical error occurred while loading the system:")
-    term.setCursorPos(1, 3)
-    write(err)
+    lterm.setBackgroundColor(0x1)
+    lterm.setTextColor(0x4)
+    lterm.clear()
+    lterm.setCursorPos(1, 1)
+    lterm.write("A critical error occurred while loading the system:")
+    lterm.setCursorPos(1, 3)
+    write(err, lterm)
     while true do end
 end
 
@@ -117,18 +116,18 @@ local ok, err = xpcall(function()
         while stoptime > apis.os.clock() do end
     end
 
-    apis.term.setPaletteColor(0x1, 0xFFFFFF) -- #000000
-    apis.term.setPaletteColor(0x2, 0xFF0000) -- #FFFFFF
-    apis.term.setPaletteColor(0x4, 0x00FF00) -- #FF0000
-    apis.term.setPaletteColor(0x8, 0x0000FF) -- #00FF00
-    apis.term.setPaletteColor(0x10, 0x00FFFF) -- #0000FF
-    apis.term.setPaletteColor(0x20, 0xFF00FF) -- #00FFFF
-    apis.term.setPaletteColor(0x40, 0xFFFF00) -- #FF00FF
-    apis.term.setPaletteColor(0x80, 0xFF6D00) -- #FFFF00
-    apis.term.setPaletteColor(0x100, 0x6DFF55) -- #FF6D00
-    apis.term.setPaletteColor(0x200, 0x24FFFF) -- #6DFF55
-    apis.term.setPaletteColor(0x400, 0x924900) -- #24FFFF
-    apis.term.setPaletteColor(0x800, 0x6D6D55) -- #924900
+    apis.term.setPaletteColor(0x1,    0xFFFFFF) -- #000000
+    apis.term.setPaletteColor(0x2,    0xFF0000) -- #FFFFFF
+    apis.term.setPaletteColor(0x4,    0x00FF00) -- #FF0000
+    apis.term.setPaletteColor(0x8,    0x0000FF) -- #00FF00
+    apis.term.setPaletteColor(0x10,   0x00FFFF) -- #0000FF
+    apis.term.setPaletteColor(0x20,   0xFF00FF) -- #00FFFF
+    apis.term.setPaletteColor(0x40,   0xFFFF00) -- #FF00FF
+    apis.term.setPaletteColor(0x80,   0xFF6D00) -- #FFFF00
+    apis.term.setPaletteColor(0x100,  0x6DFF55) -- #FF6D00
+    apis.term.setPaletteColor(0x200,  0x24FFFF) -- #6DFF55
+    apis.term.setPaletteColor(0x400,  0x924900) -- #24FFFF
+    apis.term.setPaletteColor(0x800,  0x6D6D55) -- #924900
     apis.term.setPaletteColor(0x1000, 0xDBDBAA) -- #6D6D55
     apis.term.setPaletteColor(0x2000, 0x6D00FF) -- #DBDBAA
     apis.term.setPaletteColor(0x4000, 0xB6FF00) -- #6D00FF
@@ -172,22 +171,22 @@ local ok, err = xpcall(function()
     end
 
     local colors = {
-        [0x000000]=0x0001,
-        [0xFFFFFF]=0x0002,
-        [0xFF0000]=0x0004,
-        [0x00FF00]=0x0008,
-        [0x0000FF]=0x0010,
-        [0x00FFFF]=0x0020,
-        [0xFF00FF]=0x0040,
-        [0xFFFF00]=0x0080,
-        [0xFF6D00]=0x0100,
-        [0x6DFF55]=0x0200,
-        [0x24FFFF]=0x0400,
-        [0x924900]=0x0800,
-        [0x6D6D55]=0x1000,
-        [0xDBDBAA]=0x2000,
-        [0x6D00FF]=0x4000,
-        [0xB6FF00]=0x8000
+        [0xFFFFFF]=0x0001,
+        [0xFF0000]=0x0002,
+        [0x00FF00]=0x0004,
+        [0x0000FF]=0x0008,
+        [0x00FFFF]=0x0010,
+        [0xFF00FF]=0x0020,
+        [0xFFFF00]=0x0040,
+        [0xFF6D00]=0x0080,
+        [0x6DFF55]=0x0100,
+        [0x24FFFF]=0x0200,
+        [0x924900]=0x0400,
+        [0x6D6D55]=0x0800,
+        [0xDBDBAA]=0x1000,
+        [0x6D00FF]=0x2000,
+        [0xB6FF00]=0x4000,
+        [0x000000]=0x8000
     }
 
     local fg,bg=0x6D6D55,0x000000
@@ -401,9 +400,10 @@ local ok, err = xpcall(function()
         allscreens[i].setTextScale(.5)
         allscreens[i].clear()
         allscreens[i].setCursorPos(1,1)
-        allscreens[i].write("Initializing...")
     end
 
+    allscreens[#allscreens+1] = apis.term
+
     local EFI = {
         getEpochMs = function() return apis.os.epoch("utc") end,
         getUptime = function() return apis.os.clock() * 1000 end,
@@ -424,22 +424,38 @@ local ok, err = xpcall(function()
         initfs=fs,
         disks=initFs,
         screenCtl={
-            print = function(_, text) write(text .. "\n") end,
-            printInline = function(_, text) write(text) end,
+            print = function(_, text)
+                for i=1, #allscreens do
+                    write(text.."\n", allscreens[i])
+                end
+            end,
+            printInline = function(_, text)
+                for i=1, #allscreens do
+                    write(text, allscreens[i])
+                end
+            end,
             clear = function()
-                apis.term.clear()
-                apis.term.setCursorPos(1, 1)
+                for i=1, #allscreens do
+                    allscreens[i].clear()
+                    allscreens[i].setCursorPos(1, 1)
+                end
             end,
-            setCursorPos = function(_, x, y)
-                apis.term.setCursorPos(x, y)
+            resetCursor = function()
+                for i=1, #allscreens do
+                    allscreens[i].setCursorPos(1, 1)
+                end
             end,
-            getCursorPos = function() return apis.term.getCursorPos() end,
-            getSize = function() return apis.term.getSize() end,
             setBackgroundColor = function(_, color)
-                apis.term.setBackgroundColor(aprox(color))
+                bg=color
+                for i=1, #allscreens do
+                    allscreens[i].setBackgroundColor(aprox(color))
+                end
             end,
             setTextColor = function(_, color)
-                apis.term.setTextColor(aprox(color))
+                fg=color
+                for i=1, #allscreens do
+                    allscreens[i].setTextColor(aprox(color))
+                end
             end,
             getBackgroundColor = function()
                 return bg

Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/22_http.kmod

@@ -0,0 +1 @@
+--:Minify:--

Src/Hyperion-firmware-cct/data/lib/modules/cc-tweaked/25_tty.kmod

@@ -246,7 +246,5 @@ kernel.cct.fifo=fifo
 newtty(kernel.apis.term, "1", fifo.pop)
 
 for i,v in ipairs({peripheral.find("monitor")}) do
-    v.setTextScale(.5)
-    v.write("Initializing...")
     newtty(v,tostring(i+1),function () end)
 end