Simple support for emery platform.

pebble · Oct 19, 2016 · 6fceaf0 · 6fceaf0
1 parent 2c0ce4b
commit 6fceaf0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/appinfo.json b/appinfo.json
@@ -35,7 +35,9 @@
   "targetPlatforms": [
     "aplite",
     "basalt",
-    "chalk"
+    "chalk",
+    "diorite",
+    "emery"
   ],
   "uuid": "133215f0-cf20-4c05-997b-3c9be5a64e5b",
   "versionCode": 1,

diff --git a/src/js/platform/feature.js b/src/js/platform/feature.js
@@ -25,41 +25,47 @@ Feature.blackAndWhite = Feature.makePlatformTest({
   basalt: false,
   chalk: false,
   diorite: true,
+  emery: false,
 });
 
 Feature.color = Feature.makePlatformTest({
   aplite: false,
   basalt: true,
   chalk: true,
   diorite: false,
+  emery: true,
 });
 
 Feature.rectangle = Feature.makePlatformTest({
   aplite: true,
   basalt: true,
   chalk: false,
   diorite: true,
+  emery: true,
 });
 
 Feature.round = Feature.makePlatformTest({
   aplite: false,
   basalt: false,
   chalk: true,
   diorite: false,
+  emery: false,
 });
 
 Feature.microphone = Feature.makePlatformTest({
   aplite: false,
   basalt: true,
   chalk: true,
   diorite: true,
+  emery: true,
 });
 
 Feature.resolution = Feature.makePlatformTest({
   aplite: new Vector2(144, 168),
   basalt: new Vector2(144, 168),
   chalk: new Vector2(180, 180),
   diorite: new Vector2(144, 168),
+  emery: new Vector2(200, 228),
 });
 
 Feature.actionBarWidth = function() {

diff --git a/src/util/compat.h b/src/util/compat.h
@@ -9,7 +9,7 @@
  */
 
 // Compatibility definitions for aplite on 2.9
-#if !defined(PBL_PLATFORM_APLITE) && !defined(PBL_PLATFORM_BASALT) && !defined(PBL_PLATFORM_CHALK) && !defined(PBL_PLATFORM_DIORITE)
+#if !defined(PBL_PLATFORM_APLITE) && !defined(PBL_PLATFORM_BASALT) && !defined(PBL_PLATFORM_CHALK) && !defined(PBL_PLATFORM_DIORITE) && !defined(PBL_PLATFORM_EMERY)
 
 #define PBL_SDK_2
 

diff --git a/src/util/platform.h b/src/util/platform.h
@@ -33,3 +33,11 @@
 #define IF_DIORITE_ELSE(diorite, other) other
 #define DIORITE_USAGE __attribute__((unused))
 #endif
+
+#if defined(PBL_PLATFORM_EMERY)
+#define IF_EMERY_ELSE(emery, other) emery
+#define EMERY_USAGE
+#else
+#define IF_EMERY_ELSE(emery, other) other
+#define EMERY_USAGE __attribute__((unused))
+#endif