Merge pull request #1520 from FarmBot/staging

v15.4.11

Author: gabrielburnworth

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 15.4.11
+
+ * Force push state update upon `read_status`.
+ * Add Genesis v1.8 firmware.
+
 # 15.4.10
 
  * Prevent unnecessary scheduler exit upon encountering duplicate variables when one is a placeholder.

FEATURE_MIN_VERSIONS.json

@@ -17,6 +17,7 @@
   "farmduino_k14": "6.4.4",
   "farmduino_k15": "9.0.0",
   "farmduino_k16": "14.2.1",
+  "farmduino_k18": "15.4.11",
   "firmware_restart": "8.0.0",
   "flash_firmware": "8.0.0",
   "groups": "8.1.0",

VERSION

@@ -1 +1 @@
-15.4.10
+15.4.11

lib/ext/mqtt/bot_state_handler.ex

@@ -37,7 +37,7 @@ defmodule FarmbotOS.MQTT.BotStateHandler do
   end
 
   def handle_cast(:reload, state) do
-    {:noreply, broadcast!(state)}
+    {:noreply, broadcast!(state, true)}
   end
 
   def handle_info({BotState, _}, state) do
@@ -49,10 +49,10 @@ defmodule FarmbotOS.MQTT.BotStateHandler do
     {:noreply, state}
   end
 
-  def broadcast!(%{last_broadcast: last} = state) do
+  def broadcast!(%{last_broadcast: last} = state, force \\ false) do
     next = BotState.fetch()
 
-    if next != last do
+    if next != last || force do
       json =
         next
         |> BotStateNG.view()

lib/firmware/flash_utils.ex

@@ -10,6 +10,7 @@ defmodule FarmbotOS.Firmware.FlashUtils do
   def find_hex_file("farmduino_k15"), do: find("farmduino_k15.hex")
   def find_hex_file("farmduino_k16"), do: find("farmduino_k16.hex")
   def find_hex_file("farmduino_k17"), do: find("farmduino_k17.hex")
+  def find_hex_file("farmduino_k18"), do: find("farmduino_k18.hex")
   def find_hex_file("farmduino"), do: find("farmduino.hex")
   def find_hex_file("none"), do: find("eeprom_clear.ino.hex")
 

lib/firmware/uart_detector.ex

@@ -14,6 +14,7 @@ defmodule FarmbotOS.Firmware.UARTDetector do
     "farmduino_k15" => "ttyACM0",
     "farmduino_k16" => "ttyACM0",
     "farmduino_k17" => "ttyACM0",
+    "farmduino_k18" => "ttyACM0",
     "farmduino" => "ttyACM0"
   }