diff --git a/CHANGELOG.md b/CHANGELOG.md index c9240168..0db9b867 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Deprecate `resource_update` RPC * Introduce `update_resource` RPC, which allows users to modify variables from the sequence editor. - * Allow Express users to upgrade from RPi0 => RPi3 (require ribbon cable and USB adapter). + * Allow Express users to upgrade from RPi0 => RPi3 (requires 40 pin ribbon cable and USB adapter). * Genesis v1.5 and Express v1.0 firmware updates. # 9.2.2 diff --git a/VERSION b/VERSION index 85e917b6..6e1abfd8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.0-rc2 +10.0.0-rc3 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 00772ffe..e9605fb7 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex @@ -72,7 +72,7 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do FarmbotCore.Logger.debug(2, "AVR flash returned #{inspect(result)}") end - defp find_tty() do + def find_tty() do case FirmwareTTYDetector.tty() do nil -> {:error, @@ -85,12 +85,12 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do end end - defp find_reset_fun("express_k10") do + def find_reset_fun("express_k10") do FarmbotCore.Logger.debug(3, "Using special express reset function") {:ok, fn -> express_reset_fun() end} end - defp find_reset_fun(_) do + def find_reset_fun(_) do FarmbotCore.Logger.debug(3, "Using default reset function") {:ok, &FarmbotFirmware.NullReset.reset/0} end