View difference between Paste ID: 8VbppyF8 and PZ2hWaLW

---btn = require("buttonAPI")
+--btn = require("buttonAPI")
-local component = require("component")
+local component = require("component")
-local keyboard = require("keyboard")
+local keyboard = require("keyboard")
-local event = require("event")
+local event = require("event")
-local gpu = component.gpu
+local gpu = component.gpu
-local sides = require("sides")
+local sides = require("sides")
-local sysinfo = {}
+local sysinfo = {}
-
+
-local g = component.ie_diesel_generator
+local g = component.ie_diesel_generator
-local f = component.ie_fermenter
+local f = component.ie_fermenter
-local s = component.ie_squeezer
+local s = component.ie_squeezer
-local r = component.ie_refinery
+local r = component.ie_refinery
-local red = component.redstone
+local red = component.redstone
-
+
-local colours = {black = 0x000000, white = 0xFFFFFF, yellow = 0xFFFF55, blue = 0x0000AA, green = 0x00AA00, grey = 0xAAAAAA, red = 0xAA0000}
+local colours = {black = 0x000000, white = 0xFFFFFF, yellow = 0xFFFF55, blue = 0x0000AA, green = 0x00AA00, grey = 0xAAAAAA, red = 0xAA0000}
-local sections = {}
+local sections = {}
-local graphs = {}
+local graphs = {}
-local info = {}
+local info = {}
-local applications = {}
+local applications = {}
-
+
-local currentDiesel = 0
+local currentDiesel = 0
-local currentFEthanol = 0
+local currentFEthanol = 0
-local currentPotato = 0
+local currentPotato = 0
-local currentSPlantOil = 0
+local currentSPlantOil = 0
-local currnetPumpkin = 0
+local currnetPumpkin = 0
-local currentREthanol=0
+local currentREthanol=0
-local currentRPlantOil = 0
+local currentRPlantOil = 0
-local currentRDiesel = 0
+local currentRDiesel = 0
-
+local currentenaFer = false
-gpu.setResolution(132,38)
+local currentenaGen = false
---gpu.setResolution(98,32)
+local currentenaRef = false
-local w,h = gpu.getResolution() -- lol
+local currentenaSqu = false
-
+
--- define sections
+gpu.setResolution(132,38)
-function setSections()
+--gpu.setResolution(98,32)
-  sections["tanks"] = { x = 5, y = 26, width = 123, height = 6, title = "[ Tanks ]"}
+local w,h = gpu.getResolution() -- lol
-  sections["status"] = { x = 88, y = 4, width = 40, height = 20, title = "[ Status ]"}
+
-  sections["details"] = { x = 5, y = 4, width = 78, height = 20, title = "[ Details ]"}
+-- define sections
 function setSections()
--- define graphs to display
+  sections["tanks"] = { x = 5, y = 26, width = 123, height = 6, title = "[ Tanks ]"}
-function setGraphs()
+  sections["status"] = { x = 88, y = 4, width = 40, height = 20, title = "[ Status ]"}
-  graphs["diesel"] = { x = 8, y = 29, width = 118, height = 2, title = "Diesel"}
+  sections["details"] = { x = 5, y = 4, width = 78, height = 20, title = "[ Details ]"}
 end
