Add seeds, Add FarmbotFirmware back to core

pull/974/head
Rick Carlino 2019-03-19 14:35:40 -05:00 committed by Connor Rigby
parent 981dee6fef
commit af7b9e3359
No known key found for this signature in database
GPG Key ID: 29A88B24B70456E0
7 changed files with 13 additions and 5 deletions

View File

@ -1,7 +1,7 @@
defmodule FarmbotCore do
@moduledoc """
Core Farmbot Services.
This includes
This includes
* Core global state management
* Data storage management
* Firmware management
@ -19,6 +19,12 @@ defmodule FarmbotCore do
FarmbotCore.EctoMigrator,
FarmbotCore.BotState.Supervisor,
FarmbotCore.StorageSupervisor,
# TODO:
# * Find device
# * Detect firmware version
# * Raise enigma as needed
# * Needs to be dynamically started/supervised
{FarmbotFirmware, transport: FarmbotFirmware.StubTransport},
FarmbotCeleryScript.Scheduler
]
Supervisor.init(children, [strategy: :one_for_one])

View File

@ -19,6 +19,7 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.Private.Enigma do
def handle_info(:timeout, %Enigma{} = enigma) do
BotState.add_enigma(enigma)
# Handle enigma and block stuff.
{:noreply, enigma}
end
end

View File

@ -9,7 +9,6 @@ defmodule FarmbotCore.EctoMigrator do
}
end
@doc "Replacement for Mix.Tasks.Ecto.Migrate"
def migrate do
repos = Application.get_env(:farmbot_core, :ecto_repos)

View File

@ -65,6 +65,7 @@ defmodule FarmbotCore.MixProject do
defp deps do
[
{:farmbot_celery_script, path: "../farmbot_celery_script", env: Mix.env()},
{:farmbot_firmware, path: "../farmbot_firmware", env: Mix.env()},
{:elixir_make, "~> 0.4", runtime: false},
{:sqlite_ecto2, "~> 2.3"},
{:timex, "~> 3.4"},

View File

@ -0,0 +1,3 @@
alias FarmbotCore.Asset.Private
Private.new_enigma(%{priority: 100, problem_tag: "firmware.missing"})

View File

@ -9,8 +9,7 @@ defmodule FarmbotOS do
children = [
{FarmbotOS.Init.Supervisor, []},
{FarmbotOS.Platform.Supervisor, []},
{FarmbotOS.EasterEggs, []},
{FarmbotFirmware, transport: FarmbotFirmware.StubTransport}
{FarmbotOS.EasterEggs, []}
]
opts = [strategy: :one_for_one, name: __MODULE__]

View File

@ -48,7 +48,6 @@ defmodule FarmbotOS.MixProject do
# Farmbot stuff
{:farmbot_core, path: "../farmbot_core", env: Mix.env()},
{:farmbot_ext, path: "../farmbot_ext", env: Mix.env()},
{:farmbot_firmware, path: "../farmbot_firmware", env: Mix.env()},
# Nerves stuff.
{:nerves, "~> 1.3", runtime: false},