Added emery (Pebble Time 2) support, with 200x228 screen

Author: clach04

package.json

@@ -26,7 +26,8 @@
             "aplite",
             "basalt",
             "chalk",
-            "diorite"
+            "diorite",
+            "emery"
         ],
         "uuid": "33a003e9-91ec-40fe-b652-b41248212f74",
         "watchapp": {

src/c/watch_config.h

@@ -32,17 +32,31 @@
     #else
         #define BAT_POS GRect(0, 140, 180, 180) /* probably taller than really needed */
     #endif /* DRAW_BATTERY */
-
-#else /* PBL_RECT 144x168*/
-    #define CLOCK_POS GRect(0, 52, 144, 168) /* probably taller than really needed */
-    #define HEALTH_POS GRect(0, 40, 144, 168)
-    #define BT_POS GRect(0, 120, 144, 168) /* probably taller than really needed */
-    #define DATE_POS GRect(0, 140, 144, 168) /* probably taller than really needed */
-    #ifdef DRAW_BATTERY
-        #define BAT_POS GRect(5, 150, 144, 168)
-    #else
-        #define BAT_POS GRect(0, 140, 144, 168) /* probably taller than really needed */
-    #endif /* DRAW_BATTERY */
+#else /* PBL_RECT 144x168 */
+    #if PBL_DISPLAY_HEIGHT == 228  // 200x228 Pebble Time 2 (emery)
+        // TODO center? shift slight to right a little more, and down
+        #define CLOCK_POS GRect(0, 52, 200, 228) /* probably taller than really needed */
+        #define HEALTH_POS GRect(0, 40, 200, 228)
+        // below untested
+        #define BT_POS GRect(0, 120, 200, 228) /* probably taller than really needed */
+        // FIXME below should be lower...
+        #define DATE_POS GRect(0, 205, 200, 228) /* probably taller than really needed */
+        #ifdef DRAW_BATTERY
+            #define BAT_POS GRect(5, 215, 200, 228)
+        #else
+            #define BAT_POS GRect(0, 205, 200, 228) /* probably taller than really needed */
+        #endif /* DRAW_BATTERY */
+    #else  //  144x168  Original pebbles; Pebble Classic (aplite), Pebble Time (basalt), Pebble 2 (diorite), Pebble 2 Duo (flint)
+        #define CLOCK_POS GRect(0, 52, 144, 168) /* probably taller than really needed */
+        #define HEALTH_POS GRect(0, 40, 144, 168)
+        #define BT_POS GRect(0, 120, 144, 168) /* probably taller than really needed */
+        #define DATE_POS GRect(0, 140, 144, 168) /* probably taller than really needed */
+        #ifdef DRAW_BATTERY
+            #define BAT_POS GRect(5, 150, 144, 168)
+        #else
+            #define BAT_POS GRect(0, 140, 144, 168) /* probably taller than really needed */
+        #endif /* DRAW_BATTERY */
+    #endif  // end of original rectangle size
 #endif /* end of Round or rectangle */
 
 /* for screen shots and font testing

src/c/watchface.c

@@ -958,6 +958,74 @@ void init()
     time_color = DEFAULT_TIME_COLOR;
     background_color = DEFAULT_BACKGROUND_COLOR;
 
+    APP_LOG(APP_LOG_LEVEL_INFO, "PBL_DISPLAY_HEIGHT : %d", PBL_DISPLAY_HEIGHT);
+    APP_LOG(APP_LOG_LEVEL_INFO, "PBL_DISPLAY_WIDTH : %d", PBL_DISPLAY_WIDTH);
+
+    // https://developer.repebble.com/docs/c/Foundation/WatchInfo/#WatchInfoModel
+    APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model: %d", watch_info_get_model());
+    #ifdef DEBUG_HARDWARE_ID
+    // Generated code
+    switch(watch_info_get_model())
+    {
+        case WATCH_INFO_MODEL_UNKNOWN:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_UNKNOWN");  // Unknown model.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_ORIGINAL:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_ORIGINAL");  // Original Pebble.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_STEEL:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_STEEL");  // Pebble Steel.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_TIME:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_TIME");  // Pebble Time.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_TIME_STEEL:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_TIME_STEEL");  // Pebble Time Steel.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_TIME_ROUND_14:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_TIME_ROUND_14");  // Pebble Time Round, 14mm lug size.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_TIME_ROUND_20:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_TIME_ROUND_20");  // Pebble Time Round, 20mm lug size.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_2_HR:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_2_HR");  // Pebble 2 HR.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_2_SE:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_2_SE");  // Pebble 2 SE.
+            break;
+
+        case WATCH_INFO_MODEL_PEBBLE_TIME_2:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_PEBBLE_TIME_2");  // Pebble Time 2.
+            break;
+
+        case WATCH_INFO_MODEL_COREDEVICES_C2D:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_COREDEVICES_C2D");  // CoreDevices C2D (Core 2 Duo)
+            break;
+
+        case WATCH_INFO_MODEL_COREDEVICES_CT2:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL_COREDEVICES_CT2");  // CoreDevices CT2 (Core Time 2)
+            break;
+
+        case WATCH_INFO_MODEL__MAX:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model WATCH_INFO_MODEL__MAX");  // Max
+            break;
+
+        default:
+            APP_LOG(APP_LOG_LEVEL_INFO, "watch_info_get_model UNKNOWN");
+            break;
+    }
+    #endif // DEBUG_HARDWARE_ID
+
+
     major_version = get_major_app_version();
     APP_LOG(APP_LOG_LEVEL_INFO, "get_major_app_version: %d", major_version);