Skip to content

Commit 8531c22

Browse files
fnueckefnuecke
committedJun 3, 2016
Added DeviceInfo API, allows environments to provide basic information even when they do not expose a component. Made available via computer.getDeviceInfo().
Must be implemented on Environments. Queried on environments of nodes reachable / visible (when a component / not) from a machine. Added very *very* basic program for listing device info from shell, `lshw`.
·
v1.8.0-snapshot-202209171.7.10-forge/v1.8.0-snapshot-20220917
1 parent aa546df commit 8531c22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1302
-140
lines changed
 

‎src/main/java/li/cil/oc/api/driver/DeviceInfo.java

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package li.cil.oc.api.driver;
2+
3+
import java.util.Map;
4+
5+
/**
6+
* Implement this on {@link li.cil.oc.api.network.Environment}s if you wish to
7+
* expose some (typically static) information about the device represented by
8+
* that environment to a {@link li.cil.oc.api.Machine} connected to it.
9+
* <p/>
10+
* This is intended to permit programs to reflect on the hardware they are
11+
* running on, typically for purely informational purposes, but possibly to
12+
* toggle certain hardware specific features.
13+
* <p/>
14+
* For example, graphics cards may expose their timings via this interface, so
15+
* that programs may determine at what speed they can redraw, and optimize
16+
* execution order.
17+
* <p/>
18+
* While the format of the returned table of information is entirely up to you,
19+
* it is recommended to orient yourself on the key values and names that
20+
* <code>lshw</code> uses (http://www.ezix.org/project/wiki/HardwareLiSter),
21+
* where applicable.
22+
*/
23+
public interface DeviceInfo {
24+
/**
25+
* Compile a list of device information strings as key-value pairs.
26+
* <p/>
27+
* For example, this may list the type of the device, a vendor (for example
28+
* your mod name, or something more creative if you like), specifications
29+
* of the device (speeds, capacities).
30+
* <p/>
31+
* For example, OC's tier one memory module returns the following:
32+
* <table>
33+
* <tr></tr>
34+
* </table>
35+
*
36+
* @return the table of information on this device, or <code>null</code>.
37+
*/
38+
Map<String, String> getDeviceInfo();
39+
}

‎src/main/resources/assets/opencomputers/loot/openos/bin/lshw.lua

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
local computer = require("computer")
2+
local shell = require("shell")
3+
local text = require("text")
4+
5+
local args, options = shell.parse(...)
6+
7+
local devices = computer.getDeviceInfo()
8+
local columns = {}
9+
10+
if not next(options, nil) then
11+
options.t = true
12+
options.d = true
13+
options.p = true
14+
end
15+
if options.t then table.insert(columns, "Class") end
16+
if options.d then table.insert(columns, "Description") end
17+
if options.p then table.insert(columns, "Product") end
18+
if options.v then table.insert(columns, "Vendor") end
19+
if options.c then table.insert(columns, "Capacity") end
20+
if options.w then table.insert(columns, "Width") end
21+
if options.s then table.insert(columns, "Clock") end
22+
23+
local m = {}
24+
for address, info in pairs(devices) do
25+
for col, name in ipairs(columns) do
26+
m[col] = math.max(m[col] or 1, (info[name:lower()] or ""):len())
27+
end
28+
end
29+
30+
io.write(text.padRight("Address", 10))
31+
for col, name in ipairs(columns) do
32+
io.write(text.padRight(name, m[col] + 2))
33+
end
34+
io.write("\n")
35+
36+
for address, info in pairs(devices) do
37+
io.write(text.padRight(address:sub(1, 5).."...", 10))
38+
for col, name in ipairs(columns) do
39+
io.write(text.padRight(info[name:lower()] or "", m[col] + 2))
40+
end
41+
io.write("\n")
42+
end

0 commit comments

Comments
 (0)
Please sign in to comment.