v10.1.3-rc11

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# 10.1.3
+
+ * Genesis v1.5 and Express v1.0 firmware homing updates.
+ * Add warning to configurator credentials page.
+ * Fix bug where configurator would not restart when bad credentials were entered.
+
 # 10.1.2
 
  * Express v1.0 firmware updates.

VERSION

@@ -1 +1 @@
-10.1.3-rc3
+10.1.3-rc11

farmbot_core/lib/farmbot_core/firmware_tty_detector.ex

@@ -47,7 +47,7 @@ defmodule FarmbotCore.FirmwareTTYDetector do
     # unpredictable behavior. Putting ttyAMA0 at the end helps
     # prevent the issue.
     enumerated = UART.enumerate() |> Map.to_list() |> Enum.sort_by(fn
-      "ttyAMA0" -> 1
+	 {"ttyAMA0", _} -> 1
       _ -> 0
     end)
 

farmbot_ext/lib/farmbot_ext/amqp/connection_worker.ex

@@ -54,8 +54,8 @@ defmodule FarmbotExt.AMQP.ConnectionWorker do
          {:ok, _} <- maybe_purge(chan, chan_name, purge?),
          :ok <- Queue.bind(chan, chan_name, @exchange, routing_key: route),
          {:ok, _} <- Basic.consume(chan, chan_name, self(), no_ack: true) do
-      # link to the connection and channel because the 
-      # AMQP lib doesn't handle being disconnected form the 
+      # link to the connection and channel because the
+      # AMQP lib doesn't handle being disconnected form the
       # network very well and these pids will turn into zombies
       Process.link(conn.pid)
       Process.link(chan.pid)

farmbot_ext/lib/farmbot_ext/api/dirty_worker.ex

@@ -62,12 +62,6 @@ defmodule FarmbotExt.API.DirtyWorker do
       {:ok, %{status: s, body: body}} when s > 199 and s < 300 ->
         dirty |> module.changeset(body) |> handle_changeset(module)
 
-      # Stale data
-      {:ok, %{status: s, body: %{} = body}} when s == 409 ->
-        b = inspect(body)
-        msg = "FBOS Encountered stale data (#{module}). Resync required. #{b}"
-        FarmbotCore.Logger.error(2, msg)
-
       # Invalid data
       {:ok, %{status: s, body: %{} = body}} when s > 399 and s < 500 ->
         FarmbotCore.Logger.error(2, "HTTP Error #{s}. #{inspect(body)}")

farmbot_ext/lib/farmbot_ext/bootstrap.ex

@@ -4,7 +4,9 @@ defmodule FarmbotExt.Bootstrap do
   a token, secret, or password for logging into an account
   """
 
+  # FarmbotExt.Bootstrap.Authorization.authorize_with_password(email, password, server)
   use GenServer
+  require FarmbotCore.Logger
   require Logger
   alias FarmbotExt.{Bootstrap, Bootstrap.Authorization}
   import FarmbotCore.Config, only: [update_config_value: 4, get_config_value: 3]
@@ -56,11 +58,20 @@ defmodule FarmbotExt.Bootstrap do
          {:ok, pid} <- Supervisor.start_child(FarmbotExt, Bootstrap.Supervisor) do
       {:noreply, pid}
     else
-      # User types a bad password into configurator.
-      er ->
-        Logger.error("Password auth failed: #{inspect(er)} ")
+      # Changing the error message on the API
+      # will break this handler. Hmm...
+      {:error, "Bad email or password."} ->
+        msg = "Password auth failed! Check again and reconfigurate."
+        Logger.error(msg)
+        FarmbotCore.Logger.debug(3, msg)
         FarmbotCeleryScript.SysCalls.factory_reset("farmbot_os")
         {:noreply, nil, 5000}
+
+      er ->
+        msg = "Bootstrap try_auth: #{inspect(er)} "
+        Logger.error(msg)
+        FarmbotCore.Logger.debug(3, msg)
+        {:noreply, nil, 5000}
     end
   end
 end