From 7a1775948bef65b54639feaa532a64aec7aad0f7 Mon Sep 17 00:00:00 2001
From: Connor Rigby <connor@farmbot.io>
Date: Sat, 9 Dec 2017 13:52:52 -0800
Subject: [PATCH] More logging updates.

---
 lib/farmbot/celery_script/ast/node/emergency_lock.ex | 5 ++++-
 lib/farmbot/celery_script/ast/node/move_absolute.ex  | 6 +++++-
 lib/farmbot/celery_script/celery_script.ex           | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/farmbot/celery_script/ast/node/emergency_lock.ex b/lib/farmbot/celery_script/ast/node/emergency_lock.ex
index 2c801a37..5b2ed8b2 100644
--- a/lib/farmbot/celery_script/ast/node/emergency_lock.ex
+++ b/lib/farmbot/celery_script/ast/node/emergency_lock.ex
@@ -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
diff --git a/lib/farmbot/celery_script/ast/node/move_absolute.ex b/lib/farmbot/celery_script/ast/node/move_absolute.ex
index ec74009b..b0a6c50b 100644
--- a/lib/farmbot/celery_script/ast/node/move_absolute.ex
+++ b/lib/farmbot/celery_script/ast/node/move_absolute.ex
@@ -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
diff --git a/lib/farmbot/celery_script/celery_script.ex b/lib/farmbot/celery_script/celery_script.ex
index 97a8b0c1..9ab6af69 100644
--- a/lib/farmbot/celery_script/celery_script.ex
+++ b/lib/farmbot/celery_script/celery_script.ex
@@ -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}