View difference between Paste ID: uTiwmvcY and Zhs6Ukmx

-local controller = peripheral.wrap("monitor_1")
+-- load libraries
--- local display = peripheral.wrap("monitor_27")
+os.loadAPI("drawLib")
 os.loadAPI("buttonLib")
-local wmod = peripheral.wrap("back")
+os.loadAPI("dataLib")
-local controllerX, controllerY, displayX, displayY
+-- peripheral setup
 
 local controllername = "monitor_0"
 local controller = peripheral.wrap(controllername)
-local generatorOutput = 0
+local modem = peripheral.wrap('top')
 modem.closeAll()
-buttons = {}
+modem.open(2)
 -- local wmod = peripheral.wrap("bottom")
-wmod.closeAll()
+-- wmod.closeAll()
 
 -- variables setup
 local controllerX, controllerY
-    -- displayX, displayY= display.getSize()
+
 local previousApp = "home"
 
 -- Application Variables Setup
-    wmod.open(i)
+local northFarmActive = false
 local eastFarmActive = false
 local southFarmActive = false
-function empty(monitor)
+local westFarmActive = false
-    monitor.setBackgroundColor(colors.black)
+local totalEssences = {}
-    monitor.clear()
+local essencesPage = 1
-    monitor.setCursorPos(1,1)
+local essencesPerPage = 13
 local currentSort = "None"
 
 function resizeMon()
-    empty(controller)
+
-    -- empty(display)
+
 
 function transmitToSlaves(message)
-function drawTitle(x, y, text, color_txt, color_bg, monitor)
+	-- print('Transmitting: ' .. message)
-    monitor.setBackgroundColor(color_bg)
+	modem.transmit(1,2,message)
-    monitor.setTextColor(color_txt)
+
-    monitor.setCursorPos(x,y)
+
-    monitor.write(text)
+
-    monitor.setCursorPos(1,1)
+    -- wmod.open(i)
-    monitor.setBackgroundColor(colors.black)
+
 
 function clearAll()
-function drawLine(x, y, length, size, color_bar, monitor)
+    drawLib.empty(controller)
-    for yPos = y, y+size-1 do
+
-        monitor.setBackgroundColor(color_bar)
+
-        monitor.setCursorPos(x, yPos)
+-- Startup Functions
-        monitor.write(string.rep(" ", length))
+
-        monitor.setBackgroundColor(colors.black)
+
     -- Application Triggers
     disableAllFarms()
 
-function drawProg(x, y, length, size, minVal, maxVal, color_bar, color_bg, monitor)
+
-    drawLine(x, y, length, size, color_bg, monitor)
+
-    local barSize = math.floor((minVal/maxVal)*length)
+
-    drawLine(x, y, barSize, size, color_bar, monitor)
+    drawLib.drawTitle(monX/2-7, monY/2, "All The Mods 7 OS", colors.white, colors.black,monitor)
     drawLib.drawTitle(monX/2-9, monY-3, "Loading... Please wait", colors.white, colors.black,monitor)
     for i=1, 30 do
-function drawContent(x, y, height, width, minVal, maxVal, color_bar, color_bg, monitor)
+
-    drawGraph(x, y, height, width, color_bg, monitor)
+        drawLib.drawProg(2,monY-1, monX-2, 1, i, 30, colors.white, colors.gray,monitor)
-    local a = math.floor((minVal/maxVal)*height)
+
-    drawGraph(x, y, a, width, color_bar, monitor)
+
     drawLib.empty(monitor)
 end
