bump module version to 6.2.1 (6201)

particle-iot · Dec 12, 2024 · 0da034f · 0da034f
1 parent 3c00c11
commit 0da034f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,28 @@
+## 6.2.1
+
+### FEATURES
+
+- Expose ICCID to Modem Manager when tethering [#2838](https://github.com/particle-iot/device-os/pull/2838)
+- [Cellular] BG95-S5 support [#2842](https://github.com/particle-iot/device-os/pull/2842)
+- [BLE] `BLE.setAdvertisingScheme()` API [#2837](https://github.com/particle-iot/device-os/pull/2837)
+
+### ENHANCEMENTS
+
+- [Gen 4] Optimize QSPI flash writes (to use highest clock speed and IO mode) and erasures (use 32K and 64K blocks when possible) [#2841](https://github.com/particle-iot/device-os/pull/2841)
+- [Ethernet] Minor performance optimizations [#2846](https://github.com/particle-iot/device-os/pull/2846)
+- [Ethernet] Enable internal pull-up on interrupt line in case external one is not populated to prevent it from floating [684047d7](https://github.com/particle-iot/device-os/commit/684047d7a26f20a002f9c51886421870b5c94f63)
+- [Gen 4] WiFi: Always perform a scan before connect and use both SSID + BSSID to initiate the connection [#2849](https://github.com/particle-iot/device-os/pull/2849)
+- [Cellular] [R510] Extend EHS (Emergency Hardware Shutdown) sequence timing due to reduced clock rate while in (UPSV=1) Power Saving mode [#2850](https://github.com/particle-iot/device-os/pull/2850)
+
+### BUGFIXES
+
+- [Gen 3] Fix DMA issue when writing from internal flash to external flash [#2843](https://github.com/particle-iot/device-os/pull/2841)
+- [Ethernet] Fix default pin configuration/validation [#2846](https://github.com/particle-iot/device-os/pull/2846)
+- [Cellular] [R510] Device OS 6.2.0 unmasked all bands on R510; however LTE Cat-M1 band 71 shall be re-disabled. See our [Technical Advisory Note](https://docs.particle.io/reference/technical-advisory-notices/tan014/) for more info [#2845](https://github.com/particle-iot/device-os/pull/2845)
+- [Gen 4] BLE: Fix a deadlock between `BLE.connect()` and `BLE.peerCentral()` calls in different threads [#2836](https://github.com/particle-iot/device-os/pull/2836)
+- [Gen 4] BLE: Fix connection issues operating in peripheral/central roles concurrently [#2839](https://github.com/particle-iot/device-os/pull/2839)
+
+
 ## 6.2.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=${VERSION:="6.2.0"}
+VERSION=${VERSION:="6.2.1"}
 
 function display_help ()
 {

diff --git a/build/version.mk b/build/version.mk
@@ -1,7 +1,7 @@
-VERSION_STRING = 6.2.0
+VERSION_STRING = 6.2.1
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 6200
+VERSION = 6201
 
 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 ?= 6200
+COMMON_MODULE_VERSION ?= 6201
 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
 
 RELEASE_080_MODULE_VERSION_BASE ?= 300
@@ -14,19 +14,19 @@ USER_PART_MODULE_VERSION ?= 6
 # 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 ?= 3100
+BOOTLOADER_VERSION ?= 3101
 
 ifeq ($(PLATFORM_MCU),rtl872x)
 PREBOOTLOADER_MBR_VERSION ?= 2
-PREBOOTLOADER_PART1_VERSION ?= 9
+PREBOOTLOADER_PART1_VERSION ?= 10
 endif
 
 # 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),3)
 ifeq ($(PLATFORM_MCU),rtl872x)
-BOOTLOADER_DEPENDENCY = 3100
+BOOTLOADER_DEPENDENCY = 3101
 else # ifeq ($(PLATFORM_MCU),rtl872x)
 BOOTLOADER_DEPENDENCY = 3100
 endif # ifeq ($(PLATFORM_GEN),3)
@@ -36,7 +36,7 @@ BOOTLOADER_DEPENDENCY = 0
 endif
 
 ifeq ($(PLATFORM_MCU),rtl872x)
-PREBOOTLOADER_PART1_DEPENDENCY = 9
+PREBOOTLOADER_PART1_DEPENDENCY = 10
 endif
 
 ifeq ($(PLATFORM_GEN),3)

diff --git a/system/inc/system_version.h b/system/inc/system_version.h
@@ -223,7 +223,8 @@ extern "C" {
 #define SYSTEM_VERSION_v611         SYSTEM_VERSION_DEFAULT(6, 1, 1)
 #define SYSTEM_VERSION_v612         SYSTEM_VERSION_DEFAULT(6, 1, 2)
 #define SYSTEM_VERSION_v620         SYSTEM_VERSION_DEFAULT(6, 2, 0)
-#define SYSTEM_VERSION SYSTEM_VERSION_v620
+#define SYSTEM_VERSION_v621         SYSTEM_VERSION_DEFAULT(6, 2, 1)
+#define SYSTEM_VERSION SYSTEM_VERSION_v621
 
 /**
  * Previously we would set the least significant byte to 0 for the final release, but to make
@@ -411,6 +412,7 @@ extern "C" {
 #define SYSTEM_VERSION_611
 #define SYSTEM_VERSION_612
 #define SYSTEM_VERSION_620
+#define SYSTEM_VERSION_621
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {

diff --git a/system/system-versions.md b/system/system-versions.md
@@ -198,6 +198,7 @@
 | 3001 | 6101 | 6.1.1         |      Argon, Boron, B SoM, B5 SoM, Tracker, E Som X |
 | 3002 | 6102 | 6.1.2         |      Argon, Boron, B SoM, B5 SoM, Tracker, E Som X |
 | 3100 | 6200 | 6.2.0         |      Argon, Boron, B SoM, B5 SoM, Tracker, Tracker M, E Som X, M SoM, P2 |
+| 3101 | 6201 | 6.2.1         |      Argon, Boron, B SoM, B5 SoM, Tracker, Tracker M, E Som X, M SoM, P2 |
 
 [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.