Skip to content

Commit

Permalink
bump system (v303) for 0.8.0-rc.4, update CHANGELOG.md
Browse files Browse the repository at this point in the history
  • Loading branch information
technobly committed May 4, 2018
1 parent 612ee42 commit 6057b7c
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 17 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 0.8.0-rc.4

### ENHANCEMENTS

- [Electron/Photon/P1] Increase Device OS API argument lengths. More data in Functions, Variables, Publish, Subscribe... oh my! [#1537](https://github.com/particle-iot/firmware/pull/1537)

### BUGFIXES

- [Electron] `Particle.keepAlive()` API was broken since v0.6.2-rc.2 firmware on Electron where the System would override an early set User ping interval. This required a workaround of updating the keepAlive after the System made a connection to the Cloud. See issue #1482 for workaround. [#1536](https://github.com/particle-iot/firmware/pull/1536)
- [Electron] Fixes missing URCs for received data during TX or RX socket operations. This caused the modem not to be able to receive further data properly until it re-connected to the Cloud which it would do automatically but usually after a short or longer period of time. [#1530](https://github.com/particle-iot/firmware/pull/1530)

## 0.8.0-rc.3

### ENHANCEMENTS
Expand Down
36 changes: 25 additions & 11 deletions build/release.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
VERSION="0.8.0-rc.3"
VERSION="0.8.0-rc.4"

function release_file()
{
name=$1
ext=$2
cp ../build/target/$name/platform-$PLATFORM_ID-m/$name.$ext $OUT/$name-$VERSION-$PLATFORM.$ext
suffix=$3
cp ../build/target/$name/platform-$PLATFORM_ID-$suffix/$name.$ext $OUT/$name-$VERSION-$PLATFORM.$ext
}

function release_file_core()
Expand All @@ -16,12 +17,13 @@ function release_file_core()

function release_binary()
{
release_file $1 bin
suffix=${2:-m}
release_file $1 bin $suffix
cp $OUT/$1-$VERSION-$PLATFORM.bin $BINARIES_OUT/$1-$VERSION-$PLATFORM.bin
release_file $1 elf
release_file $1 map
release_file $1 lst
release_file $1 hex
release_file $1 elf $suffix
release_file $1 map $suffix
release_file $1 lst $suffix
release_file $1 hex $suffix
}

function release_binary_core()
Expand Down Expand Up @@ -53,21 +55,33 @@ OUT=../build/releases/release-$VERSION-p$PLATFORM_ID
mkdir -p $OUT
rm -rf ../build/target
if [ $1 -eq 6 ] || [ $1 -eq 8 ]; then
make -s PLATFORM_ID=$PLATFORM_ID clean all COMPILE_LTO=n
cd ../bootloader
make clean all -s PLATFORM_ID=$PLATFORM_ID
release_binary bootloader lto
cd ../modules
make clean all -s PLATFORM_ID=$PLATFORM_ID COMPILE_LTO=n
release_binary system-part1
release_binary system-part2
release_binary_module user-part tinker
else if [ $1 -eq 10 ]; then
make -s PLATFORM_ID=$PLATFORM_ID clean all COMPILE_LTO=n DEBUG_BUILD=y # APP=tinker_electron
cd ../bootloader
make clean all -s PLATFORM_ID=$PLATFORM_ID
release_binary bootloader lto
cd ../modules
make clean all -s PLATFORM_ID=$PLATFORM_ID COMPILE_LTO=n DEBUG_BUILD=y
release_binary system-part1
release_binary system-part2
release_binary system-part3
release_binary_module user-part tinker
else if [ $1 -eq 0 ]; then
cd ../bootloader
make clean all -s PLATFORM_ID=$PLATFORM_ID
release_binary bootloader lto
cd ../main
make -s PLATFORM_ID=$PLATFORM_ID clean all COMPILE_LTO=y APP=tinker
cp ../Dockerfile.test .
make clean all -s PLATFORM_ID=$PLATFORM_ID COMPILE_LTO=y APP=tinker
release_binary_core tinker
cd ../modules
fi
fi
fi
fi
4 changes: 2 additions & 2 deletions build/version.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

VERSION_STRING = 0.8.0-rc.3
VERSION_STRING = 0.8.0-rc.4

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

CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING)
6 changes: 3 additions & 3 deletions modules/shared/system_module_version.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 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.
SYSTEM_PART1_MODULE_VERSION ?= 302
SYSTEM_PART2_MODULE_VERSION ?= 302
SYSTEM_PART3_MODULE_VERSION ?= 302
SYSTEM_PART1_MODULE_VERSION ?= 303
SYSTEM_PART2_MODULE_VERSION ?= 303
SYSTEM_PART3_MODULE_VERSION ?= 303

RELEASE_080_MODULE_VERSION_BASE ?= 300
RELEASE_070_RC5_MODULE_VERSION ?= 204
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 @@ -71,7 +71,8 @@ extern "C" {
#define SYSTEM_VERSION_v080RC1 0x00080001
#define SYSTEM_VERSION_v080RC2 0x00080002
#define SYSTEM_VERSION_v080RC3 0x00080003
#define SYSTEM_VERSION SYSTEM_VERSION_v080RC3
#define SYSTEM_VERSION_v080RC4 0x00080004
#define SYSTEM_VERSION SYSTEM_VERSION_v080RC4

/**
* For Library/App creators. Can be used to ensure features/api's are present.
Expand Down Expand Up @@ -120,6 +121,7 @@ extern "C" {
#define SYSTEM_VERSION_080RC1
#define SYSTEM_VERSION_080RC2
#define SYSTEM_VERSION_080RC3
#define SYSTEM_VERSION_080RC4

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 @@ -48,6 +48,7 @@
| 101 (200)[1] | 300 | 0.8.0-rc.1 | (Photon, P1, Electron) |
| 101 | 301 | 0.8.0-rc.2 | (Photon, P1, Electron) |
| 201 | 302 | 0.8.0-rc.3 | (Core, Photon, P1, Electron) |
| 201 | 303 | 0.8.0-rc.4 | (Core, Photon, P1, Electron) |

[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 6057b7c

Please sign in to comment.