-function drawGraph(x, y, height, width, color_bar, monitor)
+
-    drawLine(x, y-height+1, width, height, color_bar, monitor)
+-- Utility Functions
 function formatNumbers(number,length)
 	return tostring(math.floor(number))..string.rep(" ",length-#tostring(math.floor(number)))
-function putTime(x,y,monitor,bool,color)
+
-	monitor.setBackgroundColor(color)
+function table_count(T)
-    monitor.setCursorPos(x,y)
+  local count = 0
-    time = textutils.formatTime(os.time(), bool)
+  for _ in pairs(T) do count = count + 1 end
-	if os.time()<10.000 then monitor.write("0"..time) else monitor.write(time) end
+  return count
-	monitor.setBackgroundColor(colors.black)
+
 function maxpages()
 	return math.ceil((table_count(totalEssences) / essencesPerPage))
-function clearBox(x,y,h,l,monitor,color)
+
-	monitor.setBackgroundColor(color)
+function atoz(a,b)
-    for i = y, y + h - 1 do
+  return a[1] < b[1]
-        monitor.setCursorPos(x,i)
+
-        monitor.write(string.rep(" ", l))
+function getSortedEssencesTable()
 	if currentSort == "None" then
-	monitor.setBackgroundColor(colors.black)
+		return totalEssences
 	elseif currentSort == " A to Z " then
 		return table.sort(totalEssences, compare)
 	elseif currentSort == " Z to Z " then
 
 	elseif currentSort == "Hi to Lo" then
 
 	elseif currentSort == "Lo to Hi" then
 
-    drawTitle(monX/2-7, monY/2, "Brent OS v2.1beta", colors.white, colors.black,monitor)
+	end
-    drawTitle(monX/2-9, monY-3, "Loading... Please wait", colors.white, colors.black,monitor)
+
-    for i=1, 50 do
+
 -- Application Functions
-        drawProg(2,monY-1, monX-2, 1, i, 50, colors.white, colors.gray,monitor)
+function disableAllFarms()
     northFarmActive = false
 	transmitToSlaves("northFarmOff")
-    empty(monitor)
+    eastFarmActive = false
 	transmitToSlaves("eastFarmOff")
     southFarmActive = false
 	transmitToSlaves("southFarmOff")
-	local out = tostring(math.floor(number))..string.rep(" ",length-#tostring(math.floor(number)))
+    westFarmActive = false
-	return out
+	transmitToSlaves("westFarmOff")
 end
 function updateEssenceCounts()
-function addButton(x,y,w,h,name,colorOn,colorOff,state,textOn,textOff,textX,textY,header)
+	transmitToSlaves("provideEssenceCount")
-	buttons[name] = {["x"] = x,["y"] = y,["width"] = w,["height"] = h,
+	local event, side, channel, replyChannel, message, distance = os.pullEvent("modem_message")
-						["colorOn"] = colorOn,["colorOff"] = colorOff,["state"] = state,
+	totalEssences = message
-						["textOn"] = textOn,["textOff"] = textOff,
+
-						["textX"] = textX,["textY"] = textY,["header"] = header}
+
 -- Add all buttons
 function addButtons()
 	-- Homebar Page Change
-	addButton(1,1,3,1,"pageLeft",colors.cyan,colors.red,true,"<- ","",1,1,"")
+	buttonLib.addButton(1,1,3,1,"pageLeft",colors.cyan,colors.red,true,"<- ","",1,1,"")
-	addButton(controllerX-2,1,3,1,"pageRight",colors.cyan,colors.red,true," ->","",controllerX-2,1,"")
+	buttonLib.addButton(controllerX-2,1,3,1,"pageRight",colors.cyan,colors.red,true," ->","",controllerX-2,1,"")
 	-- Homebar Home
-	addButton(1,1,5,1,"homeButton1",colors.lime,colors.lightGray,true,"/^\\","",2,1,"")
+	buttonLib.addButton(1,1,5,1,"homeButton1",colors.lime,colors.lightGray,true,"/^\\","",2,1,"")
-	addButton(1,2,5,1,"homeButton2",colors.lime,colors.lightGray,true,"|#|","",2,2,"")
+	buttonLib.addButton(1,2,5,1,"homeButton2",colors.lime,colors.lightGray,true,"|#|","",2,2,"")
 	-- Homebar Back
-	addButton(controllerX-4,1,5,1,"backButton1",colors.red,colors.lightGray,true,"/__","",controllerX-3,1,"")
+	buttonLib.addButton(controllerX-4,1,5,1,"backButton1",colors.red,colors.lightGray,true,"/__","",controllerX-3,1,"")
-	addButton(controllerX-4,2,5,1,"backButton2",colors.red,colors.lightGray,true,"\\  ","",controllerX-3,2,"")
+	buttonLib.addButton(controllerX-4,2,5,1,"backButton2",colors.red,colors.lightGray,true,"\\  ","",controllerX-3,2,"")
 	-- Applications
-	addButton(3,4,11,3,"power",colors.cyan,colors.gray,true," Power ","",5,5,"")
+	buttonLib.addButton(3,4,11,3,"farms",colors.cyan,colors.gray,true,"Farms","",6,5,"")
-	addButton(17,4,11,3,"setting",colors.cyan,colors.gray,true,"Setting","",19,5,"")
+	buttonLib.addButton(17,4,11,3,"setting",colors.cyan,colors.gray,true,"Setting","",19,5,"")
-	addButton(3,8,11,3,"storage",colors.cyan,colors.gray,true,"Storage","",5,9,"")
+	buttonLib.addButton(3,8,11,3,"storage",colors.cyan,colors.gray,true,"Storage","",5,9,"")
-	addButton(17,8,11,3,"graphs",colors.cyan,colors.gray,true,"Diagram","",19,9,"")
+	buttonLib.addButton(17,8,11,3,"graphs",colors.cyan,colors.gray,true,"Diagram","",19,9,"")
-	-- addButton(3,12,11,3,"timelog",colors.cyan,colors.gray,true,"TimeLog","",5,13,"")
+	--addButton(3,12,11,3,"timelog",colors.cyan,colors.gray,true,"TimeLog","",5,13,"")
-	-- addButton(17,12,11,3,"nothing",colors.cyan,colors.gray,false,"","Nothing",19,13,"")
+	--addButton(17,12,11,3,"nothing",colors.cyan,colors.gray,false,"","Nothing",19,13,"")
 	-- Farm Application Buttons
-	addButton(controllerX,controllerY,1,1,"powerswitch",colors.black,colors.red,true,"X","",controllerX,controllerY,"")
+	--addButton(7,4,5,3,"northFarm",colors.green,colors.red,true,"N","N",9,5,"")
 	--addButton(2,7,5,3,"westFarm",colors.green,colors.red,true,"W","W",4,8,"")
-	addButton(2,5,6,1,"togglePower",colors.lime,colors.red,false,"  ON  ","  OFF ",2,5,"Master")
+	--addButton(7,10,5,3,"southFarm",colors.green,colors.red,true,"S","S",9,11,"")
-	addButton(2,7,6,1,"incrPower",colors.cyan,colors.gray,true," /\\ "," /\\",3,7,"")
+	--addButton(12,7,5,3,"eastFarm",colors.green,colors.red,true,"E","E",14,8,"")
-	addButton(2,9,6,1,"levelPower",colors.black,colors.red,true,"0  EUt","",2,9,"")
+	buttonLib.addButton(2,4,5,3,"northFarm",colors.green,colors.red,true,"N","N",4,5,"")
-	addButton(2,11,6,1,"decrPower",colors.cyan,colors.gray,true," \\/ "," \\/ ",3,11,"")
+	buttonLib.addButton(2,8,5,3,"eastFarm",colors.green,colors.red,true,"E","E",4,9,"")
 	buttonLib.addButton(2,12,5,3,"southFarm",colors.green,colors.red,true,"S","S",4,13,"")
 	buttonLib.addButton(2,16,5,3,"westFarm",colors.green,colors.red,true,"W","W",4,17,"")
 	buttonLib.addButton(31,6,3,1,"essencePageLeft",colors.blue,colors.gray,true,"<","<",32,6,"")
-	drawLine(1,1,controllerX,2,colors.gray,monitor)
+	buttonLib.addButton(47,6,3,1,"essencePageRight",colors.blue,colors.gray,true,">",">",48,6,"")
-	drawButton("homeButton1",monitor)
+	-- Settings Application Buttons
-	drawButton("homeButton2",monitor)
+	buttonLib.addButton(3,4,11,3,"restart",colors.red,colors.gray,true,"Restart","",5,5,"")
-	drawButton("backButton1",monitor)
+
-	drawButton("backButton2",monitor)
+
-	drawButton("powerswitch",monitor)
+-- Generate The Gui Based On Current State
-	clearBox(controllerX/2-1,1,1,5,monitor,colors.gray)
+
-	putTime(controllerX/2-1,1,monitor,true,colors.gray)
+	-- Draw Home Bar
     drawLib.drawLine(1,1,controllerX,2,colors.gray,monitor)
 	buttonLib.drawButton("homeButton1",monitor)
-		drawButton("power",monitor)
+	buttonLib.drawButton("homeButton2",monitor)
-		drawButton("storage",monitor)
+	buttonLib.drawButton("backButton1",monitor)
-		drawButton("graphs",monitor)
+	buttonLib.drawButton("backButton2",monitor)
-		drawButton("setting",monitor)
+	drawLib.clearBox(controllerX/2-1,1,1,5,monitor,colors.gray)
-	elseif currentApp == "power" then
+	drawLib.putTime(controllerX/2-1,1,monitor,true,colors.gray)
-		drawTitle(controllerX/2-2, 2, " Power", colors.white, colors.gray, monitor)
+    -- Draw Application Specific Items
 	if currentApp == "home" then
-		if generatorOutput == 0 then buttons["decrPower"].state = false else buttons["decrPower"].state = true end
+		buttonLib.drawButton("farms",monitor)
-		if generatorOutput == 512 then buttons["incrPower"].state = false else buttons["incrPower"].state = true end
+		buttonLib.drawButton("storage",monitor)
-		buttons["levelPower"].textOn = formatNumbers(generatorOutput,3).."EUt"
+		buttonLib.drawButton("graphs",monitor)
 		buttonLib.drawButton("setting",monitor)
-		drawButton("togglePower",monitor)
+	elseif currentApp == "farms" then
-		drawButton("incrPower",monitor)
+		drawLib.drawTitle(controllerX/2-1, 2, "Farms", colors.white, colors.gray, monitor)
-		drawButton("decrPower",monitor)
+
-		drawButton("levelPower",monitor)
+		buttonLib.setButtonState("northFarm",northFarmActive)
 		buttonLib.drawButton("northFarm",monitor)
 		buttonLib.setButtonState("westFarm",westFarmActive)
-		drawTitle(controllerX/2-2, 2, "Storage", colors.white, colors.gray, monitor)
+		buttonLib.drawButton("westFarm",monitor)
 		buttonLib.setButtonState("southFarm",southFarmActive)
 		buttonLib.drawButton("southFarm",monitor)
-		drawTitle(controllerX/2-2, 2, "Diagram", colors.white, colors.gray, monitor)
+		buttonLib.setButtonState("eastFarm",eastFarmActive)
 		buttonLib.drawButton("eastFarm",monitor)
 
-		drawTitle(controllerX/2-2, 2, "Setting", colors.white, colors.gray, monitor)
+		drawLib.drawTitle(9, 4, "Essences Collected :", colors.white, colors.black, monitor)
 
 		local index = 0
 		for key, value in pairs(getSortedEssencesTable()) do
 			if index < essencesPage * essencesPerPage and index >= (essencesPage - 1) * essencesPerPage then
 				local text = key .. string.rep(" ", 15 - #key) .. string.rep(" ", 5 - #(""..value)) .. value
 				drawLib.drawTitle(9, 6 + (index%essencesPerPage), text, colors.white, colors.black, monitor)
 			end
-function drawButton(button,monitor)
+			index = index + 1
-	local color = colors.red
+
-	local text = ""
+
-    if buttons[button].state==true then color = buttons[button].colorOn else color = buttons[button].colorOff end
+		buttonLib.drawButton("essencePageLeft",monitor)
-    if buttons[button].state==true then text = buttons[button].textOn else text = buttons[button].textOff end
+		drawLib.drawTitle(31, 4, "       Page        ", colors.white, colors.gray, monitor)
-    drawLine(buttons[button].x, buttons[button].y, buttons[button].width, buttons[button].height, color, monitor)
+		drawLib.drawTitle(37, 6, essencesPage.." of "..maxpages(), colors.white, colors.black, monitor)
-	if buttons[button].header == "" then else
+		buttonLib.drawButton("essencePageRight",monitor)
-    drawTitle(buttons[button].x, buttons[button].y - 1, buttons[button].header, colors.white, colors.black, monitor) end
+
-    drawTitle(buttons[button].textX, buttons[button].textY, text, colors.white, color, monitor)
+		--buttonLib.drawButton("essencePageLeft",monitor)
 		drawLib.drawTitle(31, 8, "       Sort        ", colors.white, colors.gray, monitor)
 		drawLib.drawTitle(38, 10, "None", colors.white, colors.black, monitor)
 		--buttonLib.drawButton("essencePageRight",monitor)
-   if x >= buttons["homeButton1"].x and x < buttons["homeButton1"].x + buttons["homeButton1"].width and
+
-		y >= buttons["homeButton1"].y and y < buttons["homeButton1"].y + buttons["homeButton1"].height and side == "monitor_1" then
+		--buttonLib.drawButton("essencePageLeft",monitor)
 		drawLib.drawTitle(31, 12, "       Data        ", colors.white, colors.gray, monitor)
-			empty(controller)
+		drawLib.drawTitle(37, 14, "Totals", colors.white, colors.black, monitor)
-    elseif x >= buttons["homeButton2"].x and x < buttons["homeButton2"].x + buttons["homeButton2"].width and
+		--buttonLib.drawButton("essencePageRight",monitor)
-		y >= buttons["homeButton2"].y and y < buttons["homeButton2"].y + buttons["homeButton2"].height and side == "monitor_1" then
+
 	elseif currentApp == "storage" then
-			empty(controller)
+		drawLib.drawTitle(controllerX/2-2, 2, "Storage", colors.white, colors.gray, monitor)
-    elseif x >= buttons["backButton1"].x and x < buttons["backButton1"].x + buttons["backButton1"].width and
+
-		y >= buttons["backButton1"].y and y < buttons["backButton1"].y + buttons["backButton1"].height and side == "monitor_1" then
+
 		drawLib.drawTitle(controllerX/2-2, 2, "Diagram", colors.white, colors.gray, monitor)
-    elseif x >= buttons["backButton2"].x and x < buttons["backButton2"].x + buttons["backButton2"].width and
+
-		y >= buttons["backButton2"].y and y < buttons["backButton2"].y + buttons["backButton2"].height and side == "monitor_1" then
+
 		drawLib.drawTitle(controllerX/2-2, 2, "Setting", colors.white, colors.gray, monitor)
-    elseif x >= buttons["power"].x and x < buttons["power"].x + buttons["power"].width and
+		buttonLib.drawButton("restart",monitor)
-		y >= buttons["power"].y and y < buttons["power"].y + buttons["power"].height and side == "monitor_1"
+
-		and currentApp == "home" then
+
-			currentApp = "power"
+
-			previousApp = "home"
+
-			empty(controller)
+
-    elseif x >= buttons["storage"].x and x < buttons["storage"].x + buttons["storage"].width and
+
-		y >= buttons["storage"].y and y < buttons["storage"].y + buttons["storage"].height and side == "monitor_1"
+
-		and currentApp == "home" then
+-- React To Touch Events
-			currentApp = "storage"
+
-			previousApp = "home"
+	-- Is On the main controller screen
-			empty(controller)
+	if side == controllername then
-    elseif x >= buttons["graphs"].x and x < buttons["graphs"].x + buttons["graphs"].width and
+   		if buttonLib.isWithinBoundingBox(x,y,"homeButton1") then
-		y >= buttons["graphs"].y and y < buttons["graphs"].y + buttons["graphs"].height and side == "monitor_1"
+
-		and currentApp == "home" then
+			drawLib.empty(controller)
-			currentApp = "graphs"
+   		elseif buttonLib.isWithinBoundingBox(x,y,"homeButton2") then
-			previousApp = "home"
+
-			empty(controller)
+			drawLib.empty(controller)
-    elseif x >= buttons["setting"].x and x < buttons["setting"].x + buttons["setting"].width and
+   		elseif buttonLib.isWithinBoundingBox(x,y,"backButton1") then
-		y >= buttons["setting"].y and y < buttons["setting"].y + buttons["setting"].height and side == "monitor_1"
+
-		and currentApp == "home" then
+  		elseif buttonLib.isWithinBoundingBox(x,y,"backButton2") then
-			currentApp = "setting"
+
-			previousApp = "home"
+		elseif currentApp == "home" then
-			empty(controller)
+			if buttonLib.isWithinBoundingBox(x,y,"farms") then
-    elseif x >= buttons["powerswitch"].x and x < buttons["powerswitch"].x + buttons["powerswitch"].width and
+            	currentApp = "farms"
-		y >= buttons["powerswitch"].y and y < buttons["powerswitch"].y + buttons["powerswitch"].height and side == "monitor_1" then
+            	previousApp = "home"
-			os.reboot()
+            	drawLib.empty(controller)
-    elseif x >= buttons["incrPower"].x and x < buttons["incrPower"].x + buttons["incrPower"].width and
+    		elseif buttonLib.isWithinBoundingBox(x,y,"storage") then
-		y >= buttons["incrPower"].y and y < buttons["incrPower"].y + buttons["incrPower"].height and side == "monitor_1"
+            	currentApp = "storage"
-		and currentApp == "power" then
+            	previousApp = "home"
-			if generatorOutput <= 480 then generatorOutput = generatorOutput + 32 end
+            	drawLib.empty(controller)
-			wmod.transmit(40000,0,"gen1."..math.floor(generatorOutput/64))
+    		elseif buttonLib.isWithinBoundingBox(x,y,"graphs") then
-			wmod.transmit(40000,0,"gen2."..math.ceil(generatorOutput/64))
+            	currentApp = "graphs"
-    elseif x >= buttons["decrPower"].x and x < buttons["decrPower"].x + buttons["decrPower"].width and
+            	previousApp = "home"
-		y >= buttons["decrPower"].y and y < buttons["decrPower"].y + buttons["decrPower"].height and side == "monitor_1"
+            	drawLib.empty(controller)
-		and currentApp == "power" then
+    		elseif buttonLib.isWithinBoundingBox(x,y,"setting") then
-			if generatorOutput >= 32 then generatorOutput = generatorOutput - 32 end
+            	currentApp = "setting"
-			wmod.transmit(40000,0,"gen1."..math.floor(generatorOutput/64))
+            	previousApp = "home"
-			wmod.transmit(40000,0,"gen2."..math.ceil(generatorOutput/64))
+            	drawLib.empty(controller)
-    elseif x >= buttons["togglePower"].x and x < buttons["togglePower"].x + buttons["togglePower"].width and
+			end
-		y >= buttons["togglePower"].y and y < buttons["togglePower"].y + buttons["togglePower"].height and side == "monitor_1"
+        elseif currentApp == "farms" then
-		and currentApp == "power" then
+			if buttonLib.isWithinBoundingBox(x,y,"northFarm") then
-			if buttons["togglePower"].state == true then
+                if northFarmActive then transmitToSlaves("northFarmOff") else transmitToSlaves("northFarmOn") end
-				wmod.transmit(40000,0,".safetyOn")
+                if northFarmActive then northFarmActive = false else northFarmActive = true end
-				buttons["togglePower"].state = false
+				-- transmit over network that northfarm must be toggled
-			elseif buttons["togglePower"].state == false then
+            	drawLib.empty(controller)
-				wmod.transmit(40000,0,".safetyOff")
+    		elseif buttonLib.isWithinBoundingBox(x,y,"eastFarm") then
-				buttons["togglePower"].state = true
+                if northFarmActive then transmitToSlaves("eastFarmOff") else transmitToSlaves("eastFarmOn") end
-				wmod.transmit(40000,0,"gen1."..math.floor(generatorOutput/64))
+                if eastFarmActive then eastFarmActive = false else eastFarmActive = true end
-				wmod.transmit(40000,0,"gen2."..math.ceil(generatorOutput/64))
+
             	drawLib.empty(controller)
-    else
+    		elseif buttonLib.isWithinBoundingBox(x,y,"southFarm") then
                 if northFarmActive then transmitToSlaves("southFarmOff") else transmitToSlaves("southFarmOn") end
                 if southFarmActive then southFarmActive = false else southFarmActive = true end
 
             	drawLib.empty(controller)
-    parallel.waitForAny(wait,getTouch)
+    		elseif buttonLib.isWithinBoundingBox(x,y,"westFarm") then
                 if northFarmActive then transmitToSlaves("westFarmOff") else transmitToSlaves("westFarmOn") end
                 if westFarmActive then westFarmActive = false else westFarmActive = true end
 
             	drawLib.empty(controller)
 			elseif buttonLib.isWithinBoundingBox(x,y,"essencePageLeft") then
                 if essencesPage > 1 then essencesPage = essencesPage - 1 end
             	drawLib.empty(controller)
 			elseif buttonLib.isWithinBoundingBox(x,y,"essencePageRight") then
- sleep(1)
+				if essencesPage < maxpages() then essencesPage = essencesPage + 1 end
             	drawLib.empty(controller)
 			end
         elseif currentApp == "setting" then
 			if buttonLib.isWithinBoundingBox(x,y,"restart") then
 				os.reboot()
 			else
 			end
    		else
-	wmod.transmit(40000,0,".safetyOn")
+   		end
 	else
 	end
 end
 
 function waitForTouch()
     parallel.waitForAny(applicationWaiter,getTouch)
 end
 
 function applicationWaiter()
 	parallel.waitForAny(wait,applicationLoop)
 end
 
 function applicationLoop()
 	updateEssenceCounts()
 end
 
 function getTouch()
     event, side, xPos, yPos = os.pullEvent("monitor_touch")
     touchAreas(xPos, yPos, side)
 end
 
 function wait()
  	sleep(0.5)
 end
 
 function init()
     clearAll()
     resizeMon()
     bootSequence()
 	addButtons()
     clearAll()
     while true do
 		generateGUI(controller)
         waitForTouch()
     end
 end
 
 init()