Merge pull request #1516 from FarmBot/staging

v15.4.9

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+# 15.4.9
+
+ * Add `tool.flow_rate_ml_per_s`.
+ * Add `get_tool` Lua helper and use it in relevant helpers.
+ * Fix `update_device({mounted_tool_id = 0})` functionality and validate values.
+ * Fix `badarg` bug for plants with `planted_at` value.
+
 # 15.4.8
 
  * Add support for using remote `plant` objects in the `water` Lua helper.

VERSION

@@ -1 +1 @@
-15.4.8
+15.4.9

lib/core/asset/tool.ex

@@ -13,20 +13,29 @@ defmodule FarmbotOS.Asset.Tool do
     )
 
     field(:name, :string)
+    field(:flow_rate_ml_per_s, :integer)
     field(:monitor, :boolean, default: true)
     timestamps()
   end
 
   view tool do
     %{
       id: tool.id,
-      name: tool.name
+      name: tool.name,
+      flow_rate_ml_per_s: tool.flow_rate_ml_per_s
     }
   end
 
   def changeset(tool, params \\ %{}) do
     tool
-    |> cast(params, [:id, :name, :monitor, :created_at, :updated_at])
+    |> cast(params, [
+      :id,
+      :name,
+      :flow_rate_ml_per_s,
+      :monitor,
+      :created_at,
+      :updated_at
+    ])
     |> validate_required([])
   end
 end

lib/os/lua.ex

@@ -138,6 +138,7 @@ defmodule FarmbotOS.Lua do
       get_position: &Firmware.get_position/2,
       get_seed_tray_cell: &DataManipulation.get_seed_tray_cell/2,
       get_xyz: &Info.get_xyz/2,
+      get_tool: &DataManipulation.get_tool/2,
       go_to_home: &Firmware.go_to_home/2,
       grid: &DataManipulation.grid/2,
       group: &DataManipulation.group/2,

lib/os/lua/data_manipulation.ex

