Skip to content

Commit

Permalink
bump module version to 3.3.1 (3302)
Browse files Browse the repository at this point in the history
  • Loading branch information
scott-brust committed Nov 10, 2022
1 parent d6af9a8 commit 754c9cd
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 3.3.1

### BUGFIXES

- [Boron / B SoM] R410 PPP crash in network phase workaround [#2571](https://github.com/particle-iot/device-os/pull/2571)
- [Cellular] R410 initialization SIM failure workaround [#2573](https://github.com/particle-iot/device-os/pull/2573)

## 3.3.0

### FEATURES
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=${VERSION:="3.3.0"}
VERSION=${VERSION:="3.3.1"}

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 = 3.3.0
VERSION_STRING = 3.3.1

# PRODUCT_FIRMWARE_VERSION reported by default
# FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
VERSION = 3301
VERSION = 3302

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 ?= 3301
COMMON_MODULE_VERSION ?= 3302
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 @@ -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_v331 SYSTEM_VERSION_DEFAULT(3, 3, 1)
#define SYSTEM_VERSION SYSTEM_VERSION_v331

/**
* Previously we would set the least significant byte to 0 for the final release, but to make
Expand Down Expand Up @@ -341,6 +342,7 @@ extern "C" {
#define SYSTEM_VERSION_320
#define SYSTEM_VERSION_330RC1
#define SYSTEM_VERSION_330
#define SYSTEM_VERSION_331

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 @@ -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 | 3302 | 3.3.1 | Photon, P1, Electron, 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 754c9cd

Please sign in to comment.