spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

=== qa/v10.0.0-rc2

qa/firmware_experiments
Rick Carlino 2020-05-01 14:53:57 -05:00
parent 13279262af
commit 92dea8b0a1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

2
VERSION
View File

@ -1 +1 @@
10.0.0-rc2
10.0.0-rc3

6
farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex
View File

@ -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