bump module version to 4.0.0-alpha.1 (4000)

particle-iot · May 20, 2022 · 9cc70b8 · 9cc70b8
1 parent f6eeaba
commit 9cc70b8
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,40 @@
+## 4.0.0-alpha.1
+
+> ## :warning: Please note this is in internal release, do not use on production devices!
+
+### DEPRECATION
+
+- [deprecation][gen2] supply secure [#2442](https://github.com/particle-iot/device-os/pull/2442)
+- [deprecation] Adds warning to some deprecated API's that will be removed in Device OS 5.x [#2445](https://github.com/particle-iot/device-os/pull/2445)
+- [deprecation] PRODUCT_ID macro [#2446](https://github.com/particle-iot/device-os/pull/2446)
+- [deprecation] remove setup_done flag and add deprecation notice [#2447](https://github.com/particle-iot/device-os/pull/2447)
+
+### FEATURES
+
+- [ota] new API System.updateStatus() [#2344](https://github.com/particle-iot/device-os/pull/2344)
+
+### ENHANCEMENTS
+
+- [gen3] wifi: add dhcp dns info to wifi config [#2440](https://github.com/particle-iot/device-os/pull/2440)
+- [ota] Additional state for firmware update checks [#2344](https://github.com/particle-iot/device-os/pull/2344)
+- Use a custom content type with CID packets when resuming the session [#2441](https://github.com/particle-iot/device-os/pull/2441)
+
+### BUGFIXES
+
+- [gen3] fixes hardfault during low level USB peripheral initialization under an atomic section [#2448](https://github.com/particle-iot/device-os/pull/2448)
+- [gen3] Device unable to enter listening mode with button press [#2451](https://github.com/particle-iot/device-os/pull/2451)
+- Return relevant error from control request to enter listening mode [#2419](https://github.com/particle-iot/device-os/pull/2419)
+
+
+### INTERNAL
+
+- [ci] minor update sc-101315/device-os-manifest [#2449](https://github.com/particle-iot/device-os/pull/2449)
+- [ci] chore/ci-less-frequent-cross-platform-build-checks [#2434](https://github.com/particle-iot/device-os/pull/2434)
+- [docs] Update dependencies for ARM GCC 10.2.1 [#2431](https://github.com/particle-iot/device-os/pull/2431)
+- [gen3] suppress certain reviewed GCC warnings [sc-100940] [#2420](https://github.com/particle-iot/device-os/pull/2420)
+- [ci] feature/sc-100324/ci-build-cross-platform [#2418](https://github.com/particle-iot/device-os/pull/2418)
+- [test] Wi-Fi resolve test improvements [#2454](https://github.com/particle-iot/device-os/pull/2454)
+
 ## 3.3.0
 
 ### FEATURES

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

diff --git a/build/version.mk b/build/version.mk
@@ -1,7 +1,7 @@
-VERSION_STRING = 3.3.0
+VERSION_STRING = 4.0.0-alpha.1
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 3301
+VERSION = 4000
 
 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 ?= 3301
+COMMON_MODULE_VERSION ?= 4000
 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
@@ -188,7 +188,8 @@ extern "C" {
 #define SYSTEM_VERSION_v320         SYSTEM_VERSION_DEFAULT(3, 2, 0)
 #define SYSTEM_VERSION_v330RC1        SYSTEM_VERSION_RC(3, 3, 0, 1)
 #define SYSTEM_VERSION_v330         SYSTEM_VERSION_DEFAULT(3, 3, 0)
-#define SYSTEM_VERSION SYSTEM_VERSION_v330
+#define SYSTEM_VERSION_v400ALPHA1   SYSTEM_VERSION_ALPHA(4, 0, 0, 1)
+#define SYSTEM_VERSION SYSTEM_VERSION_v400ALPHA1
 
 /**
  * Previously we would set the least significant byte to 0 for the final release, but to make
@@ -341,6 +342,7 @@ extern "C" {
 #define SYSTEM_VERSION_320
 #define SYSTEM_VERSION_330RC1
 #define SYSTEM_VERSION_330
+#define SYSTEM_VERSION_400ALPHA1
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {

diff --git a/system/system-versions.md b/system/system-versions.md
@@ -154,6 +154,7 @@
 | 1100 | 3201 | 3.2.0         |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
 | 1100 | 3300 | 3.3.0-rc.1    |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
 | 1100 | 3301 | 3.3.0         |      Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
+| 1100 | 4000 | 4.0.0-alpha.1 |      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.