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

Update VintageNet 

There was a API breaking change in vintage_net 0.6. This update
reflects that
pull/1045/head
Connor Rigby 2019-10-29 08:59:20 -07:00 committed by Connor Rigby
parent 9009ff6329
commit ac5336d2b0
7 changed files with 67 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
farmbot_os/lib/farmbot_os/system.ex
View File

@ -83,6 +83,7 @@ defmodule FarmbotOS.System do
end
defp write_file(reason) do
FarmbotCore.Logger.debug(3, "power down event: #{inspect(reason)}")
file = Path.join(@data_path, "last_shutdown_reason")
if reason, do: File.write!(file, inspect(reason)), else: File.rm_rf(file)
end

2
farmbot_os/mix.exs
View File

@ -101,7 +101,7 @@ defmodule FarmbotOS.MixProject do
{:nerves_firmware_ssh, "~> 0.4", targets: @all_targets},
{:circuits_gpio, "~> 0.4", targets: @all_targets},
{:toolshed, "~> 0.2", targets: @all_targets},
{:vintage_net, "~> 0.5", targets: @all_targets},
{:vintage_net, "~> 0.6", targets: @all_targets},
{:mdns_lite, "~> 0.4", targets: @all_targets},
{:busybox, "~> 0.1", targets: @all_targets},
{:farmbot_system_rpi3, "1.8.0-farmbot.2", runtime: false, targets: :rpi3},

3
farmbot_os/mix.lock
View File

