Merge pull request #1514 from FarmBot/staging

v15.4.7

Author: gabrielburnworth

.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2.0
 defaults: &defaults
   working_directory: /nerves/build
   docker:
-    - image: ghcr.io/nerves-project/nerves_system_br:1.24.1
+    - image: ghcr.io/nerves-project/nerves_system_br:1.23.2
 
 install_elixir: &install_elixir
   run:
     name: Install Elixir
     command: |
-      wget https://repo.hex.pm/builds/elixir/v1.15.4-otp-26.zip
-      unzip -d /usr/local/elixir v1.15.4-otp-26.zip
+      wget https://repo.hex.pm/builds/elixir/v1.16.2-otp-26.zip
+      unzip -d /usr/local/elixir v1.16.2-otp-26.zip
       echo 'export PATH=/usr/local/elixir/bin:$PATH' >> $BASH_ENV
 
 install_hex_archives: &install_hex_archives

.tool-versions

@@ -1,2 +1,2 @@
-erlang 26.0.2
-elixir 1.15.4-otp-26
+erlang 26.2.5
+elixir 1.16.2-otp-26

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+# 15.4.7
+
+ * Firmware update to fix calibration deadzone settings.
+ * Add optional arguments to `take_photo` and `take_photo_raw` lua helpers.
+ * Add point group `planted_at`/`created_at` conditional.
+ * Add `utc` and `local_time` lua helpers.
+ * Dependency updates.
+
 # 15.4.6
 
  * Dependency updates (includes `RingLogger.viewer`).

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-**NOTE:** These instructions are for **software developers only.** If you just want to run FarmBot OS on a FarmBot kit you have purchased, please [see these instructions instead](https://software.farm.bot/v14/FarmBot-OS/farmbot-os.html).
+**NOTE:** These instructions are for **software developers only.** If you just want to run FarmBot OS on a FarmBot kit you have purchased, please [see these instructions instead](https://software.farm.bot/docs/farmbot-os).
 
 1. Install the [ASDF Package Manager](https://asdf-vm.com/)
 2. Install Elixir and Erlang via ASDF. The correct version can be found in the [.tool-versions file](https://github.com/FarmBot/farmbot_os/blob/staging/.tool-versions).

ELIXIR_VERSION

@@ -1 +1 @@
-~> 1.15.4
+~> 1.16.2

README.md

@@ -17,7 +17,7 @@ Old versions of FarmBot OS can be found [here](https://github.com/FarmBot/farmbo
 
 ## Installing FBOS on a Device
 
-[END USERS: See the official documentation](https://software.farm.bot/v14/FarmBot-OS/farmbot-os.html)
+[END USERS: See the official documentation](https://software.farm.bot/docs/farmbot-os)
 
 ## Problems?
 

VERSION

@@ -1 +1 @@
-15.4.6
+15.4.7

lib/core/asset/criteria_retriever.ex

@@ -71,7 +71,7 @@ defmodule FarmbotOS.Asset.CriteriaRetriever do
       String.starts_with?(k, meta)
     end)
     |> Enum.map(fn {k, value} ->
-      clean_key = String.slice(k, meta_len..-1)
+      clean_key = String.slice(k, meta_len..-1//1)
       {clean_key, value}
     end)
     |> Enum.reduce(%{}, fn {key, value}, all ->
@@ -152,7 +152,13 @@ defmodule FarmbotOS.Asset.CriteriaRetriever do
           ">"
         end
 
-      {pg, accum ++ [{"created_at", inverted_op, time}]}
+      field =
+        "CASE
+           WHEN pointer_type = 'Plant' THEN planted_at
+           ELSE created_at
+         END"
+
+      {pg, accum ++ [{field, inverted_op, time}]}
     end
   end
 

lib/os/configurator/router.ex

@@ -6,6 +6,7 @@ defmodule FarmbotOS.Configurator.Router do
   require FarmbotTelemetry
 
   import Phoenix.HTML
+  use PhoenixHTMLHelpers
   use Plug.Router
   use Plug.Debugger, otp_app: :farmbot
   alias FarmbotOS.Configurator.ConfigDataLayer

lib/os/lua.ex

@@ -169,7 +169,7 @@ defmodule FarmbotOS.Lua do
       soil_height: &DataManipulation.soil_height/2,
       sort: &DataManipulation.sort/2,
       take_photo_raw: &DataManipulation.take_photo_raw/2,
-      take_photo: execute_script("take-photo"),
+      take_photo: &DataManipulation.take_photo/2,
       toggle_pin: &Firmware.toggle_pin/2,
       uart: [
         {:open, &FarmbotOS.Firmware.LuaUART.open/2},
@@ -178,6 +178,8 @@ defmodule FarmbotOS.Lua do
       update_device: &DataManipulation.update_device/2,
       update_fbos_config: &DataManipulation.update_fbos_config/2,
       update_firmware_config: &DataManipulation.update_firmware_config/2,
+      utc: &Info.utc/2,
+      local_time: &Info.local_time/2,
       verify_tool: &DataManipulation.verify_tool/2,
       wait_ms: &Wait.wait/2,
       wait: &DataManipulation.wait/2,