Merge branch 'staging' of github.com:farmbot/farmbot_os into feature/api_settings

CHANGELOG.md

@@ -3,6 +3,8 @@
 * Fix flashing `beta` channel updates.
 * Add feature to send user an email if the bot has been e-stopped for 10 minutes.
 * Add feature to `espeak` logs.
+* Set `busy` a little earlier making the bot seem snappier.
+* Fix `tzdata` bug for real this time.
 
 # 6.1.0
 * Remove all the migration code to safely get from 5.0.x to 6.0.1.

c_src/farmbot-arduino-firmware

@@ -1 +1 @@
-Subproject commit d65960761703b835f067828be216c88715d2311b
+Subproject commit ada9456aee27bf2591ce55b1b01ecfce418c09e3

lib/farmbot/system/system.ex

@@ -188,6 +188,13 @@ defmodule Farmbot.System do
     """
   end
 
+  # TODO(Connor) Remove this some day.
+  defp do_format_reason({{:case_clause, {:raise, %Sqlite.DbConnection.Error{}}}, _}) do
+    {:ignore, """
+    https://github.com/scouten/sqlite_ecto2/issues/204
+    """}
+  end
+
   defp do_format_reason({:badarg, [{:ets, :lookup_element, _, _} | _]}) do
     {:ignore, """
     Bad Ecto call. This usually is a result of an over the air update and can

nerves/target/bootstrap/network/tzdata_task.ex

@@ -17,7 +17,7 @@ defmodule Farmbot.Target.Network.TzdataTask do
     dir = @fb_data_dir
     if File.exists?(dir) do
       for obj <- File.ls!(dir) do
-        File.rm_rf!(obj)
+        File.rm_rf!(Path.join(dir, obj))
       end
     end
     {:noreply, restart_timer(self()), :hibernate}