Merge branch 'recovery_release' of github.com:FarmBot/farmbot_os into recovery_release
commit
dd3b5f2d40
|
@ -184,6 +184,7 @@ defmodule FarmbotOS.SysCalls do
|
|||
|
||||
@impl true
|
||||
def firmware_reboot do
|
||||
FarmbotCore.Logger.info(1, "Restarting firmware...")
|
||||
GenServer.stop(FarmbotFirmware, :reboot)
|
||||
end
|
||||
|
||||
|
@ -204,12 +205,14 @@ defmodule FarmbotOS.SysCalls do
|
|||
@impl true
|
||||
def emergency_lock do
|
||||
_ = FarmbotFirmware.command({:command_emergency_lock, []})
|
||||
FarmbotCore.Logger.error(1, "E-stopped")
|
||||
:ok
|
||||
end
|
||||
|
||||
@impl true
|
||||
def emergency_unlock do
|
||||
_ = FarmbotFirmware.command({:command_emergency_unlock, []})
|
||||
FarmbotCore.Logger.busy(1, "Unlocked.")
|
||||
:ok
|
||||
end
|
||||
|
||||
|
|
|
@ -64,7 +64,10 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do
|
|||
end
|
||||
|
||||
def finish_flashing({_result, 0}) do
|
||||
FarmbotCore.Logger.success(2, "Firmware flashed successfully!")
|
||||
FarmbotCore.Logger.success(
|
||||
1,
|
||||
"Firmware flashed successfully. Unlock FarmBot to finish initialization."
|
||||
)
|
||||
end
|
||||
|
||||
def finish_flashing(result) do
|
||||
|
|
|
@ -98,6 +98,12 @@ defmodule FarmbotOS.SysCalls.Movement do
|
|||
# TODO(Rick): Figure out source of Error: {:ok, "ok"} logs.
|
||||
def handle_movement_error({:ok, _}), do: :ok
|
||||
|
||||
def handle_movement_error(:emergency_lock) do
|
||||
msg = "Cannot execute commands while E-stopped"
|
||||
FarmbotCore.Logger.busy(1, msg)
|
||||
{:error, msg}
|
||||
end
|
||||
|
||||
def handle_movement_error(reason) do
|
||||
msg = "Movement failed. #{inspect(reason)}"
|
||||
FarmbotCore.Logger.error(1, msg)
|
||||
|
|
Loading…
Reference in New Issue