--- define info to display
+-- define graphs to display
-function setInfo()
+function setGraphs()
-  info["diesel"]      = { x = 8, y = 6, width = 73, height= 1, title  = "Generator Diesel: ", unit = " mB"}
+  graphs["diesel"] = { x = 8, y = 29, width = 118, height = 2, title = "Diesel"}
-  info["fethanol"]    = { x = 8, y = 8, width = 73, height = 1, title = "Ethanol: ", unit = " mB"}
+end
-  info["potato"]      = { x = 8, y = 10, width = 73, height= 1, title = "Potatoes: ", unit = " potatoes"}
+-- define info to display
-  info["splantoil"]   = { x = 8, y = 12, width = 73, height= 1, title = "Plant Oil: ", unit = " mB"}
+function setInfo()
-  info["pumpkin"]     = { x = 8, y = 14, width = 73, height= 1, title = "Pumpkins: ", unit = " pumpkins"}
+  info["diesel"]      = { x = 8, y = 6, width = 73, height= 1, title  = "Generator Diesel: ", unit = " mB"}
-  info["rethanol"]    = { x = 8, y = 16, width = 73, height= 1, title = "Refinery Ethanol: ", unit = " mB"}
+  info["fethanol"]    = { x = 8, y = 8, width = 73, height = 1, title = "Ethanol: ", unit = " mB"}
-  info["rplantoil"]   = { x = 8, y = 18, width = 73, height= 1, title = "Refinery Plant Oil: ", unit = " mB"}
+  info["potato"]      = { x = 8, y = 10, width = 73, height= 1, title = "Potatoes: ", unit = " potatoes"}
-  info["rdiesel"]     = { x = 8, y = 20, width = 73, height= 1, title = "Refinery Diesel: ", unit = " mB"}
+  info["splantoil"]   = { x = 8, y = 12, width = 73, height= 1, title = "Plant Oil: ", unit = " mB"}
   info["pumpkin"]     = { x = 8, y = 14, width = 73, height= 1, title = "Pumpkin: ", unit = " seeds"}
--- define applications
+  info["rethanol"]    = { x = 8, y = 16, width = 73, height= 1, title = "Refinery Ethanol: ", unit = " mB"}
-function setApplications()
+  info["rplantoil"]   = { x = 8, y = 18, width = 73, height= 1, title = "Refinery Plant Oil: ", unit = " mB"}
-  applications["main"] = {x = 3, y = 2, width = 128, height = 32, title = "[ Power Generation Control Panel ]"}
+  info["rdiesel"]     = { x = 8, y = 20, width = 73, height= 1, title = "Refinery Diesel: ", unit = " mB"}
 
-
+  info["enaGen"]      = { x = 91, y = 6, width = 73, height= 1, title = "Generator Enabled: ", unit = ""}
-
+  info["enaFer"]      = { x = 91, y = 6, width = 73, height= 1, title = "Fermenter Enabled: ", unit = ""}
------------------------- Button Stuff -------------------------------------------
+  info["enaSqu"]      = { x = 91, y = 6, width = 73, height= 1, title = "Squeezer Enabled: ", unit = ""}
-local btn = {}
+  info["enaRef"]      = { x = 91, y = 6, width = 73, height= 1, title = "Refinery Enabled: ", unit = ""}
-local button = {}
+end
-function btn.clearTable()
+-- define applications
-  button = {}
+function setApplications()
   applications["main"] = {x = 3, y = 2, width = 128, height = 32, title = "[ Power Generation Control Panel ]"}
-
+end
-function btn.setTable(name, func, xmin, ymin, xmax, ymax, text, colors, active) -- color is an object { on : 0x000000, off 0xAAAAAA}
+
-  button[name] = {}
+
-  button[name]["text"] = text
+------------------------ Button Stuff -------------------------------------------
-  button[name]["func"] = func
+local btn = {}
-  button[name]["active"] = active
+local button = {}
-  button[name]["xmin"] = xmin
+function btn.clearTable()
-  button[name]["ymin"] = ymin
+  button = {}
-  button[name]["xmax"] = xmax
+end
-  button[name]["ymax"] = ymax
+
-  button[name]["colors"] = colors
+function btn.setTable(name, func, xmin, ymin, xmax, ymax, text, colors, active) -- color is an object { on : 0x000000, off 0xAAAAAA}
   button[name] = {}
-
+  button[name]["text"] = text
-function btn.fill(bData)
+  button[name]["func"] = func
-
+  button[name]["active"] = active
-  local yspot = math.floor((bData["ymin"] + bData["ymax"]) /2)
+  button[name]["xmin"] = xmin
-  local xspot = math.floor((bData["xmin"] + bData["xmax"]) /2) - math.floor((string.len(bData["text"])/2))
+  button[name]["ymin"] = ymin
-  local oldColor = gpu.getBackground()
+  button[name]["xmax"] = xmax
-  local curColor = bData["colors"].on
+  button[name]["ymax"] = ymax
-
+  button[name]["colors"] = colors
-  if bData["active"] then
+end
-    curColor = bData["colors"].on
+
-  else
+function btn.fill(bData)
-    curColor = bData["colors"].off
+
-  end
+  local yspot = math.floor((bData["ymin"] + bData["ymax"]) /2)
-  gpu.setBackground(curColor)
+  local xspot = math.floor((bData["xmin"] + bData["xmax"]) /2) - math.floor((string.len(bData["text"])/2))
-  gpu.fill(bData["xmin"], bData["ymin"], bData["xmax"] - bData["xmin"] + 1, bData["ymax"] - bData["ymin"] + 1, " ")
+  local oldColor = gpu.getBackground()
-  gpu.set(xspot, yspot, bData["text"])
+  local curColor = bData["colors"].on
-  gpu.setBackground(oldColor)
+
   if bData["active"] then
