Add logs.
parent
0948b39de6
commit
324665856b
|
@ -2,6 +2,7 @@ defmodule Farmbot.CeleryScript.AST.Node.FindHome do
|
|||
@moduledoc false
|
||||
use Farmbot.CeleryScript.AST.Node
|
||||
allow_args [:speed, :axis]
|
||||
use Farmbot.Logger
|
||||
|
||||
def execute(%{axis: :all}, _, env) do
|
||||
env = mutate_env(env)
|
||||
|
@ -33,6 +34,7 @@ defmodule Farmbot.CeleryScript.AST.Node.FindHome do
|
|||
end
|
||||
|
||||
defp do_find_home(ep, ec, axis, env) when ep == 1 or ec == 1 do
|
||||
Logger.busy 2, "Finding home on #{axis} axis."
|
||||
case Farmbot.Firmware.find_home(axis) do
|
||||
:ok -> {:ok, env}
|
||||
{:error, reason} -> {:error, reason, env}
|
||||
|
|
|
@ -2,12 +2,18 @@ defmodule Farmbot.CeleryScript.AST.Node.Home do
|
|||
@moduledoc false
|
||||
use Farmbot.CeleryScript.AST.Node
|
||||
allow_args [:speed, :axis]
|
||||
use Farmbot.Logger
|
||||
|
||||
def execute(%{axis: :all}, _, env) do
|
||||
env = mutate_env(env)
|
||||
maybe_log_busy()
|
||||
case Farmbot.Firmware.home_all() do
|
||||
:ok -> {:ok, env}
|
||||
{:error, reason} -> {:error, reason, env}
|
||||
:ok ->
|
||||
maybe_log_complete()
|
||||
{:ok, env}
|
||||
{:error, reason} ->
|
||||
maybe_log_error()
|
||||
{:error, reason, env}
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -18,4 +24,22 @@ defmodule Farmbot.CeleryScript.AST.Node.Home do
|
|||
{:error, reason} -> {:error, reason, env}
|
||||
end
|
||||
end
|
||||
|
||||
defp maybe_log_busy do
|
||||
unless Farmbot.System.ConfigStorage.get_config_value(:bool, "settings", "firmware_input_log") do
|
||||
Logger.busy 1, "Moving to (0, 0, 0)"
|
||||
end
|
||||
end
|
||||
|
||||
defp maybe_log_complete do
|
||||
unless Farmbot.System.ConfigStorage.get_config_value(:bool, "settings", "firmware_input_log") do
|
||||
Logger.success 1, "Movement to (0, 0, 0) complete."
|
||||
end
|
||||
end
|
||||
|
||||
defp maybe_log_error do
|
||||
unless Farmbot.System.ConfigStorage.get_config_value(:bool, "settings", "firmware_input_log") do
|
||||
Logger.error 1, "Movement to (0, 0, 0) failed."
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -126,8 +126,16 @@ defmodule Farmbot.Firmware.StubHandler do
|
|||
{:reply, :ok, [:done], state}
|
||||
end
|
||||
|
||||
def handle_call({:find_home, _axis}, _from, state) do
|
||||
{:reply, :ok, [:done], state}
|
||||
def handle_call({:find_home, axis}, _from, state) do
|
||||
state = %{state | pos: %{state.pos | axis => 0}}
|
||||
response = [
|
||||
:"report_axis_home_complete_#{axis}",
|
||||
{:report_current_position, state.pos.x, state.pos.y, state.pos.z},
|
||||
{:report_encoder_position_scaled, state.pos.x, state.pos.y, state.pos.z},
|
||||
{:report_encoder_position_raw, state.pos.x, state.pos.y, state.pos.z},
|
||||
:done
|
||||
]
|
||||
{:reply, :ok, response, state}
|
||||
end
|
||||
|
||||
def handle_call({:home, axis}, _from, state) do
|
||||
|
|
|
@ -17,7 +17,7 @@ defmodule Farmbot.Firmware.UartHandler do
|
|||
end
|
||||
|
||||
def calibrate(handler, axis) do
|
||||
GenStage.call(handler, {:calibrate, axis,})
|
||||
GenStage.call(handler, {:calibrate, axis})
|
||||
end
|
||||
|
||||
def find_home(handler, axis) do
|
||||
|
|
Loading…
Reference in New Issue