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.

Sign up for GitHub

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 tinker incompatibility with Device OS >=0.8.0-rc.1 on Photon/P1 [ch19008] #465

Merged
merged 4 commits into from
Dec 20, 2018
Merged

Fixes tinker incompatibility with Device OS >=0.8.0-rc.1 on Photon/P1 [ch19008] #465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc9a053
fixes tinker incompatibility with Device OS >=0.8.0-rc.1 on Photon/P1…
technobly Dec 19, 2018
a917663
Adds tinker for Gen 3
monkbroc Dec 20, 2018
2e3e7c2
Support Gen 3 in particle update
monkbroc Dec 20, 2018
59359ee
Bump up the YModem timeout to allow flashing the NCP firmware
monkbroc Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions accept/features/binary_inspect.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@ Feature: binary inspect

@smoketest
Scenario: Smoke test Photon tinker app binary
Given I run particle "binary inspect photon_tinker.bin"
Given I run particle "binary inspect tinker-0.4.5-photon.bin"
Then the stdout should not contain "monolithic"

Scenario: Detailed test Photon tinker app binary
Given I run particle "binary inspect photon_tinker.bin"
Given I run particle "binary inspect tinker-0.4.5-photon.bin"
Then the stdout should contain:
"""
photon_tinker.bin
CRC is ok (ba4f59ab)
tinker-0.4.5-photon.bin
CRC is ok (4a738441)
Compiled for photon
This is an application module number 1 at version 2
It depends on a system module number 2 at version 1
This is an application module number 1 at version 3
It depends on a system module number 2 at version 6
"""

Scenario: Detailed test P1 tinker app binary
Given I run particle "binary inspect p1_tinker.bin"
Given I run particle "binary inspect tinker-0.4.5-p1.bin"
Then the stdout should contain:
"""
p1_tinker.bin
CRC is ok (61972e4d)
tinker-0.4.5-p1.bin
CRC is ok (70e7c48c)
Compiled for p1
This is an application module number 1 at version 2
It depends on a system module number 2 at version 3
This is an application module number 1 at version 3
It depends on a system module number 2 at version 6
"""

Scenario: Detailed test Electron tinker app binary
Expand Down
Binary file added accept/features/fixtures/tinker/tinker-0.4.5-p1.bin
View file
Open in desktop
Binary file not shown.
Binary file added accept/features/fixtures/tinker/tinker-0.4.5-photon.bin
View file
Open in desktop
Binary file not shown.
Binary file removed assets/binaries/p1_tinker.bin
View file
Open in desktop
Binary file not shown.
Binary file removed assets/binaries/photon_tinker.bin
View file
Open in desktop
Binary file not shown.
Binary file added assets/binaries/tinker-0.4.5-p1.bin
View file
Open in desktop
Binary file not shown.
Binary file added assets/binaries/tinker-0.4.5-photon.bin
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/lib/deviceSpecs/specifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const specs = {
alt: '0'
},
knownApps: {
'tinker': 'photon_tinker.bin',
'tinker': 'tinker-0.4.5-photon.bin',
'doctor': 'photon_doctor.bin',
'voodoo': 'voodoospark.bin'
},
Expand Down Expand Up @@ -186,7 +186,7 @@ const specs = {
alt: '0'
},
knownApps: {
'tinker': 'p1_tinker.bin',
'tinker': 'tinker-0.4.5-p1.bin',
'doctor': 'p1_doctor.bin',
'voodoo': 'voodoospark.bin'
},
Expand Down