-
Notifications
You must be signed in to change notification settings - Fork 515
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bump module version for 1.4.2 (v1404)
- updates CHANGELOG.md - updates upgrade-downgrade script - updates release scripts - bumps Gen 3 bootloader dependency to 501 (1.4.2) - bumps SoftDevice bootloader dependency to 501 (1.4.2)
- Loading branch information
Showing
8 changed files
with
49 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| VERSION_STRING = 1.4.1 | ||
| VERSION_STRING = 1.4.2 | ||
|
|
||
| # PRODUCT_FIRMWARE_VERSION reported by default | ||
| # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release | ||
| VERSION = 1403 | ||
| VERSION = 1404 | ||
|
|
||
| CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,10 +100,10 @@ export PHOTON_SP1_121="https://github.com/particle-iot/device-os/releases/downlo | |
| export PHOTON_SP2_121="https://github.com/particle-iot/device-os/releases/download/v1.2.1/[email protected]" | ||
| export PHOTON_SP1_121_MOD=1213 | ||
| export PHOTON_SP2_121_MOD=1213 | ||
| export PHOTON_SP1_141="https://github.com/particle-iot/device-os/releases/download/v1.4.1/[email protected].1.bin" | ||
| export PHOTON_SP2_141="https://github.com/particle-iot/device-os/releases/download/v1.4.1/[email protected].1.bin" | ||
| export PHOTON_SP1_141_MOD=1403 | ||
| export PHOTON_SP2_141_MOD=1403 | ||
| export PHOTON_SP1_142="https://github.com/particle-iot/device-os/releases/download/v1.4.2/[email protected].2.bin" | ||
| export PHOTON_SP2_142="https://github.com/particle-iot/device-os/releases/download/v1.4.2/[email protected].2.bin" | ||
| export PHOTON_SP1_142_MOD=1404 | ||
| export PHOTON_SP2_142_MOD=1404 | ||
|
|
||
| # instead of these set options, | ||
| # set script options | ||
|
|
@@ -418,11 +418,11 @@ set_country() { | |
| # | 61 | photon | 0.6.3 | 0.7.0 | part1, part2 | yes | ok | | ||
| # | 62 | photon | 0.7.0 | 1.2.1 | part2, part1 | no, part2 rejected | ok | | ||
| # | 63 | photon | 0.7.0 | 1.2.1 | part1, part2 | yes | ok | | ||
| # | 64 | photon | 1.2.1 | 1.4.1 | part2, part1 | no, part2 rejected | ok | | ||
| # | 65 | photon | 1.2.1 | 1.4.1 | part1, part2 | yes | ok | | ||
| # | 64 | photon | 1.2.1 | 1.4.2 | part2, part1 | no, part2 rejected | ok | | ||
| # | 65 | photon | 1.2.1 | 1.4.2 | part1, part2 | yes | ok | | ||
| # ------------------------ downgrade -------------------------------------------------------------+ | ||
| # | 65 | photon | 1.4.1 | 1.2.1 | part1, part2 | no, part1 rejected | ok | | ||
| # | 66 | photon | 1.4.1 | 1.2.1 | part2, part1 | yes | ok | | ||
| # | 65 | photon | 1.4.2 | 1.2.1 | part1, part2 | no, part1 rejected | ok | | ||
| # | 66 | photon | 1.4.2 | 1.2.1 | part2, part1 | yes | ok | | ||
| # | 67 | photon | 1.2.1 | 0.7.0 | part1, part2 | no, part1 rejected | ok | | ||
| # | 68 | photon | 1.2.1 | 0.7.0 | part2, part1 | yes | ok | | ||
| # | 69 | photon | 0.7.0 | 0.6.3 | part1, part2 | no, part1 rejected | ok | | ||
|
|
@@ -1698,10 +1698,10 @@ if true; then | |
|
|
||
| heading | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| echo "| 64 | photon | 1.2.1 | 1.4.1 | part2, part1 | no, part2 rejected | ok |" | ||
| echo "| 64 | photon | 1.2.1 | 1.4.2 | part2, part1 | no, part2 rejected | ok |" | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| enter_ymodem | ||
| ymodem_part 2 1.4.1 photon | ||
| ymodem_part 2 1.4.2 photon | ||
| enter_dfu_mode | ||
| try exit_dfu_mode | ||
|
|
||
|
|
@@ -1713,27 +1713,27 @@ if true; then | |
|
|
||
| heading | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| echo "| 65 | photon | 1.2.1 | 1.4.1 | part1, part2 | yes | ok |" | ||
| echo "| 65 | photon | 1.2.1 | 1.4.2 | part1, part2 | yes | ok |" | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| enter_ymodem | ||
| try ymodem_part 1 1.4.1 photon | ||
| try ymodem_part 1 1.4.2 photon | ||
| try run_cli_list_subcommand_and_confirm_device_shows_up_as_online | ||
| enter_ymodem | ||
| try serial_inspect | ||
| try compare_system_version 1 ${PHOTON_SP1_141_MOD} | ||
| try compare_system_version 1 ${PHOTON_SP1_142_MOD} | ||
| try compare_system_version 2 ${PHOTON_SP2_121_MOD} | ||
|
|
||
| enter_ymodem | ||
| try ymodem_part 2 1.4.1 photon | ||
| # wait for 1.4.1 bootloader from SMH | ||
| particle flash --serial bootloader-1.4.1-photon.bin | ||
| try ymodem_part 2 1.4.2 photon | ||
| # wait for 1.4.2 bootloader from SMH | ||
| particle flash --serial bootloader-1.4.2-photon.bin | ||
| sleep 30 | ||
|
|
||
| try run_cli_list_subcommand_and_confirm_device_shows_up_as_online | ||
| enter_ymodem | ||
| try serial_inspect | ||
| try compare_system_version 1 ${PHOTON_SP1_141_MOD} | ||
| try compare_system_version 2 ${PHOTON_SP2_141_MOD} | ||
| try compare_system_version 1 ${PHOTON_SP1_142_MOD} | ||
| try compare_system_version 2 ${PHOTON_SP2_142_MOD} | ||
| pass | ||
|
|
||
| # ------------------------ downgrade ------------------------------------------------------------- | ||
|
|
@@ -1742,7 +1742,7 @@ if true; then | |
|
|
||
| heading | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| echo "| 66 | photon | 1.4.1 | 1.2.1 | part1, part2 | no, part1 rejected | ok |" | ||
| echo "| 66 | photon | 1.4.2 | 1.2.1 | part1, part2 | no, part1 rejected | ok |" | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| enter_ymodem | ||
| ymodem_part 1 1.2.1 photon | ||
|
|
@@ -1752,20 +1752,20 @@ if true; then | |
| try run_cli_list_subcommand_and_confirm_device_shows_up_as_online | ||
| enter_ymodem | ||
| try serial_inspect | ||
| try compare_system_version 1 ${PHOTON_SP1_141_MOD} | ||
| try compare_system_version 2 ${PHOTON_SP2_141_MOD} | ||
| try compare_system_version 1 ${PHOTON_SP1_142_MOD} | ||
| try compare_system_version 2 ${PHOTON_SP2_142_MOD} | ||
| pass | ||
|
|
||
| heading | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| echo "| 67 | photon | 1.4.1 | 1.2.1 | part2, part1 | yes | ok |" | ||
| echo "| 67 | photon | 1.4.2 | 1.2.1 | part2, part1 | yes | ok |" | ||
| echo "+----+--------+------------+----------------------+--------------+--------------------+--------+" | ||
| enter_ymodem | ||
| try ymodem_part 2 1.2.1 photon | ||
| try run_cli_list_subcommand_and_confirm_device_shows_up_as_online | ||
| enter_ymodem | ||
| try serial_inspect | ||
| try compare_system_version 1 ${PHOTON_SP1_141_MOD} | ||
| try compare_system_version 1 ${PHOTON_SP1_142_MOD} | ||
| try compare_system_version 2 ${PHOTON_SP2_121_MOD} | ||
|
|
||
| enter_ymodem | ||
|
|
@@ -2135,11 +2135,11 @@ curl_all_required_system_parts() { | |
| curl -L "$PHOTON_SP2_121" -o "system-part2-1.2.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi | ||
| fi | ||
|
|
||
| if [ ! -e "system-part1-1.4.1-photon.bin" ]; then | ||
| curl -L "$PHOTON_SP1_141" -o "system-part1-1.4.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi | ||
| if [ ! -e "system-part1-1.4.2-photon.bin" ]; then | ||
| curl -L "$PHOTON_SP1_142" -o "system-part1-1.4.2-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi | ||
| fi | ||
| if [ ! -e "system-part2-1.4.1-photon.bin" ]; then | ||
| curl -L "$PHOTON_SP2_141" -o "system-part2-1.4.1-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi | ||
| if [ ! -e "system-part2-1.4.2-photon.bin" ]; then | ||
| curl -L "$PHOTON_SP2_142" -o "system-part2-1.4.2-photon.bin"; if [[ "$?" -ne 0 ]]; then return 1; fi | ||
| fi | ||
|
|
||
| if [ ! -e "tinker-v0.4.9-photon.bin" ]; then | ||
|
|
||