Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes from 1.2.1 #1873

Merged
merged 2 commits into from Aug 2, 2019

Conversation

@technobly
Copy link
Member

commented Aug 2, 2019

Problem

Two fixes were applied directly to v1.2.1 and need to be cherry-picked to latest develop for next release: 1.3.1-rc.1
#1850
#1851

Solution

This PR cherry-picks the above two commits

Steps to Test

For #1850

  • Build firmware and bump bootloader version and dependencies to v400 on Photon
  • Flash firmware with latest tinker, device should be in safe mode with older bootloader version dependency issue
  • flash new bootloader via
$ dfu; sleep 3; dfu-util -d 2b04:d006 -a 0 -s 0x80C0000 -D photon-bootloader\@1.3.1-rc.1-v500.bin; sleep 2; dfu-util -d 2b04:d006 -a 1 -s 1753:leave -D ota-flag-a5.bin 
  • device should reboot with latest bootloader

For #1851

  • Build tinker firmware for Core and ensure it boots and breathes cyan

Completeness

  • User is totes amazing for contributing!
  • Contributor has signed CLA (Info here)
  • Problem and Solution clearly stated
  • Run unit/integration/application tests on device
  • Added to CHANGELOG.md after merging (add links to docs and issues)

  • [bugfix] Fix to ensure device resets after bootloader update #1873
  • [bugfix] Fixes boot issue for Core introduced in 1.2.1-rc.3 #1873

@technobly technobly added this to the 1.3.1-rc.1 milestone Aug 2, 2019

@technobly technobly requested a review from sergeuz Aug 2, 2019

@sergeuz
sergeuz approved these changes Aug 2, 2019

@technobly technobly merged commit eba0ff0 into develop Aug 2, 2019

2 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@technobly technobly deleted the fixes-from-121 branch Aug 2, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.