Merge pull request #1209 from FarmBot/10.1.0

v10.1.0
FarmBot · Jun 3, 2020 · 07d6624 · 07d6624
2 parents cc9a72e + d28ca3a
commit 07d6624
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,8 @@
 # 10.1.0
 
  * Internal upgrades to underlying OS
- * Bug fix for DIY users on third party RAMPS boards.
  * Genesis v1.5 and Express v1.0 firmware updates.
+ * Bug fix to prevent firmware reset issues when MCU becomes unresponsive
 
 # 10.0.1
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-10.1.0-rc25
+10.1.0
diff --git a/farmbot_firmware/lib/farmbot_firmware.ex b/farmbot_firmware/lib/farmbot_firmware.ex
@@ -168,7 +168,13 @@ defmodule FarmbotFirmware do
   the `:transport_boot` state.
   """
   def close_transport(server \\ __MODULE__) do
-    _ = command(server, {nil, {:command_emergency_lock, []}})
+    # Make a best effort to E-lock before swapping.
+    # Don't crash if e-stop fails.
+    spawn(fn ->
+      command(server, {nil, {:command_emergency_lock, []}})
+    end)
+
+    Process.sleep(1000)
     GenServer.call(server, :close_transport)
   end