From 88da7a298cf698881778617a652cac32c1188e25 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Sun, 12 Apr 2020 17:39:34 -0500 Subject: [PATCH] Formatting updates. --- .../lib/farmbot_core/firmware_open_task.ex | 6 +++--- farmbot_firmware/lib/farmbot_firmware.ex | 5 +---- farmbot_os/lib/avrdude.ex | 4 ++-- .../lib/farmbot_os/sys_calls/flash_firmware.ex | 13 ++++--------- .../test/farmbot_os/avrdude/avrdude_test.exs | 18 ++---------------- 5 files changed, 12 insertions(+), 34 deletions(-) diff --git a/farmbot_core/lib/farmbot_core/firmware_open_task.ex b/farmbot_core/lib/farmbot_core/firmware_open_task.ex index 844c8c2a..2e326216 100644 --- a/farmbot_core/lib/farmbot_core/firmware_open_task.ex +++ b/farmbot_core/lib/farmbot_core/firmware_open_task.ex @@ -77,21 +77,21 @@ defmodule FarmbotCore.FirmwareOpenTask do {:noreply, increment_attempts(%{state | timer: timer})} firmware_hardware == "none" && needs_open? -> - FarmbotCore.Logger.debug 3, "Firmware needs to be closed" + FarmbotCore.Logger.debug 3, "Closing firmware..." unswap_transport() Config.update_config_value(:bool, "settings", "firmware_needs_open", false) timer = Process.send_after(self(), :open, 5000) {:noreply, %{state | timer: timer, attempts: 0}} needs_open? -> - FarmbotCore.Logger.debug 3, "Firmware needs to be opened" + FarmbotCore.Logger.debug 3, "Opening firmware..." case swap_transport(firmware_path) do :ok -> Config.update_config_value(:bool, "settings", "firmware_needs_open", false) timer = Process.send_after(self(), :open, 5000) {:noreply, %{state | timer: timer, attempts: 0}} other -> - FarmbotCore.Logger.debug 3, "Firmware failed to open: #{inspect(other)}" + FarmbotCore.Logger.debug 3, "Not ready to open yet, will retry in 5s (#{inspect(other)})" timer = Process.send_after(self(), :open, 5000) {:noreply, %{state | timer: timer, attempts: 0}} end diff --git a/farmbot_firmware/lib/farmbot_firmware.ex b/farmbot_firmware/lib/farmbot_firmware.ex index 3c0ed544..9f1bb2da 100644 --- a/farmbot_firmware/lib/farmbot_firmware.ex +++ b/farmbot_firmware/lib/farmbot_firmware.ex @@ -530,10 +530,7 @@ defmodule FarmbotFirmware do handle_report({:report_no_config, []}, state) end - def handle_report( - {:report_idle, []}, - %{status: :boot} = state - ) do + def handle_report({:report_idle, []}, %{status: :boot} = state) do Logger.info("ARDUINO STARTUP COMPLETE (idle) transport=#{state.transport}") handle_report({:report_no_config, []}, state) end diff --git a/farmbot_os/lib/avrdude.ex b/farmbot_os/lib/avrdude.ex index 10393c98..c8254c52 100644 --- a/farmbot_os/lib/avrdude.ex +++ b/farmbot_os/lib/avrdude.ex @@ -44,14 +44,14 @@ defmodule Avrdude do result = MuonTrap.cmd("avrdude", args, stderr_to_stdout: true) + call_reset_fun(reset_fun) + if is_tuple(result) do {a, exit_code} = result FarmbotCore.Logger.info(3, inspect(a)) FarmbotCore.Logger.info(3, "Exit code #{exit_code}") end - call_reset_fun(reset_fun) - result 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 0229078c..dcdfb380 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex @@ -66,7 +66,7 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do end def finish_flashing(result) do - FarmbotCore.Logger.debug(2, "AVR Unexpected return code #{inspect(result)}") + FarmbotCore.Logger.debug(2, "AVR flash returned #{inspect(result)}") end defp find_tty() do @@ -94,17 +94,12 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do defp express_reset_fun() do try do - FarmbotCore.Logger.debug(3, "Reseting MCU (1/4)") + FarmbotCore.Logger.debug(3, "Resetting MCU") {:ok, gpio} = @gpio.open(19, :output) - - FarmbotCore.Logger.debug(3, "Reseting MCU (2/4)") :ok = @gpio.write(gpio, 1) - Process.sleep(250) - FarmbotCore.Logger.debug(3, "Reseting MCU (3/4)") :ok = @gpio.write(gpio, 0) - Process.sleep(250) - - FarmbotCore.Logger.debug(3, "Reseting MCU (4/4)") + FarmbotCore.Logger.debug(3, "MCU Reset done") + :ok rescue ex -> message = Exception.message(ex) diff --git a/farmbot_os/test/farmbot_os/avrdude/avrdude_test.exs b/farmbot_os/test/farmbot_os/avrdude/avrdude_test.exs index ec795a63..c6366113 100644 --- a/farmbot_os/test/farmbot_os/avrdude/avrdude_test.exs +++ b/farmbot_os/test/farmbot_os/avrdude/avrdude_test.exs @@ -35,14 +35,7 @@ defmodule FarmbotOs.AvrdudeTest do "-Uflash:w:/tmp/wow:i" ] - assert opts == [ - # into: %IO.Stream{ - # device: :standard_io, - # line_or_bytes: :line, - # raw: false - # }, - stderr_to_stdout: true - ] + assert opts == [ stderr_to_stdout: true ] end) Avrdude.flash("/tmp/wow", "null", fn -> @@ -67,14 +60,7 @@ defmodule FarmbotOs.AvrdudeTest do "-Uflash:w:/tmp/wow:i" ] - assert opts == [ - # into: %IO.Stream{ - # device: :standard_io, - # line_or_bytes: :line, - # raw: false - # }, - stderr_to_stdout: true - ] + assert opts == [ stderr_to_stdout: true ] end) Avrdude.flash("/tmp/wow", "/dev/null", fn ->