bump module version to 4.1.0 (4100)

Author: technobly

CHANGELOG.md

@@ -1,3 +1,31 @@
+## 4.1.0
+
+### FEATURES
+
+- Static IP configuration support [#2621](https://github.com/particle-iot/device-os/pull/2621)
+- Hardware watchdog [#2595](https://github.com/particle-iot/device-os/pull/2595)[#2626](https://github.com/particle-iot/device-os/pull/2626)
+- Server key rotation [#2570](https://github.com/particle-iot/device-os/pull/2570) [#2578](https://github.com/particle-iot/device-os/pull/2578) [#2563](https://github.com/particle-iot/device-os/pull/2563)
+
+### BUGFIXES
+
+- [nRF52] UART sleep/wakeup [#2652](https://github.com/particle-iot/device-os/pull/2652)
+- [nRF52] watchdog timeout is not accurate [#2635](https://github.com/particle-iot/device-os/pull/2635)
+- Fix inconsistent BLE state issue [#2629](https://github.com/particle-iot/device-os/pull/2629)
+- [wiring][gen3] Allow gen3 to select internal ADC reference source [#2619](https://github.com/particle-iot/device-os/pull/2619)
+- [nRF52] BLE plus RTC sleep causes hardfault [#2615](https://github.com/particle-iot/device-os/pull/2615)
+- System setup and BLE threading improvements [#2587](https://github.com/particle-iot/device-os/pull/2587)
+- [quectel] Account for "eMTC" type while obtaining signal values [#2589](https://github.com/particle-iot/device-os/pull/2589)
+- Fix i2c hal deadlock [#2572](https://github.com/particle-iot/device-os/pull/2572)
+- [r510] enable PS (packet switched) Only mode for R510 modems (Boron/BSoM/ESoMX) [#2640](https://github.com/particle-iot/device-os/pull/2640) [See TAN012](https://docs.particle.io/reference/technical-advisory-notices/tan012/)
+
+### INTERNAL
+
+- [test] turn off NCP before testing wiring/watchdog [#2627](https://github.com/particle-iot/device-os/pull/2627)
+- [test] Remove manual wakeup. Hibernate + watchdog on platforms that support it [#2620](https://github.com/particle-iot/device-os/pull/2620)
+- [test] add more watchdog test cases [#2617](https://github.com/particle-iot/device-os/pull/2617)
+- [test] mailbox support and support for resets within tests [#2611](https://github.com/particle-iot/device-os/pull/2611)
+- Move `no_fixture_i2c` to correct dir and symlink to `integration/wiring` [#2558](https://github.com/particle-iot/device-os/pull/2558)
+
 ## 4.0.2
 
 ### BUGFIXES

build/release.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail -o noclobber -o nounset
 
-VERSION=${VERSION:="4.0.2"}
+VERSION=${VERSION:="4.1.0"}
 
 function display_help ()
 {

build/version.mk

@@ -1,7 +1,7 @@
-VERSION_STRING = 4.0.2
+VERSION_STRING = 4.1.0
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 4006
+VERSION = 4100
 
 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING)

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 ?= 4006
+COMMON_MODULE_VERSION ?= 4100
 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
 
 RELEASE_080_MODULE_VERSION_BASE ?= 300
@@ -14,13 +14,13 @@ USER_PART_MODULE_VERSION ?= 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),
 # but only if the bootloader has changed since the last vx.N.x release.
 # Bump by 1 for every updated bootloader image for a release with the same vx.N.* base.
-BOOTLOADER_VERSION ?= 1101
+BOOTLOADER_VERSION ?= 1200
 
 # The version of the bootloader that the system firmware requires
 # NOTE: this will force the device into safe mode until this dependency is met, which is why
 # this version usually lags behind the current bootloader version, to avoid non-mandatory updates.
 ifeq ($(PLATFORM_GEN),3)
-BOOTLOADER_DEPENDENCY = 1101
+BOOTLOADER_DEPENDENCY = 1200
 else
 # Some sensible default
 BOOTLOADER_DEPENDENCY = 0

system/inc/system_version.h

@@ -195,12 +195,19 @@ extern "C" {
 #define SYSTEM_VERSION_v401RC1        SYSTEM_VERSION_RC(4, 0, 1, 1)
 #define SYSTEM_VERSION_v401         SYSTEM_VERSION_DEFAULT(4, 0, 1)
 #define SYSTEM_VERSION_v402         SYSTEM_VERSION_DEFAULT(4, 0, 2)
-#define SYSTEM_VERSION SYSTEM_VERSION_v402
+#define SYSTEM_VERSION_v410         SYSTEM_VERSION_DEFAULT(4, 1, 0)
+#define SYSTEM_VERSION SYSTEM_VERSION_v410
 
 // These are required for some of the dynalib checks
 #define SYSTEM_VERSION_v500ALPHA1   SYSTEM_VERSION_ALPHA(5, 0, 0, 1)
 #define SYSTEM_VERSION_v500ALPHA2   SYSTEM_VERSION_ALPHA(5, 0, 0, 2)
 #define SYSTEM_VERSION_v500         SYSTEM_VERSION_DEFAULT(5, 0, 0)
+#define SYSTEM_VERSION_v501         SYSTEM_VERSION_DEFAULT(5, 0, 1)
+#define SYSTEM_VERSION_v510         SYSTEM_VERSION_DEFAULT(5, 1, 0)
+#define SYSTEM_VERSION_v520         SYSTEM_VERSION_DEFAULT(5, 2, 0)
+#define SYSTEM_VERSION_v530         SYSTEM_VERSION_DEFAULT(5, 3, 0)
+#define SYSTEM_VERSION_v531         SYSTEM_VERSION_DEFAULT(5, 3, 1)
+#define SYSTEM_VERSION_v532         SYSTEM_VERSION_DEFAULT(5, 3, 2)
 
 /**
  * Previously we would set the least significant byte to 0 for the final release, but to make
@@ -360,6 +367,7 @@ extern "C" {
 #define SYSTEM_VERSION_401RC1
 #define SYSTEM_VERSION_401
 #define SYSTEM_VERSION_402
+#define SYSTEM_VERSION_410
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {

system/system-versions.md

@@ -161,6 +161,7 @@
 | 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 |
+| 1200 | 4100 | 4.1.0         |      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.