Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ A color picker that allows users to choose a color from the ones that are compat
The color picker will automatically show a different layout depending on the watch connected:

- Aplite (Firmware 2.x) - Black and white
- Aplite (Firmware 3.x) - Black and white. Will also include gray (`#AAAAAA`) if `allowGray` is set to `true`
- Basalt/chalk - The 64 colors compatible with color Pebble smartwatches.
- Aplite/Diorite/Flint (Firmware 3.x) - Black and white. Will also include gray (`#AAAAAA`) if `allowGray` is set to `true`
- Basalt/Chalk/Emery/Gabbro - The 64 colors compatible with color Pebble smartwatches.

##### Properties

Expand Down Expand Up @@ -665,6 +665,7 @@ Below is the full list of capabilities
| PLATFORM_DIORITE | Running on Pebble 2 |
| PLATFORM_EMERY | Running on Core Time 2. |
| PLATFORM_FLINT | Running on Core 2 Duo. |
| PLATFORM_GABBRO | Running on Core Time Round 2 |
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with my UX hat on, this might be confusing to people because thats not what this watch is sold as! I get wanting to seperate Pebble Technology Corp watches from Core Devices LLC watches tho

| BW | Running on hardware that supports only black and white. |
| COLOR | Running on hardware that supports 64 colors. |
| MICROPHONE | Running on hardware that includes a microphone. |
Expand Down
102 changes: 51 additions & 51 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rebble/clay",
"version": "1.0.6",
"version": "1.0.7",
"description": "Pebble Config Framework",
"scripts": {
"test-travis": "./node_modules/.bin/gulp && ./node_modules/.bin/karma start ./test/karma.conf.js --single-run --browsers chromeTravisCI",
Expand Down Expand Up @@ -37,7 +37,8 @@
"chalk",
"diorite",
"emery",
"flint"
"flint",
"gabbro"
],
"resources": {
"media": []
Expand Down
18 changes: 14 additions & 4 deletions src/scripts/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,23 @@ module.exports.capabilityMap = {
minFwMajor: 0,
minFwMinor: 0
},
PLATFORM_GABBRO: {
platforms: ['gabbro'],
minFwMajor: 0,
minFwMinor: 0
},
BW: {
platforms: ['aplite', 'diorite', 'flint'],
minFwMajor: 0,
minFwMinor: 0
},
COLOR: {
platforms: ['basalt', 'chalk', 'emery'],
platforms: ['basalt', 'chalk', 'emery', 'gabbro'],
minFwMajor: 0,
minFwMinor: 0
},
MICROPHONE: {
platforms: ['basalt', 'chalk', 'diorite', 'emery', 'flint'],
platforms: ['basalt', 'chalk', 'diorite', 'emery', 'flint', 'gabbro'],
minFwMajor: 0,
minFwMinor: 0
},
Expand All @@ -75,7 +80,7 @@ module.exports.capabilityMap = {
minFwMinor: 4
},
HEALTH: {
platforms: ['basalt', 'chalk', 'diorite', 'emery', 'flint'],
platforms: ['basalt', 'chalk', 'diorite', 'emery', 'flint', 'gabbro'],
minFwMajor: 3,
minFwMinor: 10
},
Expand All @@ -85,7 +90,7 @@ module.exports.capabilityMap = {
minFwMinor: 0
},
ROUND: {
platforms: ['chalk'],
platforms: ['chalk', 'gabbro'],
minFwMajor: 0,
minFwMinor: 0
},
Expand All @@ -103,6 +108,11 @@ module.exports.capabilityMap = {
platforms: ['emery'],
minFwMajor: 0,
minFwMinor: 0
},
DISPLAY_260x260_ROUND: {
platforms: ['gabbro'],
minFwMajor: 0,
minFwMinor: 0
}
};

Expand Down
44 changes: 44 additions & 0 deletions test/spec/components/color.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,50 @@ describe('component - color', function() {
suffix: ''
}
});
testAutoLayout('emery', standardLayouts.COLOR, true, '', {
platform: 'emery',
model: 'qemu_platform_emery',
language: 'en_US',
firmware: {
major: 4,
minor: 0,
patch: 0,
suffix: ''
}
});
testAutoLayout('flint', standardLayouts.BLACK_WHITE, false, '', {
platform: 'flint',
model: 'qemu_platform_flint',
language: 'en_US',
firmware: {
major: 4,
minor: 0,
patch: 0,
suffix: ''
}
});
testAutoLayout('flint', standardLayouts.GRAY, true, '', {
platform: 'flint',
model: 'qemu_platform_flint',
language: 'en_US',
firmware: {
major: 4,
minor: 0,
patch: 0,
suffix: ''
}
});
testAutoLayout('gabbro', standardLayouts.COLOR, true, '', {
platform: 'gabbro',
model: 'qemu_platform_gabbro',
language: 'en_US',
firmware: {
major: 4,
minor: 0,
patch: 0,
suffix: ''
}
});

testCustomLayout();
testCustomLayout('COLOR');
Expand Down
Loading
Loading