Fix rpi3 build again.

pull/375/head
Connor Rigby 2017-12-06 13:23:27 -08:00
parent e1b9440728
commit 9712179025
4 changed files with 29 additions and 2 deletions

View File

@ -3,3 +3,7 @@ use Mix.Config
# We need a special fwup conf for the initial v6 release.
# TODO Remove this some day.
config :nerves, :firmware, fwup_conf: "fwup_interim.conf"
config :bootloader,
init: [:nerves_runtime, :nerves_firmware_ssh],
app: :farmbot

View File

@ -21,7 +21,11 @@ defmodule Farmbot.Logger.Console do
@doc false
def start_link do
GenStage.start_link(__MODULE__, [], [name: __MODULE__])
if Process.whereis(__MODULE__) do
GenStage.start_link(__MODULE__, [])
else
GenStage.start_link(__MODULE__, [], [name: __MODULE__])
end
end
def init([]) do

13
mix.exs
View File

@ -117,6 +117,19 @@ defmodule Farmbot.Mixfile do
]
end
defp deps("rpi3") do
system("rpi3") ++
[
{:bootloader, "~> 0.1.3", except: :test},
{:nerves_runtime, "~> 0.4"},
{:nerves_firmware, "~> 0.4.0"},
{:nerves_firmware_ssh, "~> 0.2", only: :dev},
{:nerves_network, "~> 0.3", github: "nerves-project/nerves_network", override: true},
{:dhcp_server, github: "nerves-project/dhcp_server", branch: "elixirize-go!", override: true},
{:elixir_ale, "~> 1.0"}
]
end
defp deps(target) do
system(target) ++
[

View File

@ -123,7 +123,13 @@ defmodule Farmbot.Target.Network.Manager do
# If we Successfully set time, sync again in around 1024 seconds
:ok -> Process.send_after(self(), :ntp_timer, 1024000 + rand)
# If time failed, try again in about 5 minutes.
_ -> Process.send_after(self(), :ntp_timer, 300000 + rand)
_ ->
if Farmbot.System.ConfigStorage.get_config_value(:bool, "settings", "first_boot") do
Process.send_after(self(), :ntp_timer, 10_000 + rand)
else
Process.send_after(self(), :ntp_timer, 300000 + rand)
end
end
end
end