v9.3.0-rc0 (debugging possible OTA system bug)

VERSION

@@ -1 +1 @@
-10.0.0-rc11
+9.3.0-rc0

farmbot_core/config/config.exs

@@ -46,13 +46,8 @@ config :farmbot_core, FarmbotCore.EctoMigrator,
       "beta"
     )
 
-config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
-
 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 "logger.exs"
 import_config "#{Mix.env()}.exs"

farmbot_core/config/dev.exs

@@ -2,8 +2,3 @@ use Mix.Config
 
 config :farmbot_celery_script, FarmbotCeleryScript.SysCalls,
   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

farmbot_core/lib/farmbot_core/asset_workers/fbos_config_worker.ex

@@ -11,16 +11,9 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.FbosConfig do
   alias FarmbotCore.{Asset.FbosConfig, BotState, Config}
   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
   @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
   def preload(%FbosConfig{}), do: []

farmbot_core/lib/farmbot_core/firmware_open_task.ex

@@ -9,14 +9,7 @@ defmodule FarmbotCore.FirmwareOpenTask do
   require FarmbotCore.Logger
   alias FarmbotFirmware.{UARTTransport, StubTransport}
   alias FarmbotCore.{Asset, Config}
-  @attempt_threshold Application.get_env(:farmbot_core, __MODULE__)[:attempt_threshold]
-  @attempt_threshold || Mix.raise """
-  Firmware open attempt threshold not configured:
-
-  config :farmbot_core, FarmbotCore.FirmwareOpenTask, [
-    attempt_threshold: 10
-  ]
-  """
+  @attempt_threshold Application.get_env(:farmbot_core, __MODULE__)[:attempt_threshold] || 5
 
   @doc false
   def start_link(args, opts \\ [name: __MODULE__]) do

farmbot_core/lib/farmbot_core/firmware_tty_detector.ex

@@ -6,7 +6,7 @@ defmodule FarmbotCore.FirmwareTTYDetector do
   @error_retry_ms 5_000
 
   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
     @expected_names ["ttyUSB0", "ttyAMA0", "ttyACM0"]
   end
@@ -50,7 +50,7 @@ defmodule FarmbotCore.FirmwareTTYDetector do
     if farmbot_tty?(name) do
       {:noreply, name}
     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}}
     end
   end

farmbot_firmware/lib/farmbot_firmware/transports/uart_transport.ex

@@ -13,7 +13,7 @@ defmodule FarmbotFirmware.UARTTransport do
   def init(args) do
     device = Keyword.fetch!(args, :device)
     handle_gcode = Keyword.fetch!(args, :handle_gcode)
-    reset = Keyword.get(args, :reset)
+    reset = Keyword.fetch!(args, :reset)
     {:ok, uart} = UartDefaultAdapter.start_link()
 
     {:ok,

farmbot_firmware/test/farmbot_firmware/transports/uart_transport_test.exs

@@ -14,7 +14,7 @@ defmodule FarmbotFirmware.UARTTransportTest do
     init_args = [
       device: :FAKE_DEVICE,
       handle_gcode: :FAKE_GCODE_HANDLER,
-      reset: :FAKE_RESETER
+      reset: StubReset
     ]
 
     {:ok, state, 0} = UARTTransport.init(init_args)

farmbot_os/config/host/dev.exs

@@ -38,8 +38,5 @@ config :farmbot,
 
 config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 5
 
-config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,
-  firmware_flash_attempt_threshold: 5
-
 config :logger,
   backends: [:console]

farmbot_os/config/host/test.exs

@@ -35,8 +35,6 @@ config :farmbot, FarmbotOS.Configurator,
   data_layer: FarmbotOS.Configurator.ConfigDataLayer,
   network_layer: FarmbotOS.Configurator.FakeNetworkLayer
 
-config :farmbot_core, FarmbotCore.FirmwareTTYDetector, expected_names: []
-
 config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 0
 
 config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FbosConfig,

farmbot_os/config/target/dev.exs

@@ -116,9 +116,6 @@ config :farmbot, FarmbotOS.System,
 
 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, RingLogger,