From 00fe2c998996a1dd400d237d405b06eb7d2b3b90 Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Mon, 18 Sep 2017 14:46:46 -0400
Subject: [PATCH] cleanup

---
 sys/apis/turtle/pathfind.lua |  4 ++--
 sys/apis/ui.lua              |  5 +++++
 sys/etc/app.db               |  3 ---
 sys/extensions/tgps.lua      | 20 ++++++++++++++++++--
 sys/extensions/tl3.lua       |  2 +-
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/sys/apis/turtle/pathfind.lua b/sys/apis/turtle/pathfind.lua
index 93eb231..b30744c 100644
--- a/sys/apis/turtle/pathfind.lua
+++ b/sys/apis/turtle/pathfind.lua
@@ -196,8 +196,8 @@ local function pathTo(dest, options)
 
 		dest = selectDestination(dests, box, map, dim)
 		if not dest then
-			error('failed to reach destination')
---			return false, 'failed to reach destination'
+--			error('failed to reach destination')
+			return false, 'failed to reach destination'
 		end
 		if turtle.point.x == dest.x and turtle.point.z == dest.z and turtle.point.y == dest.y then
 			break
diff --git a/sys/apis/ui.lua b/sys/apis/ui.lua
index 81e117d..d8cf30b 100644
--- a/sys/apis/ui.lua
+++ b/sys/apis/ui.lua
@@ -343,6 +343,11 @@ function Manager:click(button, x, y)
 
     if button == 1 then
       local c = os.clock()
+
+      if self.doubleClickTimer then
+        debug(c - self.doubleClickTimer)
+      end
+
       if self.doubleClickTimer and (c - self.doubleClickTimer < 1.9) and
          self.doubleClickX == x and self.doubleClickY == y and
          self.doubleClickElement == clickEvent.element then
diff --git a/sys/etc/app.db b/sys/etc/app.db
index a05e97e..3d3bca7 100644
--- a/sys/etc/app.db
+++ b/sys/etc/app.db
@@ -226,20 +226,17 @@
     requires = "turtle",
   },
   [ "53a5d150062b1e03206b9e15854b81060e3c7552" ] = {
-    apptype = "url",
     title = "Minesweeper",
     category = "Games",
     run = "http://pastebin.com/raw/nsKrHTbN",
   },
   [ "8d59207c8a84153b3e9f035cc3b6ec7a23671323" ] = {
-    apptype = "url",
     title = "Micropaint",
     category = "Apps",
     run = "http://pastebin.com/raw/tMRzJXx2",
     requires = "advancedComputer",
   },
   [ "d78f28759f255a0db76604ee560b87c4715a0da5" ] = {
-    apptype = "url",
     title = "Sketch",
     category = "Apps",
     run = "http://pastebin.com/raw/Mm5hd97E",
diff --git a/sys/extensions/tgps.lua b/sys/extensions/tgps.lua
index b2767cb..923e784 100644
--- a/sys/extensions/tgps.lua
+++ b/sys/extensions/tgps.lua
@@ -34,9 +34,25 @@ function turtle.setGPSHome()
   local config = { }
   Config.load('gps', config)
 
-  if turtle.enableGPS() then
+  if turtle.point.gps then
     config.home = turtle.point
     Config.update('gps', config)
-    turtle.gotoPoint(turtle.point)
+  else
+    local pt = GPS.getPoint()
+    if pt then
+      local originalHeading = turtle.point.heading
+      local heading = GPS.getHeading()
+      if heading then
+        local turns = (turtle.point.heading - originalHeading) % 4
+        pt.heading = (heading - turns) % 4
+        config.home = pt
+        Config.update('gps', config)
+
+        pt = GPS.getPoint()
+        pt.heading = heading
+        turtle.setPoint(pt, true)
+        turtle.gotoPoint(config.home)
+      end
+    end
   end
 end
diff --git a/sys/extensions/tl3.lua b/sys/extensions/tl3.lua
index f06287e..42f89bb 100644
--- a/sys/extensions/tl3.lua
+++ b/sys/extensions/tl3.lua
@@ -222,7 +222,7 @@ function turtle.placeDown(slot) return _place(actions.down, slot)    end
 
 local function _drop(action, qtyOrName, qty)
   if not qtyOrName or type(qtyOrName) == 'number' then
-    return action.drop(qtyOrName)
+    return action.drop(qtyOrName or 64)
   end
   return inventoryAction(action.drop, qtyOrName, qty)
 end