From 902b551f0c3d2ad21fe07a6277b9076ad5e9d104 Mon Sep 17 00:00:00 2001 From: Andrey Tolstoy Date: Thu, 8 Oct 2020 11:00:12 +0700 Subject: [PATCH] bump module version for 1.5.4-rc.2 (1515) --- CHANGELOG.md | 10 ++++++++++ build/release.sh | 2 +- build/version.mk | 4 ++-- modules/shared/system_module_version.mk | 2 +- system/inc/system_version.h | 4 +++- system/system-versions.md | 1 + 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ab83ad55..bc867234e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 1.5.4-rc.2 + +### BUGFIXES + +- Configure PMIC and FuelGauge interrupt pins as `INPUT_PULLUP` [#2207](https://github.com/particle-iot/device-os/pull/2207) +- [Gen 3 / Cellular] Do not use packet buffers from pool in TX path [#2150](https://github.com/particle-iot/device-os/pull/2150) +- [Gen 3 / Cellular] Call into LwIP PPP code to indicate `PPP_IP` protocol is finished [#2150](https://github.com/particle-iot/device-os/pull/2150) +- [Gen 3] Workaround when unable to obtain DNS servers from remote PPP peer [#2165](https://github.com/particle-iot/device-os/pull/2165) +- [Cellular] When resuming cellular connection, do not run `COPS=0` again to avoid triggering PLMN reselection [#2139](https://github.com/particle-iot/device-os/pull/2139) + ## 1.5.4-rc.1 ### BUGFIXES diff --git a/build/release.sh b/build/release.sh index 851288d603..a42fb6e970 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="1.5.4-rc.1" +VERSION="1.5.4-rc.2" function display_help () { diff --git a/build/version.mk b/build/version.mk index 4f7ce7a055..538f1cf785 100755 --- a/build/version.mk +++ b/build/version.mk @@ -1,7 +1,7 @@ -VERSION_STRING = 1.5.4-rc.1 +VERSION_STRING = 1.5.4-rc.2 # PRODUCT_FIRMWARE_VERSION reported by default # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release -VERSION = 1514 +VERSION = 1515 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING) diff --git a/modules/shared/system_module_version.mk b/modules/shared/system_module_version.mk index 42e1b819d0..7dc32add83 100644 --- 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 ?= 1514 +COMMON_MODULE_VERSION ?= 1515 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART2_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART3_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) diff --git a/system/inc/system_version.h b/system/inc/system_version.h index d46e6d3592..9777321165 100644 --- a/system/inc/system_version.h +++ b/system/inc/system_version.h @@ -154,7 +154,8 @@ extern "C" { #define SYSTEM_VERSION_v152 SYSTEM_VERSION_DEFAULT(1, 5, 2) #define SYSTEM_VERSION_v153TRACKER1 SYSTEM_VERSION_RC(1, 5, 3, 1) #define SYSTEM_VERSION_v154RC1 SYSTEM_VERSION_RC(1, 5, 4, 1) -#define SYSTEM_VERSION SYSTEM_VERSION_v154RC1 +#define SYSTEM_VERSION_v154RC2 SYSTEM_VERSION_RC(1, 5, 4, 2) +#define SYSTEM_VERSION SYSTEM_VERSION_v154RC2 /** * Previously we would set the least significant byte to 0 for the final release, but to make @@ -273,6 +274,7 @@ extern "C" { #define SYSTEM_VERSION_152 #define SYSTEM_VERSION_153TRACKER1 #define SYSTEM_VERSION_154RC1 +#define SYSTEM_VERSION_154RC2 typedef struct __attribute__((packed)) SystemVersionInfo { diff --git a/system/system-versions.md b/system/system-versions.md index 3967272340..5a24cb896f 100644 --- a/system/system-versions.md +++ b/system/system-versions.md @@ -120,6 +120,7 @@ | 502 | 1512 | 1.5.2 | Photon, P1, Electron, Xenon, Argon, Boron, B SoM, B5 SoM | | 502 | 1513 | 1.5.3-tracker.1 | Tracker | | 502 | 1514 | 1.5.4-rc.1 | Photon, P1, Electron, Xenon, Argon, Boron, B SoM, B5 SoM, Tracker | +| 502 | 1515 | 1.5.4-rc.2 | Photon, P1, Electron, Xenon, 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.