From 3edc10f79ee22ecd1395cc82a4a33fe06fbf90b5 Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Tue, 2 Jun 2020 15:32:44 -0500
Subject: [PATCH 1/4] v10.1.0-rc26

---
 VERSION                                  | 2 +-
 farmbot_firmware/lib/farmbot_firmware.ex | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 096daa331..5403394c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.0-rc25
\ No newline at end of file
+10.1.0-rc26
\ No newline at end of file
diff --git a/farmbot_firmware/lib/farmbot_firmware.ex b/farmbot_firmware/lib/farmbot_firmware.ex
index 6daee4951..831fe77ca 100644
--- a/farmbot_firmware/lib/farmbot_firmware.ex
+++ b/farmbot_firmware/lib/farmbot_firmware.ex
@@ -168,7 +168,12 @@ 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
 

From b0b81d6cfab220f57296dd6f367cfbd5a7912bc5 Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Tue, 2 Jun 2020 20:07:57 -0500
Subject: [PATCH 2/4] v10.1.0

---
 CHANGELOG.md | 2 +-
 VERSION      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c2181d4..98d769852 100644
--- 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 where to prevent firmware reset when MCU becomes unresponsive
 
 # 10.0.1
 
diff --git a/VERSION b/VERSION
index 5403394c7..3b9bddfcc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.0-rc26
\ No newline at end of file
+10.1.0
\ No newline at end of file

From 8d2e879a02472bb5f15afc2ef5ebe66a6273803f Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Tue, 2 Jun 2020 20:10:17 -0500
Subject: [PATCH 3/4] Formatting fix

---
 farmbot_firmware/lib/farmbot_firmware.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/farmbot_firmware/lib/farmbot_firmware.ex b/farmbot_firmware/lib/farmbot_firmware.ex
index 831fe77ca..279fdc553 100644
--- a/farmbot_firmware/lib/farmbot_firmware.ex
+++ b/farmbot_firmware/lib/farmbot_firmware.ex
@@ -173,6 +173,7 @@ defmodule FarmbotFirmware do
     spawn(fn ->
       command(server, {nil, {:command_emergency_lock, []}})
     end)
+
     Process.sleep(1000)
     GenServer.call(server, :close_transport)
   end

From 50d7f4398a321ab15f24cae5607bac69c7340a16 Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Tue, 2 Jun 2020 20:12:36 -0500
Subject: [PATCH 4/4] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98d769852..704b4ade7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
  * Internal upgrades to underlying OS
  * Genesis v1.5 and Express v1.0 firmware updates.
- * Bug fix where to prevent firmware reset when MCU becomes unresponsive
+ * Bug fix to prevent firmware reset issues when MCU becomes unresponsive
 
 # 10.0.1