@@ -4,7 +4,7 @@ defmodule FarmbotOS.Lua.DataManipulation do
   """
 
   alias FarmbotOS.{Asset, JSON}
-  alias FarmbotOS.Asset.{Device, FbosConfig, FirmwareConfig}
+  alias FarmbotOS.Asset.{Repo, Tool, Device, FbosConfig, FirmwareConfig}
   alias FarmbotOS.Lua.Util
   alias FarmbotOS.Lua
   alias FarmbotOS.SysCalls.ResourceUpdate
@@ -100,7 +100,28 @@ defmodule FarmbotOS.Lua.DataManipulation do
 
   def update_device([table], lua) do
     params = Map.new(table)
-    _ = ResourceUpdate.update_resource("Device", nil, params)
+
+    new_params =
+      if Map.has_key?(params, "mounted_tool_id") do
+        if params["mounted_tool_id"] == 0 do
+          Map.put(params, "mounted_tool_id", nil)
+        else
+          tool_ids = Repo.all(Tool) |> Enum.map(fn tool -> tool.id end)
+
+          if not Enum.member?(tool_ids, params["mounted_tool_id"]) do
+            FarmbotOS.Logger.error(3, "Tool ID not found.")
+
+            Enum.filter(params, fn {key, _value} -> key != "mounted_tool_id" end)
+            |> Map.new()
+          else
+            params
+          end
+        end
+      else
+        params
+      end
+
+    _ = ResourceUpdate.update_resource("Device", nil, new_params)
     {[true], lua}
   end
 
@@ -158,6 +179,43 @@ defmodule FarmbotOS.Lua.DataManipulation do
     {[Util.map_to_table(firmware_config)], lua}
   end
 
+  def get_tool([params], lua) do
+    map = Util.lua_to_elixir(params)
+
+    tool_id = Map.get(map, "id")
+    tool_name = Map.get(map, "name")
+    tool_params = %{}
+
+    tool_params =
+      if tool_id do
+        Map.put(tool_params, :id, tool_id)
+      else
+        tool_params
+      end
+
+    tool_params =
+      if tool_name do
+        Map.put(tool_params, :name, tool_name)
+      else
+        tool_params
+      end
+
+    tool = Asset.get_tool(tool_params)
+
+    tool_result =
+      if tool do
+        %{
+          id: tool.id,
+          name: tool.name,
+          flow_rate_ml_per_s: tool.flow_rate_ml_per_s
+        }
+      else
+        nil
+      end
+
+    {[tool_result], lua}
+  end
+
   def new_sensor_reading([table], lua) do
     table
     |> Enum.map(fn

lib/os/lua/result.ex

@@ -37,6 +37,11 @@ defmodule FarmbotOS.Lua.Result do
 
   def parse_error(error, _) do
     show(error)
+
+    if Mix.env() == :test do
+      IO.puts(inspect(error))
+    end
+
     {:error, "Lua failure"}
   end
 

lib/os/sys_calls/point_lookup.ex

@@ -48,10 +48,18 @@ defmodule FarmbotOS.SysCalls.PointLookup do
             )
           end
 
-        %{resource_type: type, resource_id: id}
-        |> Map.merge(s)
-        |> Map.take(@relevant_keys)
-        |> Map.put(:age, age)
+        p =
+          %{resource_type: type, resource_id: id}
+          |> Map.merge(s)
+          |> Map.take(@relevant_keys)
+          |> Map.put(:age, age)
+
+        if p.planted_at do
+          p
+          |> Map.put(:planted_at, DateTime.to_iso8601(s.planted_at))
+        else
+          p
+        end
 
       other ->
         Logger.debug("Point error: Please notify support #{inspect(other)}")

priv/lua/dismount_tool.lua

@@ -3,6 +3,10 @@ return function()
     local start_time = os.time() * 1000
 
     -- Checks
+    if not tool_id then
+        toast("No tool is mounted to the UTM", "error")
+        return
+    end
     if not verify_tool() then
         return
     end
@@ -25,15 +29,11 @@ return function()
     end
 
     -- Get tool name
-    local tool = api({ url = "/api/tools/" .. tool_id })
-    if not tool then
-        toast("API error", "error")
-        return
-    end
+    local tool_name = get_tool{id = tool_id}.name
 
     -- Checks
     if not slot then
-        toast("No slot found for the currently mounted tool (" .. tool.name .. ") - check the Tools panel", "error")
+        toast("No slot found for the currently mounted tool (" .. tool_name .. ") - check the Tools panel", "error")
         return
     elseif slot_dir == 0 then
         toast("Tool slot must have a direction", "error")
@@ -46,7 +46,7 @@ return function()
     -- Job progress tracking
     function job(percent, status)
         set_job_progress(
-            "Dismounting " .. tool.name,
+            "Dismounting " .. tool_name,
             { percent = percent, status = status, time = start_time }
         )
     end
@@ -85,6 +85,6 @@ return function()
     else
         job(100, "Complete")
         update_device({mounted_tool_id = 0})
-        toast(tool.name .. " dismounted", "success")
+        toast(tool_name .. " dismounted", "success")
     end
 end

priv/lua/dispense.lua

@@ -3,21 +3,13 @@ return function(ml, params)
     local tool_name = params.tool_name or "Watering Nozzle"
     local pin_number = params.pin or 8
 
-    -- Get all tools
-    local tools = api({ url = "/api/tools/" })
-    if not tools then
-        toast("API error", "error")
+    -- Get flow_rate
+    local tool = get_tool{name = tool_name}
+    if not tool then
+        toast('Tool "' .. tool_name .. '" not found', 'error')
         return
     end
-
-    -- Pluck the nozzle
-    local nozzle, flow_rate
-    for key, tool in pairs(tools) do
-        if tool.name == tool_name then
-            nozzle = tool
-            flow_rate = nozzle.flow_rate_ml_per_s
-        end
-    end
+    local flow_rate = tool.flow_rate_ml_per_s
 
     -- Checks
     if not flow_rate then

priv/lua/mount_tool.lua

@@ -3,16 +3,7 @@ return function(input)
     if type(input) == "string" then
       local prelim_tool
       local tool_name = input
-      local tools = api({ url = "/api/tools/" })
-      if not tools then
-          toast("API error", "error")
-          return
-      end
-      for key, tool in pairs(tools) do
-        if tool.name == tool_name then
-          prelim_tool = tool
-        end
-      end
+      prelim_tool = get_tool{name = tool_name}
       if not prelim_tool then
           toast("'" .. tool_name .. "' tool not found", "error")
           return
@@ -58,13 +49,9 @@ return function(input)
         return
     end
 
-    -- Get tool name
-    local tool = api({
-        url = "/api/tools/" .. slot.tool_id
-    })
-
+    local tool = get_tool{id = slot.tool_id}
     if not tool then
-        toast("API error", "error")
+        toast("Tool slot must have a tool", "error")
         return
     end