Update drone.lua

drone.lua

@@ -1,8 +1,4 @@
--- Based off https://oc.cil.li/topic/1570-drone-controll-bios/
+local fwv = "0.02"
--- Modified by enthusiasticGeek to give the drone inventory capabilities, as well as the ability to update itself without disassembly.
--- Version 0.01
-
-local fwv = "0.01"
 local d = component.proxy(component.list("drone")())
 local t = component.proxy(component.list("modem")())
 local eeprom = component.proxy(component.list("eeprom")())
@@ -10,25 +6,32 @@ local interweb = component.proxy(component.list("internet")())
 local str = string
 local fwaddress = "https://raw.githubusercontent.com/DremOSDeveloperTeam/opencomputers-drone/master/drone.lua"
 local commport = 6500
+local idle_color = 0xFF00FF
+local cmdrec_color = 0xFF00FF
+local cmdacc_color = 0xFFFFFF
 
 t.open(6500)
 
+function sendMsg(msg)
+  t.broadcast(commport,d.name(),"up",msg)
+end
+
 while true do
-  d.setLightColor(0x0000FF)
+  d.setLightColor(idle_color)
   local evt,_,sender,port,_,name,cmd,a,b,c = computer.pullSignal()
-  d.setLightColor(0xFFFFFF)
+  d.setLightColor(cmdrec_color)
   if evt == "modem_message" and name == d.name() then
-    d.setLightColor(0xFF00FF)
+    d.setLightColor(cmdacc_color)
     if cmd == "gfw" then -- Get Firmware Version
-      t.broadcast(commport, fwv)
+      sendMsg(fwv)
     end
-    if cmd == "ufw" then -- Update Firmware. Essentially stolen from https://github.com/osmarks/oc-drone/
+    if cmd == "ufw" then -- Update Firmware.
       local web_request = interweb.request(fwaddress)
-      t.broadcast(commport, "Updating firmware...")
+      sendMsg("Updating firmware...")
-      t.broadcast(commport, "  Connecting...")
+      sendMsg("  Connecting...")
       web_request.finishConnect()
-      t.broadcast(commport, "  Connected!")
+      sendMsg("  Connected!")
-      t.broadcast(commport, "  Downloading new firmware...")
+      sendMsg("  Downloading new firmware...")
       local full_response = ""
       while true do
         local chunk = web_request.read()
@@ -39,69 +42,88 @@ while true do
           break
         end
       end
-      t.broadcast(commport, "  Firmware file downloaded!")
+      sendMsg("  Firmware file downloaded!")
-      t.broadcast(commport, "  Flashing new firmware...")
+      sendMsg("  Flashing new firmware...")
       eeprom.set(full_response)
-      t.broadcast(commport, "  Done flashing firmware!")
+      sendMsg("  Done flashing firmware!")
-      t.broadcast(commport, "Update process done! Please reboot the drone for changes to take effect.")
+      sendMsg("Update process done!")
     end
     if cmd == "gst" then -- Get Status Text
-      t.broadcast(commport, d.name(),"gst",d.getStatusText())
+      sendMsg(d.getStatusText())
     end
     if cmd == "sst" then -- Set Status Text
-      t.broadcast(commport, d.name(),"sst",d.setStatusText(a))
+      sendMsg(d.setStatusText(a))
+    end
+    if cmd == "gpn" then -- Get Port Number
+      sendMsg(commport)
+    end
+    if cmd == "spn" then -- Set Port Number
+      if a ~= nil and a ~= '' then
+        commport = a
+      end
     end
     if cmd == "mov" then -- MOVe
       d.move(a,b,c)
     end
     if cmd == "gos" then -- Get OffSet
-      t.broadcast(commport, d.name(),"gos",d.getOffset())
+      sendMsg(d.getOffset())
     end
     if cmd == "gve" then -- Get VElocity
-      t.broadcast(commport, d.name(),"gv",d.getVelocity())
+      sendMsg(d.getVelocity())
     end
     if cmd == "gmv" then -- Get Max Velocity
-      t.send(commport, d.name(),"gmv",d.getMaxVelocity())
+      sendMsg(d.getMaxVelocity())
     end
     if cmd == "gac" then -- Get ACceleration
-      t.broadcast(commport, d.name(),"ga",d.getAcceleration())
+      sendMsg(d.getAcceleration())
     end
     if cmd == "sac" then -- Set ACceleration
       d.setAcceleration(a)
     end
     if cmd == "glc" then -- Get Light Color
-      t.broadcast(commport, d.name(),"glc",d.getLightColor())
+      sendMsg(d.getLightColor())
     end
     if cmd == "slc" then -- Set Light Color (RGB is important!)
-      d.setLightColor(a)
+      if b ~= nil and b ~= '' then
+        if b == "0" then
+          idle_color = a
+        end
+        if b == "1" then
+          cmdrec_color = a
+        end
+        if b == "2" then
+          cmdacc_color = a
+        end
+      end
     end
-    if cmd == "eif" then -- External Inventory Find (Instead of detect)
+    if cmd == "eif" then -- External Inventory Find
       local b, s = d.detect(a)
-      t.broadcast(commport, d.name(),"dct",b,s)
+      sendMsg(b)
+      sendMsg(s)
     end
     if cmd == "eco" then -- External inventory COmpare
-      t.broadcast(commport, d.name(),"c",d.compare(a))
+      sendMsg(d.compare(a))
     end
     if cmd == "esu" then -- External inventory SUck
       o = d.suck(a, b)
-      t.broadcast(commport, o)
+      sendMsg(o)
     end
     if cmd == "edr" then -- External inventory DRop
       o = d.drop(a, b)
-      t.broadcast(commport, o)
+      sendMsg(o)
     end
     if cmd == "igs" then -- Internal inventory Get Slot
-        t.broadcast(commport, d.select())
+      sendMsg(d.select())
     end
     if cmd == "iss" then -- Internal inventory Set Slot
-        o = d.select(a)
+      o = d.select(a)
-        t.broadcast(commport, o)
+      sendMsg(o)
     end
     if cmd == "gis" then -- Get Inventory Size
-      t.broadcast(commport, d.inventorySize())
+      sendMsg(d.inventorySize())
     end
     if cmd == "gsr" then -- Get Slot space Remaining
-        t.broadcast(commport, d.space(a))
+      sendMsg(d.space(a))
     end
   end
 end