More logging updates.

This commit is contained in:
Connor Rigby 2017-12-09 13:52:52 -08:00
parent d16ca2e5ae
commit 7a1775948b
3 changed files with 10 additions and 3 deletions

View file

@ -2,11 +2,14 @@ defmodule Farmbot.CeleryScript.AST.Node.EmergencyLock do
@moduledoc false
use Farmbot.CeleryScript.AST.Node
allow_args []
use Farmbot.Logger
def execute(_, _, env) do
env = mutate_env(env)
case Farmbot.Firmware.emergency_lock do
:ok -> {:ok, env}
{:error, :emergency_lock} ->
Logger.error 1, "Farmbot is E Stopped!"
{:ok, env}
{:error, reason} -> {:error, reason, env}
end
end

View file

@ -2,6 +2,7 @@ defmodule Farmbot.CeleryScript.AST.Node.MoveAbsolute do
@moduledoc false
use Farmbot.CeleryScript.AST.Node
import Farmbot.CeleryScript.Utils
use Farmbot.Logger
allow_args [:location, :speed, :offset]
@ -11,11 +12,14 @@ defmodule Farmbot.CeleryScript.AST.Node.MoveAbsolute do
{:ok, pos_b} <- ast_to_vec3(offset)
do
pos = vec3_math(pos_a, :+, pos_b)
Logger.busy 2, "Moving to (#{pos.x}, #{pos.y}, #{pos.z})"
speed_x = (speed / 100) * (Farmbot.BotState.get_param(:movement_max_spd_x) || 1)
speed_y = (speed / 100) * (Farmbot.BotState.get_param(:movement_max_spd_y) || 1)
speed_z = (speed / 100) * (Farmbot.BotState.get_param(:movement_max_spd_z) || 1)
case Farmbot.Firmware.move_absolute(pos, speed_x |> round(), speed_y |> round(), speed_z |> round()) do
:ok -> {:ok, env}
:ok ->
Logger.success 2, "Movement to (#{pos.x}, #{pos.y}, #{pos.z}) complete."
{:ok, env}
{:error, reason} -> {:error, reason, env}
end
else

View file

@ -20,7 +20,7 @@ defmodule Farmbot.CeleryScript do
# this stops messages from logging more than once in
# sequences, rpc_request, etc.
unless env.vars[:__errors__][env.module] do
Logger.error 2, "CS Failed: [#{fe_kind(env.module)}] - #{inspect reason}"
Logger.error 1, "CS Failed: [#{fe_kind(env.module)}] - #{inspect reason}"
end
new_env = %{env | vars: [{:__errors__, [{env.module, reason}| env.vars[:__errors__] || []]} | env.vars]}
{:error, reason, new_env}