From bfb4f21f5450178149c14dff2ca587fa9cd97aec Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Mon, 13 Apr 2020 11:47:49 -0500
Subject: [PATCH] v9.2.2-rc20

---
 CHANGELOG.md                           |  3 +++
 VERSION                                |  2 +-
 farmbot_core/lib/farmbot_core/asset.ex |  3 ---
 farmbot_os/lib/avrdude.ex              | 12 ------------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f409175..032c1dab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@
  * Unit test additions (+2.7% coverage :tada:)
  * Updates to build instructions for third party developers
  * Bug fix for criteria-based groups that have only one filter criteria.
+ * Bug fix for express bots involving timeout during remote firmware flash
+ * Remove VCR again (for now)
+ * Increase farmware timeout to 20 minutes (use at own risk)
 
 # 9.2.1
 
diff --git a/VERSION b/VERSION
index a22826d8..82aec3ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.2.2-rc19
+9.2.2-rc20
diff --git a/farmbot_core/lib/farmbot_core/asset.ex b/farmbot_core/lib/farmbot_core/asset.ex
index 457d4d9f..574cbdfc 100644
--- a/farmbot_core/lib/farmbot_core/asset.ex
+++ b/farmbot_core/lib/farmbot_core/asset.ex
@@ -324,9 +324,6 @@ defmodule FarmbotCore.Asset do
         sorted = CriteriaRetriever.run(point_group)
           |> sort_points(sort_by || "xy_ascending")
           |> Enum.map(fn point -> point.id end)
-
-        count = Enum.count(sorted)
-        Logger.debug("There are #{count} points. #{inspect(sorted)}")
         %{ point_group | point_ids: sorted }
       other ->
         # Swallow all other errors
diff --git a/farmbot_os/lib/avrdude.ex b/farmbot_os/lib/avrdude.ex
index f43af1fd..5c87e4c2 100644
--- a/farmbot_os/lib/avrdude.ex
+++ b/farmbot_os/lib/avrdude.ex
@@ -17,7 +17,6 @@ defmodule Avrdude do
 
     _ = File.stat!(hex_path)
 
-    # STEP 1: Is the UART in use?
     args = [
       "-patmega2560",
       "-cwiring",
@@ -31,17 +30,6 @@ defmodule Avrdude do
 
     FarmbotCore.Logger.info(3, "Writing firmware to MCU...")
 
-    FarmbotCore.Logger.debug(
-      1,
-      inspect(%{
-        args: args,
-        into: IO.stream(:stdio, :line),
-        stderr_to_stdout: true
-      })
-    )
-
-    FarmbotCore.Logger.info(3, "Writing firmware to MCU...")
-
     call_reset_fun(reset_fun)
 
     result = MuonTrap.cmd("avrdude", args, stderr_to_stdout: true)