diff --git a/CHANGELOG.md b/CHANGELOG.md index 1df438990b..fabc6ba424 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ - [Gen 3] Remove XIP support for accessing the external flash [#2302](https://github.com/particle-iot/device-os/pull/2302) [#2321](https://github.com/particle-iot/device-os/pull/2321) - Trigger a compiler error when a function returning a value does not do so [#2323](https://github.com/particle-iot/device-os/pull/2323) -- [ESP32] Prevent long boot times of ESP32-based devices (mainly Argon) which may have originated after removing XIP support [#2327]((https://github.com/particle-iot/device-os/pull/2327)) +- [Argon] Cache ESP32 MAC address in persistent storage to improve boot-up times [#2327](https://github.com/particle-iot/device-os/pull/2327) +- [Cellular] Add `CellularSignal::isValid()` and `CellularSignal::operator bool()` APIs [#2212](https://github.com/particle-iot/device-os/pull/2212) ### BUGFIXES @@ -18,10 +19,12 @@ - [B5 SoM / Tracker] Fixes external flash DFU definition on in bootloader to use 4KB sectors [399b8a0](https://github.com/particle-iot/device-os/pull/2321/commits/399b8a085898101adcf396ef03ef7bb9bbbf479c) [#2321](https://github.com/particle-iot/device-os/pull/2321) - Fix non-MBR-based bootloader updates [#2327]((https://github.com/particle-iot/device-os/pull/2327)) - ### INTERNAL + - Add an integration test to validate network/cloud connection time SLOs [#2312](https://github.com/particle-iot/device-os/pull/2312) [#2320](https://github.com/particle-iot/device-os/pull/2320) [#2321](https://github.com/particle-iot/device-os/pull/2321) - [ci] Fix MarkupSafe weirdness [#2317](https://github.com/particle-iot/device-os/pull/2317) +- Add `.bundleignore` for Workbench Device OS source code bundles [#2326](https://github.com/particle-iot/device-os/pull/2326) +- Manage GCC dependencies with `.workbench/manifest.json` [d94f08030](https://github.com/particle-iot/device-os/commit/d94f0803068026d0b2aa0af426ba80c8b62299c7) ## 2.1.0 diff --git a/build/release.sh b/build/release.sh index f8c9882f1d..cbb5af2d9b 100755 --- a/build/release.sh +++ b/build/release.sh @@ -1,7 +1,7 @@ #!/bin/bash set -o errexit -o pipefail -o noclobber -o nounset -VERSION="2.1.0" +VERSION="2.2.0-rc.1" function display_help () { diff --git a/build/version.mk b/build/version.mk index e7f9b43e87..3911fcb4f8 100755 --- a/build/version.mk +++ b/build/version.mk @@ -1,7 +1,7 @@ -VERSION_STRING = 2.1.0 +VERSION_STRING = 2.2.0-rc.1 # PRODUCT_FIRMWARE_VERSION reported by default # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release -VERSION = 2101 +VERSION = 2200 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING) diff --git a/modules/shared/system_module_version.mk b/modules/shared/system_module_version.mk index 185ef77be0..a120cd0307 100644 --- a/modules/shared/system_module_version.mk +++ b/modules/shared/system_module_version.mk @@ -1,6 +1,6 @@ # Skip to next 100 every v0.x.0 release (e.g. 108 for v0.6.2 to 200 for v0.7.0-rc.1) # Bump by 1 for every prerelease or release with the same v0.x.* base. -COMMON_MODULE_VERSION ?= 2101 +COMMON_MODULE_VERSION ?= 2200 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART2_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART3_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) diff --git a/system/inc/system_version.h b/system/inc/system_version.h index a54aad696c..5b5afe0272 100644 --- a/system/inc/system_version.h +++ b/system/inc/system_version.h @@ -169,7 +169,8 @@ extern "C" { #define SYSTEM_VERSION_v201 SYSTEM_VERSION_DEFAULT(2, 0, 1) #define SYSTEM_VERSION_v210RC1 SYSTEM_VERSION_RC(2, 1, 0, 1) #define SYSTEM_VERSION_v210 SYSTEM_VERSION_DEFAULT(2, 1, 0) -#define SYSTEM_VERSION SYSTEM_VERSION_v210 +#define SYSTEM_VERSION_v220RC1 SYSTEM_VERSION_RC(2, 2, 0, 1) +#define SYSTEM_VERSION SYSTEM_VERSION_v220RC1 /** * Previously we would set the least significant byte to 0 for the final release, but to make @@ -303,6 +304,7 @@ extern "C" { #define SYSTEM_VERSION_201 #define SYSTEM_VERSION_210RC1 #define SYSTEM_VERSION_210 +#define SYSTEM_VERSION_220RC1 typedef struct __attribute__((packed)) SystemVersionInfo {