-
+    curColor = bData["colors"].on
-function btn.screen()
+  else
-  for name,data in pairs(button) do
+    curColor = bData["colors"].off
-     btn.fill(data)
+  end
-  end
+  gpu.setBackground(curColor)
   gpu.fill(bData["xmin"], bData["ymin"], bData["xmax"] - bData["xmin"] + 1, bData["ymax"] - bData["ymin"] + 1, " ")
-
+  gpu.set(xspot, yspot, bData["text"])
-function btn.toggleButton(name)
+  gpu.setBackground(oldColor)
-  button[name]["active"] = not button[name]["active"]
+end
-  btn.screen() -- not sure about this one here
+
-  return button[name]["active"]
+function btn.screen()
   for name,data in pairs(button) do
-
+     btn.fill(data)
-function btn.flash(name)
+  end
-  _ = btn.toggleButton(name)
+end
-  btn.screen() -- or here
+
-  os.sleep(0.1)
+function btn.toggleButton(name)
-  _ = btn.toggleButton(name)
+  button[name]["active"] = not button[name]["active"]
-  btn.screen()
+  btn.screen() -- not sure about this one here
   return button[name]["active"]
-
+end
-function btn.checkxy(_, _, x, y, _, _)
+
-  os.sleep(0)
+function btn.flash(name)
-  for name, data in pairs(button) do
+  _ = btn.toggleButton(name)
-    if y >= data["ymin"] and y <= data["ymax"] then
+  btn.screen() -- or here
-      if x >= data["xmin"] and x <= data["xmax"] then
+  os.sleep(0.1)
-        data["func"]()
+  _ = btn.toggleButton(name)
-        return true
+  btn.screen()
-      end
+end
-    end
+
-  end
+function btn.checkxy(_, _, x, y, _, _)
-  return false
+  os.sleep(0)
   for name, data in pairs(button) do
-
+    if y >= data["ymin"] and y <= data["ymax"] then
-----------------------------------------------------------------------------------
+      if x >= data["xmin"] and x <= data["xmax"] then
-
+        data["func"]()
-function setButtons()
+        return true
---  btn.setTable("power", power, 91, 6, 106, 8, "power", {on = colours.green, off = colours.red},false)
+      end
---  btn.setTable("test", testBtn, 108, 6, 123, 8, "test", {on = colours.green, off = colours.red},false)
+    end
-  --btn.setTable("OFF", powerOff, 109, 6, 125, 8,"OFF", {on = colours.red, off = colours.red})
+  end
-
+  return false
-  --btn.setTable("lowerMinLimit", lowerMinLimit, 91, 15, 106, 17,"-10", {on = colours.blue, off = colours.blue})
+end
-  --btn.setTable("lowerMaxLimit", lowerMaxLimit, 109, 15, 125, 17,"-10", {on = colours.purple, off = colours.purple})
+
-
+----------------------------------------------------------------------------------
-  --btn.setTable("augmentMinLimit", augmentMinLimit, 91, 19, 106, 21,"+10", {on = colours.blue, off = colours.blue})
+
-  --btn.setTable("augmentMaxLimit", augmentMaxLimit, 109, 19, 125, 21,"+10", {on = colours.purple, off = colours.purple})
+function setButtons()
 --  btn.setTable("power", power, 91, 6, 106, 8, "power", {on = colours.green, off = colours.red},false)