@ -57,6 +57,7 @@
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.6.0", "452f8589c1a58ac787477caab20a8cfc6671e345837ccc19beefe49ae35ba983", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
"nimble_csv": {:hex, :nimble_csv, "0.6.0", "a3673f26d41f986774fe6060e309615343d3cb83a6d435754d8b1fdbd5764879", [:mix], [], "hexpm"},
"nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"},
"one_dhcpd": {:hex, :one_dhcpd, "0.2.3", "753f1495a5f1b29d24b6e1f1e4e9c30c54242daae236bed6baff32027165559e", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
"parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"},
"pbcs": {:hex, :pbcs, "0.1.1", "199c7fd4af3351758378355909145a2d187c565555ed16bde30b5055114652ed", [:mix], [], "hexpm"},
"phoenix_client": {:hex, :phoenix_client, "0.9.0", "973fdcadfd4e540558efa12a8dba028ba393712bece36ab523f2c218d5a1ae86", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:websocket_client, "~> 1.3", [hex: :websocket_client, repo: "hexpm", optional: true]}], "hexpm"},
@ -85,7 +86,7 @@
"uboot_env": {:hex, :uboot_env, "0.1.1", "b01e3ec0973e99473234f27839e29e63b5b81eba6a136a18a78d049d4813d6c5", [:mix], [], "hexpm"},
"unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"},
"uuid": {:hex, :uuid, "1.1.8", "e22fc04499de0de3ed1116b770c7737779f226ceefa0badb3592e64d5cfb4eb9", [:mix], [], "hexpm"},
"vintage_net": {:hex, :vintage_net, "0.5.1", "dc199b0b056670380dab542c48784249bfe84b74f18cc29327c6b335e8f9467d", [:make, :mix], [{:busybox, "~> 0.1", [hex: :busybox, repo: "hexpm", optional: true]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:gen_state_machine, "~> 2.0.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:muontrap, "~> 0.5.0", [hex: :muontrap, repo: "hexpm", optional: false]}], "hexpm"},
"vintage_net": {:hex, :vintage_net, "0.6.3", "9a9d8e788312f6af646e22316425bf40292b8b91cafec00c36a13475fc637e29", [:make, :mix], [{:busybox, "~> 0.1", [hex: :busybox, repo: "hexpm", optional: true]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:gen_state_machine, "~> 2.0.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:muontrap, "~> 0.5.0", [hex: :muontrap, repo: "hexpm", optional: false]}, {:one_dhcpd, "~> 0.2.3", [hex: :one_dhcpd, repo: "hexpm", optional: false]}], "hexpm"},
"websocket_client": {:hex, :websocket_client, "1.3.0", "2275d7daaa1cdacebf2068891c9844b15f4fdc3de3ec2602420c2fb486db59b6", [:rebar3], [], "hexpm"},
"x509": {:hex, :x509, "0.7.0", "001b762cd99e1a33bc876bb090bd34d9cadc66eb7df3deb76d9f4d8a37b89612", [:mix], [], "hexpm"},
}

22
farmbot_os/platform/target/configurator/captive_portal.ex
View File

@ -20,7 +20,7 @@ defmodule FarmbotOS.Platform.Target.Configurator.CaptivePortal do
@impl VintageNet.Technology
def to_raw_config(ifname, %{wifi: _} = config, opts) do
{:ok, normalized} = normalize(config)
normalized = normalize(config)
ifname
|> vintage_wifi(normalized, opts)
@ -28,7 +28,7 @@ defmodule FarmbotOS.Platform.Target.Configurator.CaptivePortal do
end
def to_raw_config(ifname, config, opts) do
{:ok, normalized} = normalize(config)
normalized = normalize(config)
ifname
|> vintage_ethernet(normalized, opts)
@ -96,25 +96,23 @@ defmodule FarmbotOS.Platform.Target.Configurator.CaptivePortal do
raw_config.cleanup_files ++ [dnsmasq_conf_path, dnsmasq_lease_file, dnsmasq_pid_file]
}
{:ok, updated_raw_config}
updated_raw_config
end
defp dnsmasq(%{} = raw_config, _opts) do
FarmbotCore.Logger.error(1, "DNSMASQ Disabled")
{:ok, raw_config}
raw_config
end
defp vintage_wifi(ifname, config, opts) do
with {:ok, config} <- VintageNet.Technology.WiFi.normalize(config),
{:ok, raw_config} <- VintageNet.Technology.WiFi.to_raw_config(ifname, config, opts) do
%{raw_config | type: VintageNet.Technology.WiFi}
end
config = VintageNet.Technology.WiFi.normalize(config)
raw_config = VintageNet.Technology.WiFi.to_raw_config(ifname, config, opts)
%{raw_config | type: VintageNet.Technology.WiFi}
end
defp vintage_ethernet(ifname, config, opts) do
with {:ok, config} <- VintageNet.Technology.Ethernet.normalize(config),
{:ok, raw_config} <- VintageNet.Technology.Ethernet.to_raw_config(ifname, config, opts) do
%{raw_config | type: VintageNet.Technology.Ethernet}
end
config = VintageNet.Technology.Ethernet.normalize(config)
raw_config = VintageNet.Technology.Ethernet.to_raw_config(ifname, config, opts)
%{raw_config | type: VintageNet.Technology.Ethernet}
end
end

57
farmbot_os/platform/target/configurator/validator.ex
View File

@ -24,11 +24,11 @@ defmodule FarmbotOS.Platform.Target.Configurator.Validator do
regulatory_domain: _
} = config
) do
{:ok, config}
config
end
def normalize(_) do
{:error, :incomplete_config}
raise "Could not normalize farmbot network config"
end
@impl VintageNet.Technology
@ -91,8 +91,12 @@ defmodule FarmbotOS.Platform.Target.Configurator.Validator do
defp to_wifi(%{security: "NONE", ssid: ssid, regulatory_domain: reg_domain}) do
%{
key_mgmt: :none,
ssid: ssid,
networks: [
%{
key_mgmt: :none,
ssid: ssid
}
],
scan_ssid: 1,
bgscan: :simple,
regulatory_domain: reg_domain
@ -101,9 +105,13 @@ defmodule FarmbotOS.Platform.Target.Configurator.Validator do
defp to_wifi(%{security: "WPA-PSK", ssid: ssid, psk: psk, regulatory_domain: reg_domain}) do
%{
ssid: ssid,
key_mgmt: :wpa_psk,
psk: psk,
networks: [
%{
ssid: ssid,
psk: psk,
key_mgmt: :wpa_psk
}
],
scan_ssid: 1,
bgscan: :simple,
regulatory_domain: reg_domain
@ -112,9 +120,13 @@ defmodule FarmbotOS.Platform.Target.Configurator.Validator do
defp to_wifi(%{security: "WPA2-PSK", ssid: ssid, psk: psk, regulatory_domain: reg_domain}) do
%{
ssid: ssid,
key_mgmt: :wpa_psk,
psk: psk,
networks: [
%{
ssid: ssid,
key_mgmt: :wpa_psk,
psk: psk
}
],
scan_ssid: 1,
bgscan: :simple,
regulatory_domain: reg_domain
@ -129,10 +141,19 @@ defmodule FarmbotOS.Platform.Target.Configurator.Validator do
regulatory_domain: reg_domain
}) do
%{
ssid: ssid,
key_mgmt: :wpa_eap,
identity: id,
password: pw,
networks: [
%{
ssid: ssid,
key_mgmt: :wpa_eap,
pairwise: "CCMP TKIP",
group: "CCMP TKIP",
eap: "PEAP",
phase1: "peapver=auto",
phase2: "MSCHAPV2",
identity: id,
password: pw
}
],
scan_ssid: 1,
bgscan: :simple,
regulatory_domain: reg_domain
@ -140,12 +161,12 @@ defmodule FarmbotOS.Platform.Target.Configurator.Validator do
end
defp vintage_ethernet(ifname, config, opts) do
with {:ok, config} <- VintageNet.Technology.Ethernet.normalize(config),
do: VintageNet.Technology.Ethernet.to_raw_config(ifname, config, opts)
config = VintageNet.Technology.Ethernet.normalize(config)
VintageNet.Technology.Ethernet.to_raw_config(ifname, config, opts)
end
defp vintage_wifi(ifname, config, opts) do
with {:ok, config} <- VintageNet.Technology.WiFi.normalize(config),
do: VintageNet.Technology.WiFi.to_raw_config(ifname, config, opts)
config = VintageNet.Technology.WiFi.normalize(config)
VintageNet.Technology.WiFi.to_raw_config(ifname, config, opts)
end
end

10
farmbot_os/platform/target/network.ex
View File

@ -22,9 +22,13 @@ defmodule FarmbotOS.Platform.Target.Network do
%{
type: CaptivePortal,
wifi: %{
ssid: build_hostap_ssid(),
mode: :host,
key_mgmt: :none
networks: [
%{
ssid: build_hostap_ssid(),
mode: :ap,
key_mgmt: :none
}
]
},
ipv4: %{
method: :static,

15
farmbot_os/platform/target/network/presetup.ex
View File

@ -4,17 +4,16 @@ defmodule FarmbotOS.Platform.Target.Network.PreSetup do
alias VintageNet.Interface.RawConfig
@impl true
def normalize(config), do: {:ok, config}
def normalize(config), do: config
@impl true
def to_raw_config(ifname, config \\ %{}, _opts \\ []) do
{:ok,
%RawConfig{
ifname: ifname,
type: __MODULE__,
source_config: config,
require_interface: false
}}
%RawConfig{
ifname: ifname,
type: __MODULE__,
source_config: config,
require_interface: false
}
end
@impl true