Skip to content

Commit 9a624a6

Browse files
keeramisavtolstoy
authored andcommitted
bump module version for 2.2.0-rc.1 (2200)
1 parent be4a022 commit 9a624a6

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

CHANGELOG.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
- [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)
1010
- Trigger a compiler error when a function returning a value does not do so [#2323](https://github.com/particle-iot/device-os/pull/2323)
11-
- [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))
11+
- [Argon] Cache ESP32 MAC address in persistent storage to improve boot-up times [#2327](https://github.com/particle-iot/device-os/pull/2327)
12+
- [Cellular] Add `CellularSignal::isValid()` and `CellularSignal::operator bool()` APIs [#2212](https://github.com/particle-iot/device-os/pull/2212)
1213

1314
### BUGFIXES
1415

@@ -18,10 +19,12 @@
1819
- [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)
1920
- Fix non-MBR-based bootloader updates [#2327]((https://github.com/particle-iot/device-os/pull/2327))
2021

21-
2222
### INTERNAL
23+
2324
- 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)
2425
- [ci] Fix MarkupSafe weirdness [#2317](https://github.com/particle-iot/device-os/pull/2317)
26+
- Add `.bundleignore` for Workbench Device OS source code bundles [#2326](https://github.com/particle-iot/device-os/pull/2326)
27+
- Manage GCC dependencies with `.workbench/manifest.json` [d94f08030](https://github.com/particle-iot/device-os/commit/d94f0803068026d0b2aa0af426ba80c8b62299c7)
2528

2629
## 2.1.0
2730

build/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -o errexit -o pipefail -o noclobber -o nounset
33

4-
VERSION="2.1.0"
4+
VERSION="2.2.0-rc.1"
55

66
function display_help ()
77
{

build/version.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
VERSION_STRING = 2.1.0
1+
VERSION_STRING = 2.2.0-rc.1
22

33
# PRODUCT_FIRMWARE_VERSION reported by default
44
# FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
5-
VERSION = 2101
5+
VERSION = 2200
66

77
CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING)

modules/shared/system_module_version.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Skip to next 100 every v0.x.0 release (e.g. 108 for v0.6.2 to 200 for v0.7.0-rc.1)
22
# Bump by 1 for every prerelease or release with the same v0.x.* base.
3-
COMMON_MODULE_VERSION ?= 2101
3+
COMMON_MODULE_VERSION ?= 2200
44
SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
55
SYSTEM_PART2_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
66
SYSTEM_PART3_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)

system/inc/system_version.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ extern "C" {
169169
#define SYSTEM_VERSION_v201 SYSTEM_VERSION_DEFAULT(2, 0, 1)
170170
#define SYSTEM_VERSION_v210RC1 SYSTEM_VERSION_RC(2, 1, 0, 1)
171171
#define SYSTEM_VERSION_v210 SYSTEM_VERSION_DEFAULT(2, 1, 0)
172-
#define SYSTEM_VERSION SYSTEM_VERSION_v210
172+
#define SYSTEM_VERSION_v220RC1 SYSTEM_VERSION_RC(2, 2, 0, 1)
173+
#define SYSTEM_VERSION SYSTEM_VERSION_v220RC1
173174

174175
/**
175176
* Previously we would set the least significant byte to 0 for the final release, but to make
@@ -303,6 +304,7 @@ extern "C" {
303304
#define SYSTEM_VERSION_201
304305
#define SYSTEM_VERSION_210RC1
305306
#define SYSTEM_VERSION_210
307+
#define SYSTEM_VERSION_220RC1
306308

307309
typedef struct __attribute__((packed)) SystemVersionInfo
308310
{

0 commit comments

Comments
 (0)