Merge pull request #1338 from FarmBot/staging

Publish v14 to production

Author: RickCarlino

.circleci/config.yml

@@ -193,41 +193,6 @@ jobs:
       - store_artifacts:
           path: farmbot_celery_script/cover
 
-  test_farmbot_firmware:
-    <<: *defaults
-    environment:
-      MIX_ENV: test
-      MIX_TARGET: host
-      NERVES_LOG_DISABLE_PROGRESS_BAR: "yes"
-      ELIXIR_VERSION: 1.10.4
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v14-fbfw-test-dependency-cache-{{ checksum "farmbot_firmware/mix.lock" }}
-      - <<: *install_elixir
-      - <<: *install_hex_archives
-      - run:
-          name: Test Farmbot Firmware
-          working_directory: /nerves/build/farmbot_firmware
-          command: |
-            mix deps.get
-            mix compile
-            mix format --check-formatted
-            mix coveralls.json
-            bash <(curl -s https://codecov.io/bash)
-      - save_cache:
-          key: v14-fbfw-test-dependency-cache-{{ checksum "farmbot_firmware/mix.lock" }}
-          paths:
-            - farmbot_firmware/_build/test
-            - farmbot_firmware/deps
-      - save_cache:
-          key: v14-fbfw-coverage-cache-{{ .Branch }}-{{ .Revision }}
-          paths:
-            - farmbot_firmware/cover
-      - store_artifacts:
-          path: farmbot_firmware/cover
-
   test_farmbot_core:
     <<: *defaults
     environment:
@@ -464,12 +429,6 @@ workflows:
             branches:
               ignore:
                 - main
-      - test_farmbot_firmware:
-          context: org-global
-          filters:
-            branches:
-              ignore:
-                - main
       - test_farmbot_core:
           context: org-global
           filters:

.gitignore

@@ -38,7 +38,6 @@ scratchpad.*
 
 # Various env vars.
 .env
-scripts/mqtt.py
 
 # Fwup keys aren't stored here, but just in case.
 *.priv

.gitmodules

@@ -1,5 +1,14 @@
 # Changelog
 
+# 14.0.0
+
+ * Complete overhaul of firmware handler in FBOS.
+ * Genesis and Express firmware updates.
+ * Ability to use `custom.hex` firmware file in user data partition instead of default firmware.
+ * Ability to detect missing boot loader.
+ * Bug fix for devices that became throttled after long disconnects.
+ * Alpha support for 3rd paty UART devices in Lua sandbox.
+
 # 13.2.0
 
  * Expose `set_pin_io_mode` to Lua (feature request from forum use @JoeHou)

CHANGELOG.md

@@ -1,10 +1,9 @@
 # Jan - Mar 2021
 
-| Project               |1/1/20 |2/6/20 |3/4/20 |3/26/21|
-|-----------------------|-------|-------|-------|-------|
-| farmbot_celery_script | 53.7% | 54.0% |54.0%  |73.8%  |
-| farmbot_core          | 22.2% | 19.8% |26.3%  |45.5%  |
-| farmbot_ext           | 53.6% | 52.7% |38.1%  |50.1%  |
-| farmbot_firmware      | 13.8% | 56.4% |62.0%  |71.2%  |
-| farmbot_os            | 22.0% | 27.6% |45.3%  |57.7%  |
-| farmbot_telemetry     | ??.?% | ??.?% |??.?%  |41.4%  |
+| Project               |1/1/20 |2/6/20 |3/4/20 |3/26/21|5/24/21|
+|-----------------------|-------|-------|-------|-------|-------|
+| farmbot_celery_script | 53.7% | 54.0% |54.0%  |73.8%  |73.8%  |
+| farmbot_core          | 22.2% | 19.8% |26.3%  |45.5%  |48.3%  |
+| farmbot_ext           | 53.6% | 52.7% |38.1%  |50.1%  |58.0%  |
+| farmbot_os            | 22.0% | 27.6% |45.3%  |57.7%  |58.4%  |
+| farmbot_telemetry     | ??.?% | ??.?% |??.?%  |41.4%  |41.4%  |

COVERAGE.md

@@ -4,6 +4,7 @@
   "api_pin_bindings": "6.4.4",
   "assertion_block": "8.0.0",
   "backscheduled_regimens": "6.4.0",
+  "calibration_retries": "14.0.0",
   "change_ownership": "6.3.0",
   "computed_move": "11.0.0",
   "criteria_groups": "9.2.2",
@@ -24,12 +25,14 @@
   "none_firmware": "8.0.0",
   "api_ota_releases": "11.1.0",
   "ota_update_hour": "8.2.3",
+  "quiet_motors": "14.0.0",
   "rpi_led_control": "6.4.4",
   "safe_height_input": "12.1.0",
   "sensors": "6.3.0",
   "soil_height": "12.1.0",
   "update_resource": "10.0.0",
   "use_update_channel": "6.4.12",
   "variables": "8.0.0",
-  "z2_firmware_params": "12.0.0"
+  "z2_firmware_params": "12.0.0",
+  "z2_firmware_params_all": "14.0.0"
 }

FEATURE_MIN_VERSIONS.json

@@ -15,7 +15,6 @@ endif
 PROJECTS := farmbot_celery_script \
 						farmbot_core \
 						farmbot_ext \
-						farmbot_firmware \
 						farmbot_os \
 						farmbot_telemetry
 

Makefile

@@ -1 +1 @@
-13.2.0
+14.0.0

VERSION

@@ -58,6 +58,5 @@ The FarmBot OS application is broken into several sub applications.
   * [farmbot_celery_script](/docs/project/farmbot_celery_script.md)
   * [farmbot_core](/docs/project/farmbot_core.md)
   * [farmbot_ext](/docs/project/farmbot_ext.md)
-  * [farmbot_firmware](/docs/project/farmbot_firmware.md)
   * [farmbot_os](/docs/project/farmbot_os.md)
   * [farmbot_telemetry](/docs/project/farmbot_telemetry.md)