v10.0.0-rc9

qa/firmware_reset_rewrite
Rick Carlino 2020-05-03 14:20:31 -05:00
parent 0dd25156c7
commit e023abd007
6 changed files with 6 additions and 15 deletions

View File

@ -1 +1 @@
10.0.0-rc8
10.0.0-rc9

View File

@ -56,7 +56,3 @@ config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
import_config "ecto.exs"
import_config "logger.exs"
import_config "#{Mix.env()}.exs"
unless Mix.target() == :host do
config :farmbot_core, FarmbotCore.FirmwareResetter, gpio: Circuits.GPIO
end

View File

@ -1,5 +1,9 @@
defmodule FarmbotCore.FirmwareResetter do
@gpio Application.get_env(:farmbot_core, __MODULE__, [])[:gpio]
if Code.ensure_compiled?(Circuits.GPIO) do
@gpio Circuits.GPIO
else
@gpio nil
end
alias FarmbotCore.Asset
require FarmbotCore.Logger

View File

@ -4,7 +4,3 @@ config :farmbot, FarmbotOS.Init.Supervisor,
init_children: [
FarmbotOS.Platform.Target.RTCWorker
]
# :farmbot_firmware, FarmbotFirmware changes too much.
# Needed one that would stay stable, so I duplicated it here:
config :farmbot, FarmbotOS.SysCalls.FlashFirmware, gpio: Circuits.GPIO

View File

@ -2,10 +2,6 @@ use Mix.Config
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 50
# :farmbot_firmware, FarmbotFirmware changes too much.
# Needed one that would stay stable, so I duplicated it here:
config :farmbot, FarmbotOS.SysCalls.FlashFirmware, gpio: Circuits.GPIO
config :farmbot, FarmbotOS.Init.Supervisor,
init_children: [
FarmbotOS.Platform.Target.RTCWorker

View File

@ -1,7 +1,6 @@
use Mix.Config
config :farmbot_firmware, FarmbotFirmware, reset: FarmbotFirmware.NullReset
config :farmbot, FarmbotOS.SysCalls.FlashFirmware, gpio: Circuits.GPIO
config :farmbot, FarmbotOS.Init.Supervisor,
init_children: [