Skip to content
Permalink
Browse files

Update farmbot-arduino-firmware submodule to be built in

farmbot_firmware app
  • Loading branch information...
ConnorRigby committed Apr 4, 2019
1 parent 3d80dc6 commit 6381261c326d6473a9d7e3f02d7f1309b1cfdd96
@@ -48,7 +48,6 @@ upload.sh
*.img
artifacts
RELEASE_NOTES
*.hex
# lagger can't be disabled.
/log
.make_state
@@ -0,0 +1,4 @@
[submodule "farmbot_firmware/c_src/farmbot-arduino-firmware"]
path = farmbot_firmware/c_src/farmbot-arduino-firmware
url = git@github.com:Farmbot/farmbot-arduino-firmware.git
ignore = dirty
@@ -4,7 +4,6 @@ defmodule FarmbotCore.Project do
@version Mix.Project.config[:version] || Mix.raise("Missing Project key version")
@commit Mix.Project.config[:commit] || Mix.raise("Missing Project key commit")
@branch Mix.Project.config[:branch] || Mix.raise("Missing Project key branch")
@arduino_commit Mix.Project.config[:arduino_commit] || Mix.raise("Missing Project key arduino_commit")

@target Mix.target()
@env Mix.env()
@@ -24,9 +23,7 @@ defmodule FarmbotCore.Project do
@compile {:inline, branch: 0}
def branch, do: @branch

@doc "*#{@arduino_commit}*"
@compile {:inline, arduino_commit: 0}
def arduino_commit, do: @arduino_commit
def arduino_commit, do: FarmbotFirmware.Project.arduino_commit()

@doc "*#{@target}*"
@compile {:inline, target: 0}
@@ -9,14 +9,6 @@ defmodule FarmbotCore.MixProject do
System.cmd("git", ~w"rev-parse --verify HEAD") |> elem(0) |> String.trim()
end

defp arduino_commit do
opts = [cd: Path.join("c_src", "farmbot-arduino-firmware")]

System.cmd("git", ~w"rev-parse --verify HEAD", opts)
|> elem(0)
|> String.trim()
end

def project do
[
app: :farmbot_core,
@@ -30,7 +22,6 @@ defmodule FarmbotCore.MixProject do
target: @target,
branch: @branch,
commit: commit(),
arduino_commit: arduino_commit(),
build_embedded: false,
start_permanent: Mix.env() == :prod,
aliases: aliases(),

0 comments on commit 6381261

Please sign in to comment.
You can’t perform that action at this time.