bump module version to 4.0.1-rc.1 (4004)

particle-iot · Oct 25, 2022 · 06f3770 · 06f3770
1 parent 1389509
commit 06f3770
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 4.0.1-rc.1
+
+### BUGFIXES
+- [wiring] ApplicationWatchdog: fixes potential 2x timeout required to fire [#2536](https://github.com/particle-iot/device-os/pull/2536)
+- [gen3]Fix BLE control request channel sending malformed packets [#2538](https://github.com/particle-iot/device-os/pull/2538)
+- Fix issue with platform_ncp_get_info(0) for quectel platforms [#2532](https://github.com/particle-iot/device-os/pull/2532/)
+- Secures DCT initialization from getting interrupted between creating DCT file and filling it with 0xff to default state [#2530](https://github.com/particle-iot/device-os/pull/2530)
+
+### INTERNAL
+- Use new `prtcl` compile/clean commands for internal CI builds [#2543](https://github.com/particle-iot/device-os/pull/2543)
+- Increase timeouts for internal CI builds on windows [#2545](https://github.com/particle-iot/device-os/pull/2545)
+- HAL wiring api calls to access exflash read/write functions for OTP flash page [#2540](https://github.com/particle-iot/device-os/pull/2540)
+- [hal] wifi: add generic 'world' country code as not every country code is exposed through API [#2539](https://github.com/particle-iot/device-os/pull/2539)
+
 ## 4.0.0
 
 ### DEPRECATION

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:="4.0.0"}
+VERSION=${VERSION:="4.0.1-rc.1"}
 
 function display_help ()
 {

diff --git a/build/version.mk b/build/version.mk
@@ -1,7 +1,7 @@
-VERSION_STRING = 4.0.0
+VERSION_STRING = 4.0.1-rc.1
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 4003
+VERSION = 4004
 
 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 vx.N.x release (e.g. 11 for v0.6.2 to 100 for v0.7.0-rc.1),
 # Bump by 1 for every prerelease or release with the same vx.N.* base.
-COMMON_MODULE_VERSION ?= 4003
+COMMON_MODULE_VERSION ?= 4004
 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
 
 RELEASE_080_MODULE_VERSION_BASE ?= 300

diff --git a/system/inc/system_version.h b/system/inc/system_version.h
@@ -192,7 +192,8 @@ extern "C" {
 #define SYSTEM_VERSION_v400ALPHA2   SYSTEM_VERSION_ALPHA(4, 0, 0, 2)
 #define SYSTEM_VERSION_v400BETA1   SYSTEM_VERSION_BETA(4, 0, 0, 1)
 #define SYSTEM_VERSION_v400         SYSTEM_VERSION_DEFAULT(4, 0, 0)
-#define SYSTEM_VERSION SYSTEM_VERSION_v400
+#define SYSTEM_VERSION_v401RC1        SYSTEM_VERSION_RC(4, 0, 1, 1)
+#define SYSTEM_VERSION SYSTEM_VERSION_v401RC1
 
 // These are required for some of the dynalib checks
 #define SYSTEM_VERSION_v500ALPHA1   SYSTEM_VERSION_ALPHA(5, 0, 0, 1)
@@ -354,6 +355,7 @@ extern "C" {
 #define SYSTEM_VERSION_400ALPHA2
 #define SYSTEM_VERSION_400BETA1
 #define SYSTEM_VERSION_400
+#define SYSTEM_VERSION_401RC1
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {

diff --git a/system/system-versions.md b/system/system-versions.md
@@ -158,6 +158,7 @@
 | 1101 | 4001 | 4.0.0-alpha.2 |      Argon, Boron, B SoM, B5 SoM, Tracker, E Som X |
 | 1101 | 4002 | 4.0.0-beta.1  |      Argon, Boron, B SoM, B5 SoM, Tracker, E Som X |
 | 1101 | 4003 | 4.0.0         |      Argon, Boron, B SoM, B5 SoM, Tracker, E Som X |
+| 1101 | 4004 | 4.0.1-rc.1    |      Argon, Boron, B SoM, B5 SoM, Tracker, E Som X |
 
 
 [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.