From bc3143465dd4b5a7145476cb96d59a0c0ae09f8e Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 4 May 2020 13:26:25 -0500 Subject: [PATCH] v10.0.0-rc10 - Fix module / ENV errors. --- VERSION | 2 +- farmbot_core/config/config.exs | 2 +- farmbot_core/lib/farmbot_core/firmware_resetter.ex | 4 ++-- farmbot_os/config/target/rpi3.exs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index db3ae205..be6ea5d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.0-rc9 +10.0.0-rc10 diff --git a/farmbot_core/config/config.exs b/farmbot_core/config/config.exs index 1aec31fd..25510e7a 100644 --- a/farmbot_core/config/config.exs +++ b/farmbot_core/config/config.exs @@ -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 diff --git a/farmbot_core/lib/farmbot_core/firmware_resetter.ex b/farmbot_core/lib/farmbot_core/firmware_resetter.ex index e45a5d76..4a45146c 100644 --- a/farmbot_core/lib/farmbot_core/firmware_resetter.ex +++ b/farmbot_core/lib/farmbot_core/firmware_resetter.ex @@ -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 \ No newline at end of file diff --git a/farmbot_os/config/target/rpi3.exs b/farmbot_os/config/target/rpi3.exs index 826e9a01..afc3fab0 100644 --- a/farmbot_os/config/target/rpi3.exs +++ b/farmbot_os/config/target/rpi3.exs @@ -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: [