spacecruft/farmbot_os
spacecruft/farmbot_os
1
0
Fork 0
Code Issues Pull requests Releases Activity

Maybe fix FarmEvent - Sequence execution

Browse source
This commit is contained in:
Connor Rigby 2017-11-16 07:20:12 -08:00
parent b355aa4341
commit 9eb189ec44
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/farmbot/farm_event/manager.ex
View file

@ -182,15 +182,6 @@ defmodule Farmbot.FarmEvent.Manager do
# Checks if we shoudl run a sequence or not. returns {event | nil, time | nil}
defp should_run_sequence?(calendar, last_time, now)
defp should_run_sequence?(nil, last_time, now) do
Logger.debug 3, "Checking sequence with no calendar."
if is_nil(last_time) do
{true, now}
else
{false, last_time}
end
end
# if there is no last time, check if time is passed now within 60 seconds.
defp should_run_sequence?([first_time | _], nil, now) do;
@ -207,6 +198,15 @@ defmodule Farmbot.FarmEvent.Manager do
end
end
defp should_run_sequence?(nil, last_time, now) do
Logger.debug 3, "Checking sequence with no calendar."
if is_nil(last_time) do
{true, now}
else
{false, last_time}
end
end
defp should_run_sequence?(calendar, last_time, now) do
# get rid of all the items that happened before last_time
filtered_calendar = Enum.filter(calendar, fn(iso_time) ->