bump module version for 1.3.0-alpha.1 (v1300), update CHANGELOG.md

particle-iot · May 31, 2019 · 7f3259a · 7f3259a
1 parent 394f06f
commit 7f3259a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.3.0-alpha.1
+
+>**Note:** If your Gen 3 device does not have a Cloud connection, it is recommended to update system firmware, and then the bootloader via CLI with `particle flash --serial bootloader.bin` (bootloaders found in Github release)
+>
+>This release contains v311 bootloaders.
+
+### FEATURES
+
+- [gen 3] BLE support [#1740](https://github.com/particle-iot/device-os/pull/1740)
+- [gen 3] NFC support [#1606](https://github.com/particle-iot/device-os/pull/1606)
+
+### BUG FIXES
+
+- [gen 3] [bsom] Building platform BSOM results flash overflow. [#1802](https://github.com/particle-iot/device-os/pull/1802)
+- [gen3] [hal] fixes early wakeup by RTC from STOP sleep mode [#1803](https://github.com/particle-iot/device-os/pull/1803)
+
 ## 1.2.1-rc.2
 
 >**Note:** If your Gen 3 device does not have a Cloud connection, it is recommended to update system firmware, and then the bootloader via CLI with `particle flash --serial bootloader.bin` (bootloaders found in Github release)

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="1.2.1-rc.2"
+VERSION="1.3.0-alpha.1"
 
 function display_help ()
 {

diff --git a/build/version.mk b/build/version.mk
@@ -1,7 +1,7 @@
-VERSION_STRING = 1.2.1-rc.2
+VERSION_STRING = 1.3.0-alpha.1
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 1211
+VERSION = 1300
 
 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 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 ?= 1211
+COMMON_MODULE_VERSION ?= 1300
 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
@@ -128,7 +128,8 @@ extern "C" {
 #define SYSTEM_VERSION_v120RC1        SYSTEM_VERSION_RC(1, 2, 0, 1)
 #define SYSTEM_VERSION_v121RC1        SYSTEM_VERSION_RC(1, 2, 1, 1)
 #define SYSTEM_VERSION_v121RC2        SYSTEM_VERSION_RC(1, 2, 1, 2)
-#define SYSTEM_VERSION SYSTEM_VERSION_v121RC2
+#define SYSTEM_VERSION_v130ALPHA1  SYSTEM_VERSION_ALPHA(1, 3, 0, 1)
+#define SYSTEM_VERSION SYSTEM_VERSION_v130ALPHA1
 
 /**
  * Previously we would set the least significant byte to 0 for the final release, but to make
@@ -221,6 +222,7 @@ extern "C" {
 #define SYSTEM_VERSION_120RC1
 #define SYSTEM_VERSION_121RC1
 #define SYSTEM_VERSION_121RC2
+#define SYSTEM_VERSION_130ALPHA1
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {

diff --git a/system/system-versions.md b/system/system-versions.md
@@ -94,6 +94,7 @@
 | 302 | 1202 | 1.2.0-rc.1    |       Core, Photon, P1, Electron, Xenon, Argon, Boron, X SoM, A SoM, B SoM |
 | 310 | 1210 | 1.2.1-rc.1    |       Core, Photon, P1, Electron, Xenon, Argon, Boron, X SoM, A SoM, B SoM |
 | 311 | 1211 | 1.2.1-rc.2    |       Core, Photon, P1, Electron, Xenon, Argon, Boron, X SoM, A SoM, B SoM |
+| 311 | 1300 | 1.3.0-alpha.1 |       Core, Photon, P1, Electron, Xenon, Argon, Boron, X SoM, A SoM, B SoM |
 
 [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.