better library import
This commit is contained in:
parent
11a78fd263
commit
663a79baef
|
@ -14,11 +14,11 @@ math.randomseed(os.time())
|
|||
local system = {}
|
||||
|
||||
-- initialize client library
|
||||
local inputLib = dofile('inputClient.lua')
|
||||
inputLib.set_converter(options.unit)
|
||||
dofile('inputClient.lua')
|
||||
set_converter(options)
|
||||
|
||||
-- initialize components
|
||||
wait_for_components(system)
|
||||
wait_for_components(options, system, 'inductionPort')
|
||||
|
||||
|
||||
-- generate induction matrix values
|
||||
|
@ -32,28 +32,28 @@ function generate_message(buffer)
|
|||
local t_raw = system.main.getTransferCap()
|
||||
|
||||
-- convert raw values from joules to specified options.unit
|
||||
local c_conv = inputLib.convert_joules(c_raw)
|
||||
local m_conv = inputLib.convert_joules(m_raw)
|
||||
local i_conv = inputLib.convert_joules(i_raw)
|
||||
local o_conv = inputLib.convert_joules(o_raw)
|
||||
local t_conv = inputLib.convert_joules(t_raw)
|
||||
local c_conv = convert_joules(c_raw)
|
||||
local m_conv = convert_joules(m_raw)
|
||||
local i_conv = convert_joules(i_raw)
|
||||
local o_conv = convert_joules(o_raw)
|
||||
local t_conv = convert_joules(t_raw)
|
||||
|
||||
-- format and align fill values
|
||||
inputLib.message_aligned(buffer, 'Fill....:', inputLib.format_percent(p_raw), system.width)
|
||||
inputLib.message_aligned(buffer, 'Fill....:', inputLib.format_energy(c_conv), system.width)
|
||||
message_aligned(buffer, 'Fill....:', format_percent(p_raw), system.width)
|
||||
message_aligned(buffer, 'Fill....:', format_energy(c_conv), system.width)
|
||||
|
||||
-- format and align capacity
|
||||
inputLib.message(buffer, '\n')
|
||||
inputLib.message_aligned(buffer, 'Capacity:', inputLib.format_energy(m_conv), system.width)
|
||||
message(buffer, '\n')
|
||||
message_aligned(buffer, 'Capacity:', format_energy(m_conv), system.width)
|
||||
|
||||
-- format and align i/o values
|
||||
inputLib.message(buffer, '\n') inputLib.message(buffer, '\n')
|
||||
inputLib.message_aligned(buffer, 'Input...:', inputLib.format_energy(i_conv, true), system.width)
|
||||
inputLib.message_aligned(buffer, 'Output..:', inputLib.format_energy(o_conv, true), system.width)
|
||||
message(buffer, '\n') message(buffer, '\n')
|
||||
message_aligned(buffer, 'Input...:', format_energy(i_conv, true), system.width)
|
||||
message_aligned(buffer, 'Output..:', format_energy(o_conv, true), system.width)
|
||||
|
||||
-- format and align transfer
|
||||
inputLib.message(buffer, '\n')
|
||||
inputLib.message_aligned(buffer, 'Transfer:', inputLib.format_energy(t_conv, true), system.width)
|
||||
message(buffer, '\n')
|
||||
message_aligned(buffer, 'Transfer:', format_energy(t_conv, true), system.width)
|
||||
end
|
||||
|
||||
function send_info()
|
||||
|
@ -62,7 +62,7 @@ function send_info()
|
|||
-- generate messages in buffer
|
||||
generate_message(buffer)
|
||||
-- transmit messages in form of buffer
|
||||
inputLib.transmit_messages(options, system, buffer)
|
||||
transmit_messages(options, system, buffer)
|
||||
end
|
||||
|
||||
function event_listener()
|
||||
|
@ -84,11 +84,11 @@ function main()
|
|||
-- reset terminal
|
||||
term.clear()
|
||||
-- run while all components are detected
|
||||
while inputLib.scan_components('inductionPort').success and (not system.timeout) do
|
||||
while scan_components('inductionPort').success and (not system.timeout) do
|
||||
event_listener()
|
||||
end
|
||||
-- rescan components
|
||||
wait_for_components(system)
|
||||
wait_for_components(options, system, 'inductionPort')
|
||||
end
|
||||
end
|
||||
main()
|
||||
|
|
Loading…
Reference in New Issue
Block a user