-
+--  btn.setTable("test", testBtn, 108, 6, 123, 8, "test", {on = colours.green, off = colours.red},false)
-function printBG()
+  --btn.setTable("OFF", powerOff, 109, 6, 125, 8,"OFF", {on = colours.red, off = colours.red})
-  gpu.setBackground(colours.black)
+
-  gpu.fill(1,1,w,h," ")
+  --btn.setTable("lowerMinLimit", lowerMinLimit, 91, 15, 106, 17,"-10", {on = colours.blue, off = colours.blue})
-  gpu.setBackground(colours.grey)
+  --btn.setTable("lowerMaxLimit", lowerMaxLimit, 109, 15, 125, 17,"-10", {on = colours.purple, off = colours.purple})
-  gpu.fill(1,h,w,1," ")
+
-  gpu.setForeground(colours.white)
+  --btn.setTable("augmentMinLimit", augmentMinLimit, 91, 19, 106, 21,"+10", {on = colours.blue, off = colours.blue})
-  local bottomText = "Copyright (c) 1996 - 2009 New DPKR Tech. Inc. All Rights Reserved."
+  --btn.setTable("augmentMaxLimit", augmentMaxLimit, 109, 19, 125, 21,"+10", {on = colours.purple, off = colours.purple})
-  gpu.set(w/2 - string.len(bottomText)/2,h,bottomText)
+end
 
--- application + borders
+function printBG()
-function printApplication(appName)
+  gpu.setBackground(colours.black)
-  local a = applications[appName]
+  gpu.fill(1,1,w,h," ")
-
+  gpu.setBackground(colours.grey)
-  --gpu.setBackground(colours.black)
+  gpu.fill(1,h,w,1," ")
-  --gpu.fill(a.x-2,a.y-1,a.width-2,a.height-1, " ")
+  gpu.setForeground(colours.white)
-  gpu.setBackground(colours.blue)
+  local bottomText = "Copyright (c) 1996 - 2009 New DPKR Tech. Inc. All Rights Reserved."
-  gpu.fill(a.x,a.y,a.width,a.height," ")
+  gpu.set(w/2 - string.len(bottomText)/2,h,bottomText)
-
+end
-  -- fill borders
+-- application + borders
-  gpu.setBackground(colours.blue)
+function printApplication(appName)
-  gpu.setForeground(colours.white)
+  local a = applications[appName]
-  gpu.fill(a.x, a.y, a.width, 1, "─")
+
-  gpu.fill(a.x, a.y, 1, a.height, "│")
+  --gpu.setBackground(colours.black)
-  gpu.fill(a.x, a.y + a.height, a.width, 1, "─")
+  --gpu.fill(a.x-2,a.y-1,a.width-2,a.height-1, " ")
-  gpu.fill(a.x + a.width, a.y, 1, a.height + 1, "│")
+  gpu.setBackground(colours.blue)
-   -- fill corners
+  gpu.fill(a.x,a.y,a.width,a.height," ")
-  gpu.set(a.x,a.y,"┌")
+
-  gpu.set(a.x + a.width,a.y,"┐")
+  -- fill borders
-  gpu.set(a.x,a.y + a.height,"└")
+  gpu.setBackground(colours.blue)
-  gpu.set(a.x + a.width,a.y + a.height,"┘")
+  gpu.setForeground(colours.white)
-  -- set title
+  gpu.fill(a.x, a.y, a.width, 1, "─")
-  gpu.setBackground(colours.blue)
+  gpu.fill(a.x, a.y, 1, a.height, "│")
-  gpu.setForeground(colours.white)
+  gpu.fill(a.x, a.y + a.height, a.width, 1, "─")
-  gpu.set(a.x + a.width/2 - string.len(a.title)/2, a.y, a.title)
+  gpu.fill(a.x + a.width, a.y, 1, a.height + 1, "│")
-  gpu.setForeground(colours.white)
+   -- fill corners
-
+  gpu.set(a.x,a.y,"┌")
   gpu.set(a.x + a.width,a.y,"┐")
