Merge branch 'staging' into criteria_groups_cleanup

2020-03-10 09:07:45 -05:00 · 2020-03-10 09:07:45 -05:00 · 14f988ec30
parent efa2bff829 655efccbc2
commit 14f988ec30
4 changed files with 3482 additions and 3370 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,11 @@
 # Changelog

+# 9.2.0
+
+ * Support for criteria-based groups.
+ * Genesis v1.5 and Express v1.0 firmware homing updates.
+ * Fix bug where unknown positions would report as -1.
+
 # 9.1.2

 * Genesis v1.5 and Express v1.0 firmware updates.
--- a/2
+++ b/2
@ -1 +1 @@
-9.2.0-rc4
+9.2.0-rc5
--- a/farmbot_firmware/priv/express_k10.hex
+++ b/farmbot_firmware/priv/express_k10.hex
--- a/farmbot_firmware/priv/farmduino_k15.hex
+++ b/farmbot_firmware/priv/farmduino_k15.hex