Merge pull request #430 from FarmBot/staging

6.1.2
FarmBot · Jan 29, 2018 · 046dfd7 · 046dfd7
2 parents 5aef4ae + a195bf1
commit 046dfd7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 6.1.2
+* Fix fw hardware being reset on os upgrade.
+* Bump arduino-firmware version to 6.0.1
+
 # 6.1.1
 * Fix bug that caused the "update" button on the frontend to give an error log.
 * Fix flashing `beta` channel updates.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.1.1
+6.1.2
diff --git a/c_src/farmbot-arduino-firmware b/c_src/farmbot-arduino-firmware
diff --git a/config/config.exs b/config/config.exs
@@ -46,7 +46,7 @@ config :farmbot, :behaviour,
 config :farmbot, :farmware,
   first_part_farmware_manifest_url: "https://raw.githubusercontent.com/FarmBot-Labs/farmware_manifests/master/manifest.json"
 
-config :farmbot, expected_fw_versions: ["6.0.0.F", "6.0.0.R"]
+config :farmbot, expected_fw_versions: ["6.0.1.F", "6.0.1.R"]
 
 case target do
   "host" ->

diff --git a/nerves/target/update_handler.ex b/nerves/target/update_handler.ex
@@ -15,7 +15,9 @@ defmodule Farmbot.Target.UpdateHandler do
   end
 
   def post_update do
-    Farmbot.Firmware.UartHandler.Update.maybe_update_firmware()
+    alias Farmbot.Firmware.UartHandler.Update
+    hw = Farmbot.System.ConfigStorage.get_config_value(:string, "settings", "firmware_hardware")
+    Update.maybe_update_firmware(hw)
     :ok
   end