View difference between Paste ID: qxpwJfn5 and YU3xb5VY

---Automated Cruise Control v2 by Gazer29
+--Engine Control v2 by Gazer29
---Uses Automation mod version: Beta 1
+--Uses Automation mod
 
 local component = require("component")
 local term = require ("term")
 local entity = component.entity_link.getAPI("immersiverailroading:locomotivediesel")
 local thread = require("thread")
 require("PIDController")
 local serial = require("serialization")
 local fs = require("filesystem")
-local glassesTerminal = require("component").glasses
+
 local modem = component.modem
 
 local ATC = false
 local RUNNING = true
 local MODE = 3 -- 0 SET,
-local MODE = 0 -- 0 SET, 1 RAMP,
+
 local display = false
 local iteration = 1
 local timer = nil
 
 local CONFIG_FILE = "/home/CMD.dat"
 local CONFIG = nil
 local DEFAULT_CONFIG = {}
 local data = nil
 
-glassesTerminal.removeAll()
+
-atext = glassesTerminal.addText2D()
+
-atext.setText("ATC: OFF") -- no modifier!
+
-atext.setFontSize(42)
+
-atext.addColor(1, 0, 0, 1)
+
-atext.setCondition(atext.addColor(0, 1, 0, 1), "OVERLAY_ACTIVE", true)
+
 end
-btext = glassesTerminal.addText2D()
+
-btext.setText("+10")
+
-btext.setFontSize(60)
+
-btext.addColor(1,0,0,1)
+
-btext.addTranslation(0, 10, 0)
+
-btext.setCondition(btext.addColor(0, 1, 0, 1), "OVERLAY_ACTIVE", true)
+
 	local config = serial.unserialize(f:read("*a"))
-ctext = glassesTerminal.addText2D()
+
-ctext.setText("-10")
+
-ctext.setFontSize(60)
+
-ctext.addColor(1,0,0,1)
+
-ctext.addTranslation(0,18,0)
+
-ctext.setCondition(ctext.addColor(0, 1, 0, 1), "OVERLAY_ACTIVE", true)
+
 	positions = entity.getLocation()
 	xpos = positions.getX()
 	ypos = positions.getY()
 	zpos = positions.getZ()
 	print("X: 	", xpos)
 	print("Z: 	", zpos)
 end
 
 function GetTrainSpeed()
 	speed = entity.getCurrentSpeed()
 	return speed
 end
-	--print("Could not open " .. CONFIG_FILE .. ".")
+
-	--print("Loading default config")
+
-	--saveConfig(CONFIG_FILE, DEFAULT_CONFIG)
+
 	return uuid
 end
 
 function setThrottle(x)
 	if 0 >= x then x = 0 end
 	if 1 <= x then x = 1 end
 	entity.setThrottleLevel(x)
 	if display then
-function helpdisplay()
+
-	print("AutomaticTrainControl v1")
+
-	print("Commands:")
+
-	print("'Any number'    - Changes set speed")
+
-	print("'+' 		- Displays additional information")
+
-	print("'-' 		- Hides additional information")
+
-	print("'ramp'		- Changes to ramp mode, requires further input")
+
-	print("'idle'		- Pauses train control")
+
-	print("'auto'		- Automatic control")
+
-	print("'stop' 		- Ends program")
+
 		end
 end
 
 local function main()
 	while RUNNING do
         os.sleep(sleep)
 		input = GetTrainSpeed()
         if data ~= nil then
             if data[uuid] ~= nil then
                 setpoint = data[uuid].setspeed
                 print(setpoint)
                 PID:SetPoint(setpoint)
                 end
             end
         PID:SetInput(input)
         PID:Compute()
         output = PID:GetOutput()
         BrakeOut = output * -1
         setThrottle(output)
         setBrake(BrakeOut)
 		end
   end
 
 function stop()
   RUNNING = false
 end
 
 local function handleMessage(host, msg)
   local packet = serial.unserialize(msg)
   if packet == nil then
     print("nil packet")
     return
   end
   if packet.t == "STATUS" then
         --print(packet.v)
     	data = packet.v
   else
     print("unknown command")
   end
-local function reads()
+
-  while RUNNING do
+
-    user = nil
+
-    user = io.read()
+
-	if user == "stop" then
+
-		print("STOPPING...")
+
-		os.sleep(1)
+
-		stop()
+        --print("recv")
         handleMessage(p2, p5)
-	if user == "." then
+
-		term.clear()
+
     modem.close(54421)
-	if user == "idle" then
+
-		MODE = 2
+
 ----------- Main loop ------------
-    if user == "auto" then
+
-		MODE = 3
+
 PID:new(0.01, 0.5, 0.0001, 0)
-	if user == "ramp" then
+
-		print("Start Speed (type 'x' for current setpoint):")
+
-		c = io.read()
+
-		if c == "x" then
+
-			c = setpoint
+
-			end
+
-		print("End Speed:")
+
-		rampStart = c
+--main()
-		c = io.read()
+
-		print("Ramp Time (seconds):")
+local ta = thread.create(main)
-		rampEnd = c
+
-		c = io.read()
+
-		rampTime = c
+