v9.3.0-rc0 (debugging possible OTA system bug)
parent
b1c77657cd
commit
8d7fb9a010
|
@ -46,13 +46,8 @@ config :farmbot_core, FarmbotCore.EctoMigrator,
|
||||||
"beta"
|
"beta"
|
||||||
)
|
)
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
|
|
||||||
|
|
||||||
config :farmbot_firmware, FarmbotFirmware, reset: FarmbotCore.FirmwareResetter
|
config :farmbot_firmware, FarmbotFirmware, reset: FarmbotCore.FirmwareResetter
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
|
|
||||||
firmware_flash_attempt_threshold: 5
|
|
||||||
|
|
||||||
import_config "ecto.exs"
|
import_config "ecto.exs"
|
||||||
import_config "logger.exs"
|
import_config "logger.exs"
|
||||||
import_config "#{Mix.env()}.exs"
|
import_config "#{Mix.env()}.exs"
|
||||||
|
|
|
@ -2,8 +2,3 @@ use Mix.Config
|
||||||
|
|
||||||
config :farmbot_celery_script, FarmbotCeleryScript.SysCalls,
|
config :farmbot_celery_script, FarmbotCeleryScript.SysCalls,
|
||||||
sys_calls: FarmbotCeleryScript.SysCalls.Stubs
|
sys_calls: FarmbotCeleryScript.SysCalls.Stubs
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
|
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
|
|
||||||
firmware_flash_attempt_threshold: 5
|
|
||||||
|
|
|
@ -11,16 +11,9 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.FbosConfig do
|
||||||
alias FarmbotCore.{Asset.FbosConfig, BotState, Config}
|
alias FarmbotCore.{Asset.FbosConfig, BotState, Config}
|
||||||
import FarmbotFirmware.PackageUtils, only: [package_to_string: 1]
|
import FarmbotFirmware.PackageUtils, only: [package_to_string: 1]
|
||||||
|
|
||||||
@firmware_flash_attempt_threshold Application.get_env(:farmbot_core, __MODULE__)[:firmware_flash_attempt_threshold]
|
@firmware_flash_attempt_threshold Application.get_env(:farmbot_core, __MODULE__)[:firmware_flash_attempt_threshold] || 5
|
||||||
@firmware_flash_timeout Application.get_env(:farmbot_core, __MODULE__)[:firmware_flash_timeout] || 5000
|
@firmware_flash_timeout Application.get_env(:farmbot_core, __MODULE__)[:firmware_flash_timeout] || 5000
|
||||||
@disable_firmware_io_logs_timeout Application.get_env(:farmbot_core, __MODULE__)[:disable_firmware_io_logs_timeout] || 300000
|
@disable_firmware_io_logs_timeout Application.get_env(:farmbot_core, __MODULE__)[:disable_firmware_io_logs_timeout] || 300000
|
||||||
@firmware_flash_attempt_threshold || Mix.raise """
|
|
||||||
Firmware open attempt threshold not configured:
|
|
||||||
|
|
||||||
config :farmbot_core, #{__MODULE__}, [
|
|
||||||
firmware_flash_attempt_threshold: :infinity
|
|
||||||
]
|
|
||||||
"""
|
|
||||||
|
|
||||||
@impl FarmbotCore.AssetWorker
|
@impl FarmbotCore.AssetWorker
|
||||||
def preload(%FbosConfig{}), do: []
|
def preload(%FbosConfig{}), do: []
|
||||||
|
|
|
@ -9,14 +9,7 @@ defmodule FarmbotCore.FirmwareOpenTask do
|
||||||
require FarmbotCore.Logger
|
require FarmbotCore.Logger
|
||||||
alias FarmbotFirmware.{UARTTransport, StubTransport}
|
alias FarmbotFirmware.{UARTTransport, StubTransport}
|
||||||
alias FarmbotCore.{Asset, Config}
|
alias FarmbotCore.{Asset, Config}
|
||||||
@attempt_threshold Application.get_env(:farmbot_core, __MODULE__)[:attempt_threshold]
|
@attempt_threshold Application.get_env(:farmbot_core, __MODULE__)[:attempt_threshold] || 5
|
||||||
@attempt_threshold || Mix.raise """
|
|
||||||
Firmware open attempt threshold not configured:
|
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareOpenTask, [
|
|
||||||
attempt_threshold: 10
|
|
||||||
]
|
|
||||||
"""
|
|
||||||
|
|
||||||
@doc false
|
@doc false
|
||||||
def start_link(args, opts \\ [name: __MODULE__]) do
|
def start_link(args, opts \\ [name: __MODULE__]) do
|
||||||
|
|
|
@ -6,7 +6,7 @@ defmodule FarmbotCore.FirmwareTTYDetector do
|
||||||
@error_retry_ms 5_000
|
@error_retry_ms 5_000
|
||||||
|
|
||||||
if System.get_env("FARMBOT_TTY") do
|
if System.get_env("FARMBOT_TTY") do
|
||||||
@expected_names [System.get_env("FARMBOT_TTY")]
|
@expected_names ["ttyUSB0", "ttyAMA0", "ttyACM0", System.get_env("FARMBOT_TTY")]
|
||||||
else
|
else
|
||||||
@expected_names ["ttyUSB0", "ttyAMA0", "ttyACM0"]
|
@expected_names ["ttyUSB0", "ttyAMA0", "ttyACM0"]
|
||||||
end
|
end
|
||||||
|
@ -50,7 +50,7 @@ defmodule FarmbotCore.FirmwareTTYDetector do
|
||||||
if farmbot_tty?(name) do
|
if farmbot_tty?(name) do
|
||||||
{:noreply, name}
|
{:noreply, name}
|
||||||
else
|
else
|
||||||
# Logger.warn("#{name} is not an expected Farmbot Firmware TTY")
|
Logger.warn("#{name} is not an expected Farmbot Firmware TTY")
|
||||||
{:noreply, state, {:continue, rest}}
|
{:noreply, state, {:continue, rest}}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,7 +13,7 @@ defmodule FarmbotFirmware.UARTTransport do
|
||||||
def init(args) do
|
def init(args) do
|
||||||
device = Keyword.fetch!(args, :device)
|
device = Keyword.fetch!(args, :device)
|
||||||
handle_gcode = Keyword.fetch!(args, :handle_gcode)
|
handle_gcode = Keyword.fetch!(args, :handle_gcode)
|
||||||
reset = Keyword.get(args, :reset)
|
reset = Keyword.fetch!(args, :reset)
|
||||||
{:ok, uart} = UartDefaultAdapter.start_link()
|
{:ok, uart} = UartDefaultAdapter.start_link()
|
||||||
|
|
||||||
{:ok,
|
{:ok,
|
||||||
|
|
|
@ -14,7 +14,7 @@ defmodule FarmbotFirmware.UARTTransportTest do
|
||||||
init_args = [
|
init_args = [
|
||||||
device: :FAKE_DEVICE,
|
device: :FAKE_DEVICE,
|
||||||
handle_gcode: :FAKE_GCODE_HANDLER,
|
handle_gcode: :FAKE_GCODE_HANDLER,
|
||||||
reset: :FAKE_RESETER
|
reset: StubReset
|
||||||
]
|
]
|
||||||
|
|
||||||
{:ok, state, 0} = UARTTransport.init(init_args)
|
{:ok, state, 0} = UARTTransport.init(init_args)
|
||||||
|
|
|
@ -38,8 +38,5 @@ config :farmbot,
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
|
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
|
|
||||||
firmware_flash_attempt_threshold: 5
|
|
||||||
|
|
||||||
config :logger,
|
config :logger,
|
||||||
backends: [:console]
|
backends: [:console]
|
||||||
|
|
|
@ -35,8 +35,6 @@ config :farmbot, FarmbotOS.Configurator,
|
||||||
data_layer: FarmbotOS.Configurator.ConfigDataLayer,
|
data_layer: FarmbotOS.Configurator.ConfigDataLayer,
|
||||||
network_layer: FarmbotOS.Configurator.FakeNetworkLayer
|
network_layer: FarmbotOS.Configurator.FakeNetworkLayer
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareTTYDetector, expected_names: []
|
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 0
|
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 0
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
|
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
|
||||||
|
|
|
@ -116,9 +116,6 @@ config :farmbot, FarmbotOS.System,
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
|
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
|
|
||||||
firmware_flash_attempt_threshold: 5
|
|
||||||
|
|
||||||
config :logger, backends: [RingLogger]
|
config :logger, backends: [RingLogger]
|
||||||
|
|
||||||
config :logger, RingLogger,
|
config :logger, RingLogger,
|
||||||
|
|
Loading…
Reference in New Issue