Merge pull request #611 from FarmBot/staging

Ignore broken ssids

README.md

@@ -11,7 +11,7 @@ The "brains" of the FarmBot Project
 # :floppy_disk: LATEST OS IMAGE DOWNLOADS
 <!-- DON'T CHANGE THE TEXT ABOVE. It is used in documentation links. -->
 
-:star: **[RPi 3 (Ships with FarmBot.io kits)](https://github.com/FarmBot/farmbot_os/releases/download/v6.4.5/farmbot-rpi3-6.4.5.img)**
+:star: **[RPi 3 (Ships with FarmBot.io kits)](https://github.com/FarmBot/farmbot_os/releases/download/v6.4.7/farmbot-rpi3-6.4.7.img)**
 ---
 
 ## Installation

platform/target/network/network.ex

@@ -49,25 +49,7 @@ defmodule Farmbot.Target.Network do
     |> String.split("\n")
     |> tl()
     |> Enum.map(&String.split(&1, "\t"))
-    |> Enum.map(fn(res) ->
-      case res do
-        [bssid, freq, signal, flags, ssid] ->
-          %{bssid: bssid,
-            frequency: String.to_integer(freq),
-            flags: flags,
-            level: String.to_integer(signal),
-            ssid: ssid
-          }
-
-        [bssid, freq, signal, flags] ->
-          %{bssid: bssid,
-            frequency: String.to_integer(freq),
-            flags: flags,
-            level: String.to_integer(signal),
-            ssid: nil
-          }
-      end
-    end)
+    |> reduce_decode()
     |> case do
       [] ->
         Process.sleep(500)
@@ -76,6 +58,33 @@ defmodule Farmbot.Target.Network do
     end
   end
 
+  defp reduce_decode(results, acc \\ [])
+  defp reduce_decode([], acc), do: Enum.reverse(acc)
+  defp reduce_decode([ [bssid, freq, signal, flags, ssid] | rest], acc) do
+    decoded = %{
+      bssid: bssid,
+      frequency: String.to_integer(freq),
+      flags: flags,
+      level: String.to_integer(signal),
+      ssid: ssid
+    }
+    reduce_decode(rest, [decoded | acc])
+  end
+
+  defp reduce_decode([ [bssid, freq, signal, flags] | rest], acc) do
+    decoded = %{bssid: bssid,
+      frequency: String.to_integer(freq),
+      flags: flags,
+      level: String.to_integer(signal),
+      ssid: nil
+    }
+    reduce_decode(rest, [decoded | acc])
+  end
+
+  defp reduce_decode([_ | rest], acc) do
+    reduce_decode(rest, acc)
+  end
+
   def do_scan(iface) do
     pid = :"Nerves.WpaSupplicant.#{iface}"
     Nerves.WpaSupplicant.request(pid, :SCAN)