Merge in 6.2.1

pull/458/head
connor rigby 2018-03-05 07:45:37 -08:00
commit a267f8dd89
3 changed files with 12 additions and 2 deletions

View File

@ -7,6 +7,9 @@
* Add third Firmware board.
* Fix bug causing false positives on sync failure.
# 6.2.1
* Fix Bug breaking diy builders with Arduinos showing up other than `/dev/ttyACM0`.
# 6.2.0
* Farmbot Settings are now synced with Farmbot API.
* Refactor Syncing to not make unnecessary HTTP requests.

View File

@ -29,16 +29,23 @@ defmodule Farmbot.Firmware.UartHandler.AutoDetector do
end
def init([]) do
update_env()
:ignore
end
def update_env do
case auto_detect() do
[dev] ->
dev = "/dev/#{dev}"
Logger.success 3, "detected target UART: #{dev}"
update_fw_handler UartHandler
Application.put_env(:farmbot, :uart_handler, tty: dev)
dev
_ ->
Logger.error 1, "Could not detect a UART device."
update_fw_handler StubHandler
:error
end
:ignore
end
def update_fw_handler(fw_handler) do

View File

@ -26,7 +26,7 @@ defmodule Farmbot.Mixfile do
target: @target,
commit: commit(),
arduino_commit: arduino_commit(),
archives: [nerves_bootstrap: "~> 0.8.1"],
archives: [nerves_bootstrap: "~> 0.8.2"],
build_embedded: Mix.env() == :prod,
start_permanent: Mix.env() == :prod,
deps_path: "deps/#{@target}",