Merge pull request #342 from ConnorRigby/master

Update changelog and readme

CHANGELOG.md

@@ -73,9 +73,14 @@
 # 4.0.1
 * fix bug in E-Stop
 
-# 4.0.2
+# 5.0.0
 * add a progress bar to http client for downloads.
 * Bundle new Arduino Firmware.
 * Rewrite Farmware Handler again, to use HTTP/REST this time instead of STDIN/STDOUT.
 * Add location_data to bot state. This includes encoder position.
 * Add `jobs` field to bot state.
+
+# 5.0.1
+* Fix not being able to move to a point in some cases.
+* Fix a sub sequence never returning.
+* add `busy` flag to the bot's state. 

README.md

@@ -13,13 +13,7 @@ if you spot a bug or fix, but for now we suggest obtaining a Raspberry Pi 3 for
 
 |Raspbery Pi Version |
 |---|
-| :star: **[RPi 3 (Ships with FarmBot.io kits)](https://github.com/FarmBot/farmbot_os/releases/download/5.0.0/farmbot-rpi3-5.0.0.img)**|
-<!--
-|  [RPi 2](https://github.com/FarmBot/farmbot_os/releases/download/v3.1.3/farmbot-rpi2-3.1.3.img) |
-|  [RPi 0 and 1](https://github.com/FarmBot/farmbot_os/releases/download/v3.1.3/farmbot-rpi-3.1.3.img) |
-|  [RPi 0w](https://github.com/FarmBot/farmbot_os/releases/download/v3.1.3/farmbot-rpi0w-3.1.3.img) |
--->
-
+| :star: **[RPi 3 (Ships with FarmBot.io kits)](https://github.com/FarmBot/farmbot_os/releases/download/5.0.1/farmbot-rpi3-5.0.1.img)**|
 ---
 
 # Farmbot OS

lib/farmbot/celery_script/commands/execute_script.ex

@@ -19,11 +19,11 @@ defmodule Farmbot.CeleryScript.Command.ExecuteScript do
     new_context = Command.set_user_env(%{}, env_vars, context)
     case Manager.lookup_by_name(context, name) do
       {:ok, %Farmware{} = fw} ->
-        Logger.debug ">> Starting Farmware: #{fw.name}", type: :busy
+        Logger.info ">> Starting Farmware: #{fw.name}", type: :busy
         Runtime.execute(new_context, fw)
       {:error, e}             ->
         raise Error, context: new_context,
-          message: "Could not locate farmware: #{e}"
+          message: "Could not execute farmware #{name} #{String.trim(inspect(e))}"
     end
   end
 end

lib/farmbot/celery_script/commands/sequence.ex

@@ -17,7 +17,6 @@ defmodule Farmbot.CeleryScript.Command.Sequence do
   def run(args, body, %Context{} = context) do
     # rebuild the ast node
     ast          = %Ast{kind: "sequence", args: args, body: body}
-    # Logger.debug "Starting sequence: #{inspect ast}"
     case Farmbot.Sequence.Manager.start_link(context, ast, self()) do
       {:ok, pid} -> wait_for_sequence(pid, context)
       :ignore    ->

lib/farmbot/database.ex

@@ -118,15 +118,12 @@ defmodule Farmbot.Database do
   def sync_module(%Context{} = ctx, module_name, retries) do
     # see: `syncable.ex`. This is some macro magic.
     debug_log "#{module_name |> human_readable_module()} Sync begin."
-    # Logger.debug(">> is syncing: #{module_name |> human_readable_module()}", type: :busy)
 
     if get_awaiting(ctx, module_name) do
       try do
         :ok = module_name.fetch(ctx, {__MODULE__,
         :commit_records,  [ctx, module_name]})
 
-        # debug_log "#{module_name} Sync finish."
-        # Logger.debug(">> synced: #{module_name |> human_readable_module()}", type: :success)
         :ok = unset_awaiting(ctx, module_name)
         :ok
       rescue

lib/farmbot/transport/gen_mqtt/gen_mqtt_client.ex

@@ -18,7 +18,7 @@ defmodule Farmbot.Transport.GenMqtt.Client do
   end
 
   def init({%Context{} = context, %Token{} = token}) do
-    Logger.debug ">> Starting mqtt!"
+    Logger.info ">> Starting mqtt!", type: :busy
     Process.flag(:trap_exit, true)
     # Process.send_after(self(), :r_u_alive_bb?, 1000)
     {:ok, %{token: token, context: context, cs_nodes: []}}
@@ -33,7 +33,7 @@ defmodule Farmbot.Transport.GenMqtt.Client do
       backend     = Logger.Backends.FarmbotLogger
       {:ok, _pid} = Logger.add_backend(backend)
       :ok         = GenEvent.call(Logger, backend, {:context, context})
-      Logger.info ">> is up and running!"
+      Logger.info ">> is up and running!", type: :success
       Farmbot.Transport.force_state_push(context)
     end.()
 

lib/logger/backends/farmbot_logger.ex

@@ -32,6 +32,7 @@ defmodule Logger.Backends.FarmbotLogger do
      | :error
      | :info
      | :fun
+     | :debug
 
   @typedoc """
     Elixir Logger level type
@@ -40,6 +41,7 @@ defmodule Logger.Backends.FarmbotLogger do
     :: :info
      | :warn
      | :error
+     | :debug
 
   @typedoc """
     One day this will me more
@@ -242,10 +244,6 @@ defmodule Logger.Backends.FarmbotLogger do
   end
 
   @spec build_log(String.t, number, rpc_log_type, [channel]) :: log_message
-  defp build_log(message, created_at, :debug, channels) do
-    build_log(message, created_at, :info, channels)
-  end
-
   defp build_log(message, created_at, type, channels) do
     %{message: message,
       created_at: created_at,