From 7b5b56420433e5337ae7ab5c15bf052036f05056 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Wed, 22 Jan 2020 13:23:50 -0600 Subject: [PATCH] FIX NETWORK_LAYER CONFIG STUFF --- farmbot_os/config/config.exs | 32 +++++++++++++++---- farmbot_os/config/host/test.exs | 4 +++ farmbot_os/config/target/dev.exs | 6 +++- farmbot_os/config/target/prod.exs | 6 +++- .../lib/farmbot_os/configurator/router.ex | 11 ++++--- farmbot_os/test/farmbot_os/sys_calls_test.exs | 1 - 6 files changed, 46 insertions(+), 14 deletions(-) diff --git a/farmbot_os/config/config.exs b/farmbot_os/config/config.exs index dc40ab5a..c3b807ab 100644 --- a/farmbot_os/config/config.exs +++ b/farmbot_os/config/config.exs @@ -1,6 +1,7 @@ use Mix.Config -config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent, checkup_time_ms: 10_000 +config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent, + checkup_time_ms: 10_000 config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.RegimenInstance, checkup_time_ms: 10_000 @@ -18,9 +19,11 @@ config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.PinBinding, gpio_handler: FarmbotCore.PinBindingWorker.StubGPIOHandler, error_retry_time_ms: 30_000 -config :farmbot_core, FarmbotCore.Leds, gpio_handler: FarmbotCore.Leds.StubHandler +config :farmbot_core, FarmbotCore.Leds, + gpio_handler: FarmbotCore.Leds.StubHandler -config :farmbot_core, FarmbotCore.JSON, json_parser: FarmbotCore.JSON.JasonParser +config :farmbot_core, FarmbotCore.JSON, + json_parser: FarmbotCore.JSON.JasonParser # Customize non-Elixir parts of the firmware. See # https://hexdocs.pm/nerves/advanced-configuration.html for details. @@ -43,13 +46,15 @@ config :farmbot_core, FarmbotCore.EctoMigrator, "beta" ) -config :farmbot_celery_script, FarmbotCeleryScript.SysCalls, sys_calls: FarmbotOS.SysCalls +config :farmbot_celery_script, FarmbotCeleryScript.SysCalls, + sys_calls: FarmbotOS.SysCalls config :farmbot_core, FarmbotCore.BotState.FileSystem, root_dir: "/tmp/farmbot_state", sleep_time: 200 -config :farmbot_core, FarmbotCore.FarmwareRuntime, runtime_dir: "/tmp/farmware_runtime" +config :farmbot_core, FarmbotCore.FarmwareRuntime, + runtime_dir: "/tmp/farmware_runtime" config :ecto, json_library: FarmbotCore.JSON @@ -60,11 +65,18 @@ config :farmbot_core, FarmbotCore.Asset.Repo ] -config :farmbot_ext, FarmbotExt.API.Preloader, preloader_impl: FarmbotExt.API.Preloader.HTTP +config :farmbot_ext, FarmbotExt.API.Preloader, + preloader_impl: FarmbotExt.API.Preloader.HTTP config :farmbot, FarmbotOS.FileSystem, data_path: "/tmp/farmbot" -config :farmbot, FarmbotOS.System, system_tasks: FarmbotOS.Platform.Host.SystemTasks +config :farmbot, FarmbotOS.System, + system_tasks: FarmbotOS.Platform.Host.SystemTasks + +config :farmbot, FarmbotOS.Configurator, + data_layer: FarmbotOS.Configurator.ConfigDataLayer, + network_layer: FarmbotOS.Configurator.FakeNetworkLayer, + telemetry_layer: FarmbotOS.Configurator.DetsTelemetryLayer config :farmbot, FarmbotOS.Platform.Supervisor, platform_children: [ @@ -95,3 +107,9 @@ else import_config("target/#{Mix.target()}.exs") end end + +if Mix.env() == :test do + config :farmbot_os, + :reconciler, + FarmbotExt.API.TestReconciler +end diff --git a/farmbot_os/config/host/test.exs b/farmbot_os/config/host/test.exs index 628400ce..7bf9bf0c 100644 --- a/farmbot_os/config/host/test.exs +++ b/farmbot_os/config/host/test.exs @@ -31,6 +31,10 @@ config :farmbot, {Farmbot.Platform.Host.Configurator, []} ] +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 diff --git a/farmbot_os/config/target/dev.exs b/farmbot_os/config/target/dev.exs index 4a2e9fed..890ae616 100644 --- a/farmbot_os/config/target/dev.exs +++ b/farmbot_os/config/target/dev.exs @@ -108,7 +108,11 @@ config :farmbot, FarmbotOS.Platform.Supervisor, FarmbotOS.Platform.Target.InfoWorker.Supervisor ] -config :farmbot, FarmbotOS.System, system_tasks: FarmbotOS.Platform.Target.SystemTasks +config :farmbot, FarmbotOS.Configurator, + network_layer: FarmbotOS.Platform.Target.Configurator.VintageNetworkLayer + +config :farmbot, FarmbotOS.System, + system_tasks: FarmbotOS.Platform.Target.SystemTasks config :nerves_hub, client: FarmbotOS.Platform.Target.NervesHubClient, diff --git a/farmbot_os/config/target/prod.exs b/farmbot_os/config/target/prod.exs index 419d9be2..916e6c2f 100644 --- a/farmbot_os/config/target/prod.exs +++ b/farmbot_os/config/target/prod.exs @@ -108,7 +108,11 @@ config :farmbot, FarmbotOS.Platform.Supervisor, FarmbotOS.Platform.Target.InfoWorker.Supervisor ] -config :farmbot, FarmbotOS.System, system_tasks: FarmbotOS.Platform.Target.SystemTasks +config :farmbot, FarmbotOS.Configurator, + network_layer: FarmbotOS.Platform.Target.Configurator.VintageNetworkLayer + +config :farmbot, FarmbotOS.System, + system_tasks: FarmbotOS.Platform.Target.SystemTasks config :nerves_hub, client: FarmbotOS.Platform.Target.NervesHubClient, diff --git a/farmbot_os/lib/farmbot_os/configurator/router.ex b/farmbot_os/lib/farmbot_os/configurator/router.ex index 0c6ad05b..4f784dd6 100644 --- a/farmbot_os/lib/farmbot_os/configurator/router.ex +++ b/farmbot_os/lib/farmbot_os/configurator/router.ex @@ -21,10 +21,13 @@ defmodule FarmbotOS.Configurator.Router do plug(:match) plug(:dispatch) - @data_layer FarmbotOS.Configurator.ConfigDataLayer - # WE REALLY NEED FarmbotOS.Platform.Target.Configurator.VintageNetworkLayer - @network_layer FarmbotOS.Configurator.FakeNetworkLayer - @telemetry_layer FarmbotOS.Configurator.DetsTelemetryLayer + @data_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[:data_layer] + @network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[ + :network_layer + ] + @telemetry_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[ + :telemetry_layer + ] # Trigger for captive portal for various operating systems get("/gen_204", do: redir(conn, "/")) diff --git a/farmbot_os/test/farmbot_os/sys_calls_test.exs b/farmbot_os/test/farmbot_os/sys_calls_test.exs index 106908bb..e45fd1b2 100644 --- a/farmbot_os/test/farmbot_os/sys_calls_test.exs +++ b/farmbot_os/test/farmbot_os/sys_calls_test.exs @@ -4,7 +4,6 @@ defmodule FarmbotOS.SysCallsTest do alias FarmbotCore.Asset alias FarmbotCore.Asset.{ - Command, Repo, Sequence, BoxLed