diff --git a/Embedded/fget.lua b/Embedded/fget.lua new file mode 100644 index 0000000..5530134 --- /dev/null +++ b/Embedded/fget.lua @@ -0,0 +1,10 @@ +function fget(A,P,V) + local b,tb,s="","",net.open(A,V or 70) + s:w("t"..P.."\n") + repeat + UC.pullSignal() + tb=s:r(2048) + b=b..tb + until tb == "" and s.s == "c" + return b:sub(2) +end diff --git a/Embedded/minify-all.sh b/Embedded/minify-all.sh index a314e87..8167c73 100755 --- a/Embedded/minify-all.sh +++ b/Embedded/minify-all.sh @@ -1,6 +1,10 @@ #!/bin/bash echo vt100.lua lua minify.lua vt100.lua mini-vt100.lua +echo miniprompt.lua +lua minify.lua miniprompt.lua mini-miniprompt.lua +echo fget.lua +lua minify.lua fget.lua mini-fget.lua echo init-wrapper.lua lua minify.lua init-wrapper.lua mini-init-wrapper.lua echo microtel-3.lua @@ -15,3 +19,9 @@ echo microtel-5-flisten.lua lua minify.lua microtel/microtel-5-flisten.lua microtel/mini-microtel-5-flisten.lua echo microtel-5-open.lua lua minify.lua microtel/microtel-5-open.lua microtel/mini-microtel-5-open.lua + +# fun stuff now +cat microtel/mini-microtel-{3,4,5-core,5-open}.lua mini-vt100.lua mini-miniprompt.lua > nminiprompt.lua +lua minify.lua nminiprompt.lua mini-nminiprompt.lua +echo -e "GC,UC=component,computer" | cat - mini-nminiprompt.lua > mini-fnminiprompt.lua +mv mini-fnminiprompt.lua mini-nminiprompt.lua diff --git a/Embedded/nminiprompt.lua.min b/Embedded/nminiprompt.lua.min index 37bb2ae..764fe47 100644 --- a/Embedded/nminiprompt.lua.min +++ b/Embedded/nminiprompt.lua.min @@ -1,3 +1,6 @@ { + {"read,write,print=R,W,P","print,read,write=P,R,W\npcall(load(component.invoke(component.list(\"eeprom\")(),\"getData\")))"}, {"component","GC"}, + {"computer","UC"}, + {"vt100emu","VT"}, } diff --git a/Embedded/vt100.lua b/Embedded/vt100.lua index fb8aaba..c9068ed 100644 --- a/Embedded/vt100.lua +++ b/Embedded/vt100.lua @@ -12,24 +12,12 @@ function vt100emu(gpu) gpu.setResolution(mx,my) gpu.fill(1,1,mx,my," ") - local function dcursor() - pc = gpu.get(cx,cy) - gpu.setForeground(0) - gpu.setBackground(0xFFFFFF) - gpu.set(cx,cy,pc) - gpu.setForeground(0xFFFFFF) - gpu.setBackground(0) - end - local function udcursor() - pc = gpu.get(cx,cy) - gpu.setForeground(0xFFFFFF) - gpu.setBackground(0) - gpu.set(cx,cy,pc) - end - function termwrite(s) s=s:gsub("\8","\27[D") - udcursor() + pc = gpu.get(cx,cy) + gpu.setForeground(0xFFFFFF) + gpu.setBackground(0) + gpu.set(cx,cy,pc) for i = 1, s:len() do local cc = s:sub(i,i) @@ -107,7 +95,12 @@ function vt100emu(gpu) lc = cc end - dcursor() + pc = gpu.get(cx,cy) + gpu.setForeground(0) + gpu.setBackground(0xFFFFFF) + gpu.set(cx,cy,pc) + gpu.setForeground(0xFFFFFF) + gpu.setBackground(0) end return termwrite