--- section borders
+  gpu.set(a.x,a.y + a.height,"└")
-function printBorders(sectionName)
+  gpu.set(a.x + a.width,a.y + a.height,"┘")
-  local s = sections[sectionName]
+  -- set title
-  -- ─ │ ║ ═
+  gpu.setBackground(colours.blue)
-  -- ┐ └ ┴ ┬ ├ ─ ┼ │ ┤ ┘ ┌
+  gpu.setForeground(colours.white)
-  -- set border
+  gpu.set(a.x + a.width/2 - string.len(a.title)/2, a.y, a.title)
-  gpu.setBackground(colours.blue)
+  gpu.setForeground(colours.white)
-  gpu.fill(s.x, s.y, s.width, 1, "─")
+
-  gpu.fill(s.x, s.y, 1, s.height, "│")
+end
-  gpu.fill(s.x, s.y + s.height, s.width, 1, "─")
+-- section borders
-  gpu.fill(s.x + s.width, s.y, 1, s.height + 1, "│")
+function printBorders(sectionName)
-
+  local s = sections[sectionName]
-  gpu.set(s.x,s.y,"┌")
+  -- ─ │ ║ ═
-  gpu.set(s.x + s.width,s.y,"┐")
+  -- ┐ └ ┴ ┬ ├ ─ ┼ │ ┤ ┘ ┌
-  gpu.set(s.x,s.y + s.height,"└")
+  -- set border
-  gpu.set(s.x + s.width,s.y + s.height,"┘")
+  gpu.setBackground(colours.blue)
-
+  gpu.fill(s.x, s.y, s.width, 1, "─")
-  -- set title
+  gpu.fill(s.x, s.y, 1, s.height, "│")
-  gpu.setBackground(colours.blue)
+  gpu.fill(s.x, s.y + s.height, s.width, 1, "─")
-  gpu.setForeground(colours.white)
+  gpu.fill(s.x + s.width, s.y, 1, s.height + 1, "│")
-  gpu.set(s.x + s.width/2 - string.len(s.title)/2, s.y, s.title)
+
   gpu.set(s.x,s.y,"┌")
-
+  gpu.set(s.x + s.width,s.y,"┐")
-function power()
+  gpu.set(s.x,s.y + s.height,"└")
-  buttonStatus = btn.toggleButton("power",buttonStatus)
+  gpu.set(s.x + s.width,s.y + s.height,"┘")
-  if buttonStatus == true then
+
-    print("On!")
+  -- set title
-  else
+  gpu.setBackground(colours.blue)
-    print("Off!")
+  gpu.setForeground(colours.white)
-  end
+  gpu.set(s.x + s.width/2 - string.len(s.title)/2, s.y, s.title)
 end
-
+
-function testBtn()
+function power()
-  buttonStatus = btn.flash("test")
+  buttonStatus = btn.toggleButton("power",buttonStatus)
   if buttonStatus == true then
-
+    print("On!")
-function startup()
+  else
- -- print("Enabling computer control...")
+    print("Off!")
-  g.enableComputerControl(true)
+  end
-  f.enableComputerControl(true)
+end
-  s.enableComputerControl(true)
+
-  r.enableComputerControl(true)
+function testBtn()
-  g.setEnabled(false)
+  buttonStatus = btn.flash("test")
-  f.setEnabled(false)
+end
-  s.setEnabled(false)
+
-  r.setEnabled(false)
+function startup()
  -- print("Enabling computer control...")
