diff --git a/CHANGELOG.md b/CHANGELOG.md index db2cc9c0b1..c6bc9ba7c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 4.0.2 + +### BUGFIXES +- [gen3] Use OTP Feature flag to change ADC reference source [#2597](https://github.com/particle-iot/device-os/pull/2597) +- [boron]Use the internal ADC reference on some Gen 3 platforms [#2588](https://github.com/particle-iot/device-os/pull/2588) + ## 4.0.1 ### BUGFIXES diff --git a/build/release.sh b/build/release.sh index dd314bded7..155653a164 100755 --- 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.1"} +VERSION=${VERSION:="4.0.2"} function display_help () { diff --git a/build/version.mk b/build/version.mk index 5dc5d9fc6a..f2040bd303 100755 --- a/build/version.mk +++ b/build/version.mk @@ -1,7 +1,7 @@ -VERSION_STRING = 4.0.1 +VERSION_STRING = 4.0.2 # PRODUCT_FIRMWARE_VERSION reported by default # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release -VERSION = 4005 +VERSION = 4006 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING) diff --git a/modules/shared/system_module_version.mk b/modules/shared/system_module_version.mk index 65dcc8c544..e0e2c30adb 100644 --- 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 ?= 4005 +COMMON_MODULE_VERSION ?= 4006 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 index 8b797e0164..a8b451ac1c 100644 --- a/system/inc/system_version.h +++ b/system/inc/system_version.h @@ -194,7 +194,8 @@ extern "C" { #define SYSTEM_VERSION_v400 SYSTEM_VERSION_DEFAULT(4, 0, 0) #define SYSTEM_VERSION_v401RC1 SYSTEM_VERSION_RC(4, 0, 1, 1) #define SYSTEM_VERSION_v401 SYSTEM_VERSION_DEFAULT(4, 0, 1) -#define SYSTEM_VERSION SYSTEM_VERSION_v401 +#define SYSTEM_VERSION_v402 SYSTEM_VERSION_DEFAULT(4, 0, 2) +#define SYSTEM_VERSION SYSTEM_VERSION_v402 // These are required for some of the dynalib checks #define SYSTEM_VERSION_v500ALPHA1 SYSTEM_VERSION_ALPHA(5, 0, 0, 1) @@ -358,6 +359,7 @@ extern "C" { #define SYSTEM_VERSION_400 #define SYSTEM_VERSION_401RC1 #define SYSTEM_VERSION_401 +#define SYSTEM_VERSION_402 typedef struct __attribute__((packed)) SystemVersionInfo { diff --git a/system/system-versions.md b/system/system-versions.md index 950e780c9b..805e8b4dab 100644 --- a/system/system-versions.md +++ b/system/system-versions.md @@ -160,6 +160,7 @@ | 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 | | 1101 | 4005 | 4.0.1 | Argon, Boron, B SoM, B5 SoM, Tracker, E Som X | +| 1101 | 4006 | 4.0.2 | 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.