Merge pull request #1392 from FarmBot/rel-14.3.2

v14.3.2 Production Release

Author: RickCarlino

.gitignore

@@ -54,6 +54,7 @@ RELEASE_NOTES
 *.pem
 *.db
 *.db-journal
+*.db-shm
 *.lua
 *screenlog*
 *.crashdump

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# 14.3.2
+
+ * Refactor code that generates calendars for FarmEvent resources.
+ * Routine dependency upgrades
+ * Bug fix: FBOS crashes when pinbinding is set to SYNC / REBOOT.
+
 # 14.3.1
 
  * Express firmware bugfix

VERSION

@@ -1 +1 @@
-14.3.1
+14.3.2

farmbot_core/Makefile

@@ -19,6 +19,7 @@ defmodule FarmbotCeleryScript.Scheduler do
 
   use GenServer
   require Logger
+  require FarmbotCore.Logger
   alias FarmbotCeleryScript.{AST, Scheduler, StepRunner}
   alias Scheduler, as: State
 
@@ -50,6 +51,8 @@ defmodule FarmbotCeleryScript.Scheduler do
     GenServer.start_link(__MODULE__, args, opts)
   end
 
+  FarmbotCore.Logger.report_termination()
+
   def register(sch \\ __MODULE__) do
     state = :sys.get_state(sch)
     {:ok, _} = Registry.register(state.registry_name, :dispatch, self())
@@ -120,8 +123,8 @@ defmodule FarmbotCeleryScript.Scheduler do
   end
 
   @impl true
-  def handle_info({:DOWN, ref, :process, pid, _reason}, state) do
-    Logger.debug("Scheduler monitor down: #{inspect(pid)}")
+  def handle_info({:DOWN, ref, :process, pid, reason}, state) do
+    Logger.info("Scheduler crash: #{inspect(reason)}")
 
     state =
       state

farmbot_core/asset.dev.db-shm

@@ -1,9 +1,10 @@
 defmodule FarmbotCore.Asset.FarmEvent do
-  @moduledoc """
-  """
-
   use FarmbotCore.Asset.Schema, path: "/api/farm_events"
-  alias FarmbotCore.Asset.FarmEvent.{BodyNode, Execution}
+  alias FarmbotCore.Asset.FarmEvent.{
+    BodyNode,
+    Execution,
+    Calendar
+  }
 
   schema "farm_events" do
     field(:id, :id)
@@ -65,7 +66,6 @@ defmodule FarmbotCore.Asset.FarmEvent do
     |> validate_required([])
   end
 
-  @compile {:inline, [build_calendar: 2]}
   def build_calendar(%__MODULE__{executable_type: "Regimen"} = fe, _), do: [fe.start_time]
 
   def build_calendar(%__MODULE__{time_unit: "never"} = fe, _), do: [fe.start_time]
@@ -77,31 +77,14 @@ defmodule FarmbotCore.Asset.FarmEvent do
 
     repeat = fe.repeat
     repeat_frequency_seconds = time_unit_to_seconds(fe.time_unit)
-
-    do_build_calendar(
-      current_time_seconds,
-      start_time_seconds,
-      end_time_seconds,
-      repeat,
-      repeat_frequency_seconds
-    ) |> Enum.map(&DateTime.from_unix!/1)
-  end
-
-  def do_build_calendar(_, _, _, _, _), do: :erlang.nif_error("NIF Not loaded")
-
-  @on_load :load_nif
-  def load_nif do
-    require Logger
-    nif_file = '#{:code.priv_dir(:farmbot_core)}/build_calendar'
-
-    case :erlang.load_nif(nif_file, 0) do
-      :ok -> :ok
-      {:error, {:reload, _}} -> :ok
-      {:error, _reason} -> :ok
-    end
+    Calendar.new(current_time_seconds,
+                 end_time_seconds,
+                 repeat,
+                 repeat_frequency_seconds,
+                 start_time_seconds)
+    |> Enum.map(&DateTime.from_unix!/1)
   end
 
-  @compile {:inline, [time_unit_to_seconds: 1]}
   defp time_unit_to_seconds("minutely"), do: 60
   defp time_unit_to_seconds("hourly"), do: 60 * 60
   defp time_unit_to_seconds("daily"), do: 60 * 60 * 24

farmbot_core/c_src/build_calendar/build_calendar.c

@@ -68,7 +68,7 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.PinBinding do
   def handle_cast(:trigger, %{pin_binding: %{special_action: nil} = pin_binding} = state) do
     case Asset.get_sequence(pin_binding.sequence_id) do
       %Sequence{name: name} = seq ->
-        FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing #{name}")
+        FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing #{name}")
 
         AST.decode(seq)
         |> execute(state)
@@ -83,7 +83,7 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.PinBinding do
         :trigger,
         %{pin_binding: %{special_action: "emergency_lock"} = pin_binding} = state
       ) do
-    FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing Emergency Lock")
+    FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing Emergency Lock")
 
     AST.Factory.new()
     |> AST.Factory.rpc_request("pin_binding.#{pin_binding.pin_num}")
@@ -95,7 +95,7 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.PinBinding do
         :trigger,
         %{pin_binding: %{special_action: "emergency_unlock"} = pin_binding} = state
       ) do
-    FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing Emergency Unlock")
+    FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing Emergency Unlock")
 
     AST.Factory.new()
     |> AST.Factory.rpc_request("pin_binding.#{pin_binding.pin_num}")
@@ -104,7 +104,7 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.PinBinding do
   end
 
   def handle_cast(:trigger, %{pin_binding: %{special_action: "power_off"} = pin_binding} = state) do
-    FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing Power Off")
+    FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing Power Off")
 
     AST.Factory.new()
     |> AST.Factory.rpc_request("pin_binding.#{pin_binding.pin_num}")
@@ -116,7 +116,7 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.PinBinding do
         :trigger,
         %{pin_binding: %{special_action: "read_status"} = pin_binding} = state
       ) do
-    FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing Read Status")
+    FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing Read Status")
 
     AST.Factory.new()
     |> AST.Factory.rpc_request("pin_binding.#{pin_binding.pin_num}")
@@ -125,25 +125,19 @@ defimpl FarmbotCore.AssetWorker, for: FarmbotCore.Asset.PinBinding do
   end
 
   def handle_cast(:trigger, %{pin_binding: %{special_action: "reboot"} = pin_binding} = state) do
-    FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing Reboot")
-
-    AST.Factory.new()
-    |> AST.Factory.rpc_request("pin_binding.#{pin_binding.pin_num}")
-    |> AST.Factory.reboot()
-    |> execute(state)
+    FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing Reboot")
+    FarmbotCeleryScript.SysCalls.reboot()
+    {:noreply, state}
   end
 
   def handle_cast(:trigger, %{pin_binding: %{special_action: "sync"} = pin_binding} = state) do
-    FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing Sync")
-
-    AST.Factory.new()
-    |> AST.Factory.rpc_request("pin_binding.#{pin_binding.pin_num}")
-    |> AST.Factory.sync()
-    |> execute(state)
+    FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing Sync")
+    FarmbotCeleryScript.SysCalls.sync()
+    {:noreply, state}
   end
 
   def handle_cast(:trigger, %{pin_binding: %{special_action: "take_photo"} = pin_binding} = state) do
-    FarmbotCore.Logger.info(1, "#{pin_binding} triggered, executing Take Photo")
+    FarmbotCore.Logger.info(1, "#{inspect(pin_binding)} triggered, executing Take Photo")
 
     AST.Factory.new()
     |> AST.Factory.rpc_request("pin_binding.#{pin_binding.pin_num}")