-
+  g.enableComputerControl(true)
-function getSysInfo()
+  f.enableComputerControl(true)
-  -- check how much diesel we have
+  s.enableComputerControl(true)
-  dTank = g.getTankInfo()
+  r.enableComputerControl(true)
-  -- reset input count
+  g.setEnabled(false)
-  fInputSize = 0
+  f.setEnabled(false)
-  sInputSize = 0
+  s.setEnabled(false)
-  -- get size of each stack in fermenter and squeezer
+  r.setEnabled(false)
-  for i = 1,6 do
+end
-    fInputSize = fInputSize + f.getInputStack(i)["size"]
+
-    sInputSize = sInputSize + s.getInputStack(i)["size"]
+function getSysInfo()
-  end
+  -- check how much diesel we have
-  -- fermenter and squeezer fluid output
+  dTank = g.getTankInfo()
-  fTank = f.getFluid()
+  -- reset input count
-  sTank = s.getFluid()
+  fInputSize = 0
-  -- refinery io
+  sInputSize = 0
-  rInTank = r.getInputFluidTanks()
+  -- get size of each stack in fermenter and squeezer
-  rOutTank = r.getOutputTank()
+  for i = 1,6 do
-
+    fInputSize = fInputSize + f.getInputStack(i)["size"]
-  sysinfo["diesel"]       = dTank["amount"]
+    sInputSize = sInputSize + s.getInputStack(i)["size"]
-  sysinfo["dieselCap"]    = dTank["capacity"]
+  end
-  sysinfo["fethanol"]     = fTank["amount"]
+  -- fermenter and squeezer fluid output
-  sysinfo["fethanolCap"]  = fTank["capacity"]
+  fTank = f.getFluid()
-  sysinfo["potato"]       = fInputSize
+  sTank = s.getFluid()
-  sysinfo["potatoCap"]    = 384
+  -- refinery io
-  sysinfo["splantoil"]    = sTank["amount"]
+  rInTank = r.getInputFluidTanks()
-  sysinfo["splantoilCap"] = sTank["capacity"]
+  rOutTank = r.getOutputTank()
-  sysinfo["pumpkin"]      = sInputSize
+
-  sysinfo["pumpkinCap"]   = 384
+  sysinfo["diesel"]       = dTank["amount"]
-  sysinfo["rethanol"]     = rInTank["input1"]["amount"]
+  sysinfo["dieselCap"]    = dTank["capacity"]
-  sysinfo["rethanolCap"]  = rInTank["input1"]["capacity"]
+  sysinfo["fethanol"]     = fTank["amount"]
-  sysinfo["rplantoil"]    = rInTank["input2"]["amount"]
+  sysinfo["fethanolCap"]  = fTank["capacity"]
-  sysinfo["rplantoilCap"] = rInTank["input2"]["capacity"]
+  sysinfo["potato"]       = fInputSize
-  sysinfo["rdiesel"]      = rOutTank["amount"]
+  sysinfo["potatoCap"]    = 384
-  sysinfo["rdieselCap"]   = rOutTank["capacity"]
+  sysinfo["splantoil"]    = sTank["amount"]
   sysinfo["splantoilCap"] = sTank["capacity"]
-
+  sysinfo["pumpkin"]      = sInputSize
-function logicCheck()
+  sysinfo["pumpkinCap"]   = 384
---  print("checking logic")
+  sysinfo["rethanol"]     = rInTank["input1"]["amount"]
-  -- if filled by >50% activate the squeezer/fermenter
+  sysinfo["rethanolCap"]  = rInTank["input1"]["capacity"]
-  if fTank["amount"]/fTank["capacity"] <= 0.5 then
+  sysinfo["rplantoil"]    = rInTank["input2"]["amount"]
-    f.setEnabled(true)
+  sysinfo["rplantoilCap"] = rInTank["input2"]["capacity"]
-  else
+  sysinfo["rdiesel"]      = rOutTank["amount"]
-    f.setEnabled(false)
+  sysinfo["rdieselCap"]   = rOutTank["capacity"]
-  end
+
-  -- if filled by >50% activate the squeezer/fermenter
+  sysinfo["enaGen"] = tostring(g.isActive())
-  if sTank["amount"]/sTank["capacity"] <= 0.5 then
+  sysinfo["enaFer"] = tostring(f.isActive())
-    s.setEnabled(true)
+  sysinfo["enaSqu"] = tostring(s.isActive())
-  else
+  --sysinfo["enaRef"] = "NYE"
-    s.setEnabled(false)
+end
-  end
+
-
+function logicCheck()
-  if rOutTank["amount"]/rOutTank["capacity"] < 0.5 then
+--  print("checking logic")
-    r.setEnabled(true)
+  -- if filled by >50% activate the squeezer/fermenter
-    s.setEnabled(true)
+  if fTank["amount"]/fTank["capacity"] <= 0.5 then
-    f.setEnabled(true)
+    f.setEnabled(true)
-  else
+  else
-    r.setEnabled(false)
+    f.setEnabled(false)
-  end
+  end
-
+  -- if filled by >50% activate the squeezer/fermenter
-  if red.getBundledInput(sides.left)[0] > 0 then
+  if sTank["amount"]/sTank["capacity"] <= 0.5 then
-  --if dTank["amount"]/dTank["capacity"] > 0.5 then
+    s.setEnabled(true)
-    g.setEnabled(true)
+  else
-  else
+    s.setEnabled(false)
-    g.setEnabled(false)
+  end
-  end
+
   if rOutTank["amount"]/rOutTank["capacity"] < 0.5 then
