Skip to content

Commit

Permalink
bump module version for 1.5.4-rc.2 (1515)
Browse files Browse the repository at this point in the history
  • Loading branch information
avtolstoy committed Oct 15, 2020
1 parent f431eb0 commit 902b551
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 5 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/release.sh
Original file line number Diff line number Diff line change
@@ -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 ()
{
Expand Down
4 changes: 2 additions & 2 deletions build/version.mk
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion modules/shared/system_module_version.mk
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 3 additions & 1 deletion system/inc/system_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions system/system-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 902b551

Please sign in to comment.