spacecruft/farmbot_os
spacecruft/farmbot_os
1
0
Fork 0
Code Issues Pull requests Releases Activity

add better message for tools not in slots

Browse source
This commit is contained in:
connor rigby 2017-11-22 09:06:28 -08:00
parent 1662ad94ee
commit 7cbe0aa3c4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/farmbot/celery_script/utils.ex
View file

@ -8,11 +8,16 @@ defmodule Farmbot.CeleryScript.Utils do
def ast_to_vec3(%AST{kind: Tool} = ast) do
repo = Farmbot.Repo.current_repo()
tool_id = ast.args.tool_id
case Farmbot.Repo.current_repo().one(from p in DBPoint, where: p.tool_id == ^tool_id) do
%{x: x, y: y, z: z} ->
{:ok, new_vec3(x, y, z)}
nil -> {:error, "Could not find tool by id: #{tool_id}"}
case repo.one(from p in DBPoint, where: p.tool_id == ^tool_id) do
%{x: x, y: y, z: z} -> {:ok, new_vec3(x, y, z)}
nil ->
case repo.one(from t in Farmbot.Repo.Tool, where: t.id == ^tool_id) do
%{name: name} ->
{:error, "#{name} is not currently in a tool slot."}
nil -> {:error, "Could not find tool by id: #{tool_id}"}
end
end
end