bump module version number to 3.1.0-rc.1 (3102)

particle-iot · Jun 21, 2021 · dacdf78 · dacdf78
1 parent cc82ea5
commit dacdf78
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,46 @@
+## 3.1.0-rc.1
+
+### FEATURES
+
+- [Gen 3] 256KB application support [#2322](https://github.com/particle-iot/device-os/pull/2322)
+- Support for DTLS connection IDs [#2249](https://github.com/particle-iot/device-os/pull/2249)
+- GCC 10 support [#2288](https://github.com/particle-iot/device-os/pull/2288)
+- [Gen 3] BLE LESC support [#2262](https://github.com/particle-iot/device-os/pull/2262)
+- [Gen 3] BLE 5 PHY_CODED (long range) scanning and advertising support [#2287](https://github.com/particle-iot/device-os/pull/2287) [#2298](https://github.com/particle-iot/device-os/pull/2298) [#2321](https://github.com/particle-iot/device-os/pull/2321)
+- [Tracker] AB1805 native watchdog support [#2316](https://github.com/particle-iot/device-os/pull/2316)
+- [Boron / B SoM / Electron] Support for SARA R410 05.12 modem firmware [#2317](https://github.com/particle-iot/device-os/pull/2317) [#2319](https://github.com/particle-iot/device-os/pull/2319) [#2318](https://github.com/particle-iot/device-os/pull/2318)
+- Add an API to get the maximum supported size of event data [#2315](https://github.com/particle-iot/device-os/pull/2315)
+
+### ENHANCEMENTS
+
+- [Argon] Cache ESP32 MAC address in persistent storage to improve boot-up times [#2327](https://github.com/particle-iot/device-os/pull/2327)
+- [Cellular] Inhibit Cellular URCs before going into sleep to prevent them from triggering wake-up [#2295](https://github.com/particle-iot/device-os/pull/2295) [#2321](https://github.com/particle-iot/device-os/pull/2321)
+- [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)
+- [Photon / P1] Enable LTO [#2288](https://github.com/particle-iot/device-os/pull/2288)
+- Trigger a compiler error when a function returning a value does not do so [#2323](https://github.com/particle-iot/device-os/pull/2323)
+- [Gen 3] Fix non-MBR-based bootloader updates [#2327](https://github.com/particle-iot/device-os/pull/2327)
+
+### BUGFIXES
+
+- [Cellular] Prevent ICCID querying errors when not connected to a cellular network by using airplane mode `CFUN=4` [#2328](https://github.com/particle-iot/device-os/pull/2328)
+- [Photon / P1] Make sure to close all sockets when deinitializing WICED WLAN connectivity subsystem [#2313](https://github.com/particle-iot/device-os/pull/2313) [#2321](https://github.com/particle-iot/device-os/pull/2321)
+- [Gen 2] Fix unexpected network connection establishment after exiting sleep mode when only `Network.on()` was called [#2309](https://github.com/particle-iot/device-os/pull/2309)
+- [Gen 2] Fix unexpected network connection establishment when the modem or WiFi initialization failes, but only `Network.on()` was called [#2309](https://github.com/particle-iot/device-os/pull/2309)
+- Correctly restore network interface power state after waking up from `STOP` or `ULTRA_LOW_POWER` sleep modes [#2308](https://github.com/particle-iot/device-os/pull/2308)
+- Fix the issue that the Particle.disconnect() doesn't clear the auto-connect flag [#2306](https://github.com/particle-iot/device-os/pull/2306)
+- [Electron] Fix unintended modem reset after an ongoing network registartion attempt is actively cancelled by the application [#2307](https://github.com/particle-iot/device-os/pull/2307)
+- Fix `Particle.unsubscribe()` not preserving system subscriptions [#2293](https://github.com/particle-iot/device-os/pull/2293)
+- Querying the value of an empty string variable causes an error [#2297](https://github.com/particle-iot/device-os/pull/2297)
+
+### INTERNAL
+
+- [ci] Remove build directory after finishing the build job [#2311](https://github.com/particle-iot/device-os/pull/2311)
+- [ci] Fix MarkupSafe weirdness [#2314](https://github.com/particle-iot/device-os/pull/2314)
+- 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)
+- Allow clearing session data and running custom setup code in integration tests [#2280](https://github.com/particle-iot/device-os/pull/2280)
+- 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)
+
 ## 3.0.0
 
 ### BREAKING CHANGES

diff --git a/build/release.sh b/build/release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail -o noclobber -o nounset
 
-VERSION="3.0.0"
+VERSION="3.1.0-rc.1"
 
 function display_help ()
 {

diff --git a/build/version.mk b/build/version.mk
@@ -1,7 +1,7 @@
-VERSION_STRING = 3.0.0
+VERSION_STRING = 3.1.0-rc.1
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 3005
+VERSION = 3102
 
 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING)
diff --git 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 ?= 3005
+COMMON_MODULE_VERSION ?= 3102
 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
 SYSTEM_PART2_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
 SYSTEM_PART3_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
@@ -33,15 +33,15 @@ endif
 # Skip to next 100 every v0.x.0 release (e.g. 11 for v0.6.2 to 100 for v0.7.0-rc.1),
 # but only if the bootloader has changed since the last v0.x.0 release.
 # Bump by 1 for every updated bootloader image for a release with the same v0.x.* base.
-BOOTLOADER_VERSION ?= 1005
+BOOTLOADER_VERSION ?= 1100
 
 # The version of the bootloader that the system firmware requires
 # NOTE: this will force the device into safe mode until this dependency is met, which is why
 # this version usually lags behind the current bootloader version, to avoid non-mandatory updates.
 ifeq ($(PLATFORM_GEN),2)
 BOOTLOADER_DEPENDENCY = 1003
 else ifeq ($(PLATFORM_GEN),3)
-BOOTLOADER_DEPENDENCY = 1005
+BOOTLOADER_DEPENDENCY = 1100
 else
 # Some sensible default
 BOOTLOADER_DEPENDENCY = 0

diff --git a/system/inc/system_version.h b/system/inc/system_version.h
@@ -173,7 +173,10 @@ extern "C" {
 #define SYSTEM_VERSION_v300RC1        SYSTEM_VERSION_RC(3, 0, 0, 1)
 #define SYSTEM_VERSION_v300RC2        SYSTEM_VERSION_RC(3, 0, 0, 2)
 #define SYSTEM_VERSION_v300         SYSTEM_VERSION_DEFAULT(3, 0, 0)
-#define SYSTEM_VERSION SYSTEM_VERSION_v300
+#define SYSTEM_VERSION_v310ALPHA1        SYSTEM_VERSION_ALPHA(3, 1, 0, 1)
+#define SYSTEM_VERSION_v310ALPHA2        SYSTEM_VERSION_ALPHA(3, 1, 0, 2)
+#define SYSTEM_VERSION_v310RC1        SYSTEM_VERSION_RC(3, 1, 0, 1)
+#define SYSTEM_VERSION SYSTEM_VERSION_v310RC1
 
 /**
  * Previously we would set the least significant byte to 0 for the final release, but to make
@@ -311,6 +314,9 @@ extern "C" {
 #define SYSTEM_VERSION_300RC1
 #define SYSTEM_VERSION_300RC2
 #define SYSTEM_VERSION_300
+#define SYSTEM_VERSION_310ALPHA1
+#define SYSTEM_VERSION_310ALPHA2
+#define SYSTEM_VERSION_310RC1
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {

diff --git a/system/system-versions.md b/system/system-versions.md
@@ -141,6 +141,9 @@
 | 1005 | 3003 | 3.0.0-rc.1    |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
 | 1005 | 3004 | 3.0.0-rc.2    |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
 | 1005 | 3005 | 3.0.0         |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
+| 1100 | 3100 | 3.1.0-alpha.1 |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
+| 1100 | 3101 | 3.1.0-alpha.2 |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
+| 1100 | 3102 | 3.1.0-rc.1    |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
 
 [1] For 0.8.0-rc.1, The v101 bootloader was also released in the Github releases as v200. Thus the next released bootloader in the 0.8.x line should be v201. As of 4/5/2018: 22 device had v200 bootloaders.