spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

add new system so we dont have to compile it

pull/178/head
Connor Rigby 2016-10-04 13:24:34 -07:00
parent b821266ade
commit a68a3d3443
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfs-additions-rpi3/www/index.html
View File

@ -30,7 +30,7 @@
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li ng-repeat=" ssid in ssids "><a href="#" ng-click="select_ssid(ssid)"> {{ssid}} </a></li>
<li ng-repeat=" ssid in ssids track by $index"><a href="#" ng-click="select_ssid(ssid)"> {{ssid}} </a></li>
</ul>
<!-- Scan button -->
</div>

1
lib/auth.ex
View File

@ -11,6 +11,7 @@ defmodule Auth do
resp = HTTPotion.get("#{server}/api/public_key")
case resp do
%HTTPotion.ErrorResponse{message: "enetunreach"} -> get_public_key(server)
%HTTPotion.ErrorResponse{message: "ehostunreach"} -> get_public_key(server)
%HTTPotion.ErrorResponse{message: "econnrefused"} -> {:error, "econnrefused"}
_ -> RSA.decode_key(resp.body)
end

2
mix.exs
View File

@ -118,6 +118,6 @@ defmodule Fw.Mixfile do
end
def system("rpi3") do
[{:"nerves_system_rpi3", git: "https://github.com/ConnorRigby/nerves_system_rpi3.git", tag: "v0.7.0-farmbot-1" }]
[{:"nerves_system_rpi3", git: "https://github.com/ConnorRigby/nerves_system_rpi3.git", tag: "v0.7.1-farmbot" }]
end
end

2
mix.lock
View File

@ -23,7 +23,7 @@
"nerves_networking": {:git, "https://github.com/nerves-project/nerves_networking.git", "e4398e6be3b02f912f96dec6e13f0ec36d6d1a31", []},
"nerves_system": {:hex, :nerves_system, "0.1.6", "d3cff2ae40d3764c75b187cbbdb09985ae169489c26178d765edc9b66bc4e355", [:mix], []},
"nerves_system_br": {:hex, :nerves_system_br, "0.7.0", "e838dbec1079fa326d958a3aef4ee14f22d8ffbc91ce7f6b28fc7d9f3197dfa7", [:mix], []},
"nerves_system_rpi3": {:git, "https://github.com/ConnorRigby/nerves_system_rpi3.git", "2c097c87126c94f07c01e50114805c93f7e9241c", [tag: "v0.7.0-farmbot-1"]},
"nerves_system_rpi3": {:git, "https://github.com/ConnorRigby/nerves_system_rpi3.git", "11cdfd4ec88e45de9f06a32c255ba5b24c1e7995", [tag: "v0.7.1-farmbot"]},
"nerves_toolchain": {:hex, :nerves_toolchain, "0.7.1", "164f5fcf07f717d5e8f918965ea043c860b75065768c93a726f763498a7d8792", [:mix], []},
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.7.1", "44753bb9c301704de8b5d238cda7eba8a96b9975563d1b146316699c5c0cb129", [:mix], [{:nerves_toolchain, "~> 0.7", [hex: :nerves_toolchain, optional: false]}, {:nerves_toolchain_ctng, "~> 0.7", [hex: :nerves_toolchain_ctng, optional: false]}]},
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "0.7.1", "6f46b1591b23d1a017347f8cd9962c24775b2a6fde4e2f2b5251439efef8d6a4", [:mix], []},