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

v10.0.0-rc10 - Fix module / ENV errors.

qa/firmware_reset_rewrite
Rick Carlino 2020-05-04 13:26:25 -05:00
parent e023abd007
commit bc3143465d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
10.0.0-rc9
10.0.0-rc10

2
farmbot_core/config/config.exs
View File

@ -48,7 +48,7 @@ config :farmbot_core, FarmbotCore.EctoMigrator,
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
config :farmbot_firmware, FarmbotFirmware, reset: FarmbotFirmware.NullReset
config :farmbot_firmware, FarmbotFirmware, reset: FarmbotCore.FirmwareResetter
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
firmware_flash_attempt_threshold: 5

4
farmbot_core/lib/farmbot_core/firmware_resetter.ex
View File

@ -45,9 +45,9 @@ defmodule FarmbotCore.FirmwareResetter do
rescue
ex ->
message = Exception.message(ex)
msg = "Could not reset express firmware: #{message}"
msg = "Express reset failed #{message}"
FarmbotCore.Logger.error(3, msg)
:express_reset_error
{:error, msg}
end
end
end

2
farmbot_os/config/target/rpi3.exs
View File

@ -1,6 +1,6 @@
use Mix.Config
config :farmbot_firmware, FarmbotFirmware, reset: FarmbotFirmware.NullReset
config :farmbot_firmware, FarmbotFirmware, reset: FarmbotCore.FirmwareResetter
config :farmbot, FarmbotOS.Init.Supervisor,
init_children: [