diff --git a/coolant_driver.lua b/coolant_driver.lua index 0f4fb35..f1ebd3f 100644 --- a/coolant_driver.lua +++ b/coolant_driver.lua @@ -1,12 +1,6 @@ local maxValue = 100 local minValue = 0 -local function configureReport(monitor) - local x,y = monitor.getCursorPos() - monitor.setCursorPos(x, y + 1) - monitor.clearLine() -end - local function getValue(reactor) return (reactor.getCoolantFilledPercentage() or 0) * 100 end @@ -32,7 +26,6 @@ end local function report(reactor, monitor) local value = getValue(reactor) local color = color(reactor) - configureReport(monitor) monitor.setBackgroundColor(color) monitor.write("Coolant: " .. value .. "%") end diff --git a/main.lua b/main.lua index 0231789..a3a3209 100644 --- a/main.lua +++ b/main.lua @@ -14,15 +14,19 @@ end local function runDisplay() monitor.clear() monitor.setTextScale(1) - monitor.setCursorPos(1, 1) while true do + monitor.setCursorPos(1, 1) + local drivers = { { Label = "Temperature", driver = tempDriver }, { Label = "Coolant", driver = coolantDriver }, } - for _, item in ipairs(drivers) do + for i, item in ipairs(drivers) do + monitor.setCursorPos(1, i) + monitor.clearLine() item.driver.report(reactor, monitor) + monitor.setCursorPos(1, i + 1) end sleep(0.25) -- Update every quarter second diff --git a/temperature_driver.lua b/temperature_driver.lua index 566be45..fa74673 100644 --- a/temperature_driver.lua +++ b/temperature_driver.lua @@ -3,12 +3,6 @@ local function getValue(reactor) return reactor.getTemperature() or 0 end -local function configureReport(monitor) - local x,y = monitor.getCursorPos() - monitor.setCursorPos(x, y + 1) - monitor.clearLine() -end - local function color(reactor) local temperature = getValue(reactor) return colors.black @@ -22,7 +16,6 @@ end local function report(reactor, monitor) local value = getValue(reactor) local color = color(reactor) - configureReport(monitor) monitor.setBackgroundColor(color) monitor.write("Coolant: " .. value .. "%") end