v9.2.2-rc18

VERSION

@@ -1 +1 @@
-9.2.2-rc17
+9.2.2-rc18

farmbot_os/lib/farmbot_os/sys_calls/farmware.ex

@@ -4,7 +4,7 @@ defmodule FarmbotOS.SysCalls.Farmware do
   require FarmbotCore.Logger
   alias FarmbotCore.{Asset, AssetSupervisor, FarmwareRuntime}
   alias FarmbotExt.API.ImageUploader
-  @farmware_timeout 60_000
+  @farmware_timeout 1_200_000
 
   def update_farmware(farmware_name) do
     with {:ok, installation} <- lookup_installation(farmware_name) do
@@ -56,9 +56,9 @@ defmodule FarmbotOS.SysCalls.Farmware do
   end
 
   def farmware_timeout(farmware_runtime) do
-    time = @farmware_timeout / 1_000
+    time = @farmware_timeout / 1_000 / 60
     runtime = inspect(farmware_runtime)
-    msg = "Farmware did not exit after #{time} seconds. Terminating #{runtime}"
+    msg = "Farmware did not exit after #{time} minutes. Terminating #{runtime}"
 
     FarmbotCore.Logger.info(2, msg)
     FarmwareRuntime.stop(farmware_runtime)

farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex

@@ -94,11 +94,13 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do
 
   defp express_reset_fun() do
     try do
-      FarmbotCore.Logger.debug(3, "Resetting MCU")
+      FarmbotCore.Logger.debug(3, "Begin MCU reset")
       {:ok, gpio} = @gpio.open(19, :output)
-      :ok = @gpio.write(gpio, 1)
       :ok = @gpio.write(gpio, 0)
-      FarmbotCore.Logger.debug(3, "MCU Reset done")
+      :ok = @gpio.write(gpio, 1)
+      Process.sleep(1000)
+      :ok = @gpio.write(gpio, 0)
+      FarmbotCore.Logger.debug(3, "Finish MCU Reset")
       :ok
     rescue
       ex ->

farmbot_os/test/farmbot_os/avrdude/avrdude_test.exs

@@ -35,7 +35,7 @@ defmodule FarmbotOs.AvrdudeTest do
                "-Uflash:w:/tmp/wow:i"
              ]
 
-      assert opts == [ stderr_to_stdout: true ]
+      assert opts == [stderr_to_stdout: true]
     end)
 
     Avrdude.flash("/tmp/wow", "null", fn ->
@@ -60,7 +60,7 @@ defmodule FarmbotOs.AvrdudeTest do
                "-Uflash:w:/tmp/wow:i"
              ]
 
-      assert opts == [ stderr_to_stdout: true ]
+      assert opts == [stderr_to_stdout: true]
     end)
 
     Avrdude.flash("/tmp/wow", "/dev/null", fn ->

farmbot_os/test/farmbot_os/syscalls/farmware_test.exs

@@ -9,7 +9,7 @@ defmodule FarmbotOS.SysCalls.FarmwareTest do
 
     expect(FarmbotCore.LogExecutor, :execute, fn log ->
       expected =
-        "Farmware did not exit after 60.0 seconds. Terminating :FAKE_PID"
+        "Farmware did not exit after 20.0 minutes. Terminating :FAKE_PID"
 
       assert log.message == expected
       :ok