FIX NETWORK_LAYER CONFIG STUFF
parent
feae00c8db
commit
7b5b564204
|
@ -1,6 +1,7 @@
|
||||||
use Mix.Config
|
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,
|
config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.RegimenInstance,
|
||||||
checkup_time_ms: 10_000
|
checkup_time_ms: 10_000
|
||||||
|
@ -18,9 +19,11 @@ config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.PinBinding,
|
||||||
gpio_handler: FarmbotCore.PinBindingWorker.StubGPIOHandler,
|
gpio_handler: FarmbotCore.PinBindingWorker.StubGPIOHandler,
|
||||||
error_retry_time_ms: 30_000
|
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
|
# Customize non-Elixir parts of the firmware. See
|
||||||
# https://hexdocs.pm/nerves/advanced-configuration.html for details.
|
# https://hexdocs.pm/nerves/advanced-configuration.html for details.
|
||||||
|
@ -43,13 +46,15 @@ config :farmbot_core, FarmbotCore.EctoMigrator,
|
||||||
"beta"
|
"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,
|
config :farmbot_core, FarmbotCore.BotState.FileSystem,
|
||||||
root_dir: "/tmp/farmbot_state",
|
root_dir: "/tmp/farmbot_state",
|
||||||
sleep_time: 200
|
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
|
config :ecto, json_library: FarmbotCore.JSON
|
||||||
|
|
||||||
|
@ -60,11 +65,18 @@ config :farmbot_core,
|
||||||
FarmbotCore.Asset.Repo
|
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.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,
|
config :farmbot, FarmbotOS.Platform.Supervisor,
|
||||||
platform_children: [
|
platform_children: [
|
||||||
|
@ -95,3 +107,9 @@ else
|
||||||
import_config("target/#{Mix.target()}.exs")
|
import_config("target/#{Mix.target()}.exs")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if Mix.env() == :test do
|
||||||
|
config :farmbot_os,
|
||||||
|
:reconciler,
|
||||||
|
FarmbotExt.API.TestReconciler
|
||||||
|
end
|
||||||
|
|
|
@ -31,6 +31,10 @@ config :farmbot,
|
||||||
{Farmbot.Platform.Host.Configurator, []}
|
{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.FirmwareTTYDetector, expected_names: []
|
||||||
|
|
||||||
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 0
|
config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 0
|
||||||
|
|
|
@ -108,7 +108,11 @@ config :farmbot, FarmbotOS.Platform.Supervisor,
|
||||||
FarmbotOS.Platform.Target.InfoWorker.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,
|
config :nerves_hub,
|
||||||
client: FarmbotOS.Platform.Target.NervesHubClient,
|
client: FarmbotOS.Platform.Target.NervesHubClient,
|
||||||
|
|
|
@ -108,7 +108,11 @@ config :farmbot, FarmbotOS.Platform.Supervisor,
|
||||||
FarmbotOS.Platform.Target.InfoWorker.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,
|
config :nerves_hub,
|
||||||
client: FarmbotOS.Platform.Target.NervesHubClient,
|
client: FarmbotOS.Platform.Target.NervesHubClient,
|
||||||
|
|
|
@ -21,10 +21,13 @@ defmodule FarmbotOS.Configurator.Router do
|
||||||
plug(:match)
|
plug(:match)
|
||||||
plug(:dispatch)
|
plug(:dispatch)
|
||||||
|
|
||||||
@data_layer FarmbotOS.Configurator.ConfigDataLayer
|
@data_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[:data_layer]
|
||||||
# WE REALLY NEED FarmbotOS.Platform.Target.Configurator.VintageNetworkLayer
|
@network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[
|
||||||
@network_layer FarmbotOS.Configurator.FakeNetworkLayer
|
:network_layer
|
||||||
@telemetry_layer FarmbotOS.Configurator.DetsTelemetryLayer
|
]
|
||||||
|
@telemetry_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[
|
||||||
|
:telemetry_layer
|
||||||
|
]
|
||||||
|
|
||||||
# Trigger for captive portal for various operating systems
|
# Trigger for captive portal for various operating systems
|
||||||
get("/gen_204", do: redir(conn, "/"))
|
get("/gen_204", do: redir(conn, "/"))
|
||||||
|
|
|
@ -4,7 +4,6 @@ defmodule FarmbotOS.SysCallsTest do
|
||||||
alias FarmbotCore.Asset
|
alias FarmbotCore.Asset
|
||||||
|
|
||||||
alias FarmbotCore.Asset.{
|
alias FarmbotCore.Asset.{
|
||||||
Command,
|
|
||||||
Repo,
|
Repo,
|
||||||
Sequence,
|
Sequence,
|
||||||
BoxLed
|
BoxLed
|
||||||
|
|
Loading…
Reference in New Issue