From ccd34f9943ec67754350b40f4554d009adeff5a6 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 13 Apr 2020 15:02:23 -0500 Subject: [PATCH 1/5] Improve flash success message --- farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex b/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex index f1874783..b5697ec3 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex @@ -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( + 2, + "Firmware flashed successfully. Unlock FarmBot to finish initialization." + ) end def finish_flashing(result) do From dac8fc724033c6d7c5a04ad4d59f2c098064f504 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 13 Apr 2020 15:44:08 -0500 Subject: [PATCH 2/5] Friendlier movement errors during e-stop. --- farmbot_os/lib/farmbot_os/sys_calls/movement.ex | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/farmbot_os/lib/farmbot_os/sys_calls/movement.ex b/farmbot_os/lib/farmbot_os/sys_calls/movement.ex index 24c4a0c0..7ed7e608 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls/movement.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls/movement.ex @@ -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) From 643bbe8475d8553f26ce1facba1c7eadc319c574 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 13 Apr 2020 15:46:30 -0500 Subject: [PATCH 3/5] Yellow log when rebooting firmware. --- farmbot_os/lib/farmbot_os/sys_calls.ex | 1 + 1 file changed, 1 insertion(+) diff --git a/farmbot_os/lib/farmbot_os/sys_calls.ex b/farmbot_os/lib/farmbot_os/sys_calls.ex index e814258c..15165121 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls.ex @@ -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 From 8d70e8c4547869d73da91639f5df917aebfe7eb2 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 13 Apr 2020 15:49:53 -0500 Subject: [PATCH 4/5] Elock / unlock verbiage --- farmbot_os/lib/farmbot_os/sys_calls.ex | 2 ++ 1 file changed, 2 insertions(+) diff --git a/farmbot_os/lib/farmbot_os/sys_calls.ex b/farmbot_os/lib/farmbot_os/sys_calls.ex index 15165121..6c95dfdf 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls.ex @@ -205,12 +205,14 @@ defmodule FarmbotOS.SysCalls do @impl true def emergency_lock do _ = FarmbotFirmware.command({:command_emergency_lock, []}) + FarmbotCore.Logger.busy(1, "E-stopped") :ok end @impl true def emergency_unlock do _ = FarmbotFirmware.command({:command_emergency_unlock, []}) + FarmbotCore.Logger.busy(1, "Unlocked.") :ok end From fefd444aa0b9ad3d6c9fe4031ec39a232238db33 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 13 Apr 2020 16:04:48 -0500 Subject: [PATCH 5/5] Elock / unlock verbiage --- farmbot_os/lib/farmbot_os/sys_calls.ex | 2 +- farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/farmbot_os/lib/farmbot_os/sys_calls.ex b/farmbot_os/lib/farmbot_os/sys_calls.ex index 6c95dfdf..3a6fcd75 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls.ex @@ -205,7 +205,7 @@ defmodule FarmbotOS.SysCalls do @impl true def emergency_lock do _ = FarmbotFirmware.command({:command_emergency_lock, []}) - FarmbotCore.Logger.busy(1, "E-stopped") + FarmbotCore.Logger.error(1, "E-stopped") :ok end diff --git a/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex b/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex index b5697ec3..e7a3d153 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex @@ -65,7 +65,7 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do def finish_flashing({_result, 0}) do FarmbotCore.Logger.success( - 2, + 1, "Firmware flashed successfully. Unlock FarmBot to finish initialization." ) end