-
+    r.setEnabled(true)
--- progress bar bg
+    sysinfo["enaRef"] = "true"
-function printGraphs(graphName)
+    s.setEnabled(true)
-  local g = graphs[graphName]
+    f.setEnabled(true)
-
+  else
-  -- set graph
+    r.setEnabled(false)
-  gpu.setBackground(colours.grey)
+    sysinfo["enaRef"] = "false"
-  gpu.fill(g.x, g.y, g.width, g.height, " ")
+  end
-
+
-  -- set title
+  if red.getBundledInput(sides.left)[0] > 0 then
-  gpu.setBackground(colours.blue)
+  --if dTank["amount"]/dTank["capacity"] > 0.5 then
-  gpu.setForeground(colours.yellow)
+    g.setEnabled(true)
-  gpu.set(g.x, g.y - 1, g.title)
+  else
     g.setEnabled(false)
--- progressbar
+  end
-function printGraphBar(activeGraph)
+end
-  local g = activeGraph
+
-
+-- progress bar bg
-  -- set graph
+function printGraphs(graphName)
-  gpu.setBackground(colours.green)
+  local g = graphs[graphName]
-  gpu.fill(g.x, g.y, g.width, g.height, " ")
+
-  --gpu.setBackground(colours.black)
+  -- set graph
   gpu.setBackground(colours.grey)
--- info to display
+  gpu.fill(g.x, g.y, g.width, g.height, " ")
-function printInfo(infoName)
+
-  local maxLength = 15
+  -- set title
-  local i = info[infoName]
+  gpu.setBackground(colours.blue)
-  local spaces = string.rep(" ", maxLength - string.len(sysinfo[infoName] .. i.unit))
+  gpu.setForeground(colours.yellow)
-  gpu.setForeground(colours.yellow)
+  gpu.set(g.x, g.y - 1, g.title)
-  gpu.setBackground(colours.blue)
+end
-  gpu.set(i.x, i.y , i.title .. sysinfo[infoName] .. i.unit .. spaces)
+-- progressbar
 function printGraphBar(activeGraph)
-
+  local g = activeGraph
-setApplications()
+
-setSections()
+  -- set graph
-setGraphs()
+  gpu.setBackground(colours.green)
-setInfo()
+  gpu.fill(g.x, g.y, g.width, g.height, " ")
-setButtons()
+  --gpu.setBackground(colours.black)
-
+end
-printBG()
+-- info to display
-printApplication("main")
+function printInfo(infoName)
-printBorders("status")
+  local maxLength = 15
-printBorders("details")
+  local i = info[infoName]
-printBorders("tanks")
+  local spaces = string.rep(" ", maxLength - string.len(sysinfo[infoName] .. i.unit))
-
+  gpu.setForeground(colours.yellow)
-printGraphs("diesel")
+  gpu.setBackground(colours.blue)
-
+  gpu.set(i.x, i.y , i.title .. sysinfo[infoName] .. i.unit .. spaces)
-function draw()
+end
-
+
-  if currentDiesel ~= sysinfo["diesel"] then
+setApplications()
-    currentDiesel = sysinfo["diesel"]
+setSections()
-    maxDiesel = sysinfo["dieselCap"]
+setGraphs()
-    local dieselFrac = math.ceil(graphs["diesel"].width * (currentDiesel/maxDiesel))
+setInfo()
-    local dGraphUpdate = {x = graphs["diesel"].x, y = graphs["diesel"].y, width = dieselFrac, height = graphs["diesel"].height}
+setButtons()
-
+
-    printGraphs("diesel")
+printBG()
-    printGraphBar(dGraphUpdate)
+printApplication("main")
-    printInfo("diesel")
+printBorders("status")
-  end
+printBorders("details")
-  if currentFEthanol ~= sysinfo["fethanol"] then
+printBorders("tanks")
-    currentFEthanol = sysinfo["fethanol"]
+
-    printInfo("fethanol")
+printGraphs("diesel")
-  end
+
-  if currentPotato ~= sysinfo["potato"] then
+function draw()
-    currentPotato = sysinfo["potato"]
+
-    printInfo("potato")
+  if currentDiesel ~= sysinfo["diesel"] then
-  end
+    currentDiesel = sysinfo["diesel"]
-  if currentSPlantOil ~= sysinfo["splantoil"] then
+    maxDiesel = sysinfo["dieselCap"]
-    currentSPlantOil = sysinfo["splantoil"]
+    local dieselFrac = math.ceil(graphs["diesel"].width * (currentDiesel/maxDiesel))
-    printInfo("splantoil")
+    local dGraphUpdate = {x = graphs["diesel"].x, y = graphs["diesel"].y, width = dieselFrac, height = graphs["diesel"].height}
-  end
+
-  if currnetPumpkin ~= sysinfo["pumpkin"] then
+    printGraphs("diesel")
-    currentPumpkin = sysinfo["pumpkin"]
+    printGraphBar(dGraphUpdate)
-    printInfo("pumpkin")
+    printInfo("diesel")
-  end
+  end
-  if currentREthanol ~= sysinfo["rethanol"] then
+  if currentFEthanol ~= sysinfo["fethanol"] then
-    currentREthanol = sysinfo["rethanol"]
+    currentFEthanol = sysinfo["fethanol"]
-    printInfo("rethanol")
+    printInfo("fethanol")
-  end
+  end
-  if currentRPlantOil ~= sysinfo["rplantoil"] then
+  if currentPotato ~= sysinfo["potato"] then
-    currentRPlantOil = sysinfo["rplantoil"]
+    currentPotato = sysinfo["potato"]
-    printInfo("rplantoil")
+    printInfo("potato")
-  end
+  end
-  if currentRDiesel ~= sysinfo["rdiesel"] then
+  if currentSPlantOil ~= sysinfo["splantoil"] then
-    currentRDiesel = sysinfo["rdiesel"]
+    currentSPlantOil = sysinfo["splantoil"]
-    printInfo("rdiesel")
+    printInfo("splantoil")
-  end
+  end
-  os.sleep(0)
+  if currnetPumpkin ~= sysinfo["pumpkin"] then
     currentPumpkin = sysinfo["pumpkin"]
-
+    printInfo("pumpkin")
-btn.screen()
+  end
-startup()
+  if currentREthanol ~= sysinfo["rethanol"] then
-while event.pull(0.1, "interrupted") == nil do
+    currentREthanol = sysinfo["rethanol"]
-  -- get info
+    printInfo("rethanol")
-  event.listen("touch", btn.checkxy)
+  end
-  getSysInfo()
+  if currentRPlantOil ~= sysinfo["rplantoil"] then
-  logicCheck()
+    currentRPlantOil = sysinfo["rplantoil"]
-  draw()
+    printInfo("rplantoil")
-  os.sleep(0)
+  end
-  local event, address, arg1, arg2, arg3 = event.pull(1)
+  if currentRDiesel ~= sysinfo["rdiesel"] then
-  if type(address) == "string" and component.isPrimary(address) then
+    currentRDiesel = sysinfo["rdiesel"]
-    if event == "key_down" and arg2 == keyboard.keys.q then
+    printInfo("rdiesel")
-      os.exit()
+  end
-    end
+
-  end
+  if currentenaFer ~= sysinfo["enaFer"] then
     currentenaFer = sysinfo["enaFer"]
     printInfo("enaFer")
   end
   if currentenaGen ~= sysinfo["enaGen"] then
     currentenaGen = sysinfo["enaGen"]
     printInfo("enaGen")
   end
   if currentenaSqu ~= sysinfo["enaSqu"] then
     currentenaSqu = sysinfo["enaSqu"]
     printInfo("enaSqu")
   end
   if currentenaRef ~= sysinfo["enaRef"] then
     currentenaRef = sysinfo["enaRef"]
     printInfo("enaRef")
   end
 
   os.sleep(0)
 end
 
 btn.screen()
 startup()
 while event.pull(0.1, "interrupted") == nil do
   -- get info
   event.listen("touch", btn.checkxy)
   getSysInfo()
   logicCheck()
   draw()
   os.sleep(0)
   local event, address, arg1, arg2, arg3 = event.pull(1)
   if type(address) == "string" and component.isPrimary(address) then
     if event == "key_down" and arg2 == keyboard.keys.q then
       os.exit()
     end
   end
 end