Add simply msg set image

HappyViet · May 12, 2014 · 95a7549 · 95a7549
1 parent e9f5988
commit 95a7549
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 2 deletions.
diff --git a/src/js/simply.pebble.js b/src/js/simply.pebble.js
@@ -117,6 +117,8 @@ var commands = [{
     name: 'title',
   }, {
     name: 'subtitle',
+  }, {
+    name: 'image',
   }],
 }, {
   name: 'getMenuItem',
@@ -146,6 +148,17 @@ var commands = [{
   }, {
     name: 'item',
   }],
+}, {
+  name: 'image',
+  params: [{
+    name: 'id',
+  }, {
+    name: 'width',
+  }, {
+    name: 'height',
+  }, {
+    name: 'pixels',
+  }],
 }];
 
 var commandMap = {};
@@ -455,6 +468,14 @@ SimplyPebble.menuItem = function(sectionIndex, itemIndex, itemDef) {
   SimplyPebble.sendPacket(packet);
 };
 
+SimplyPebble.image = function(id, gbitmap) {
+  var command = commandMap.image;
+  var packetDef = util2.copy(gbitmap);
+  packetDef.id = id;
+  var packet = makePacket(command, packetDef);
+  SimplyPebble.sendPacket(packet);
+};
+
 var readInt = function(packet, width, pos, signed) {
   var value = 0;
   pos = pos || 0;

diff --git a/src/simply_msg.c b/src/simply_msg.c
@@ -1,6 +1,7 @@
 #include "simply_msg.h"
 
 #include "simply_accel.h"
+#include "simply_res.h"
 #include "simply_menu.h"
 #include "simply_ui.h"
 
@@ -35,6 +36,7 @@ enum SimplyACmd {
   SimplyACmd_menuSelect,
   SimplyACmd_menuLongSelect,
   SimplyACmd_menuExit,
+  SimplyACmd_image,
 };
 
 typedef enum VibeType VibeType;
@@ -192,16 +194,41 @@ static void handle_set_menu_item(DictionaryIterator *iter, Simply *simply) {
   if ((tuple = dict_find(iter, 4))) {
     subtitle = tuple->value->cstring;
   }
+  if ((tuple = dict_find(iter, 5))) {
+    image = tuple->value->uint32;
+  }
   SimplyMenuItem *item = malloc(sizeof(*item));
   *item = (SimplyMenuItem) {
     .section = section_index,
     .index = row,
     .title = strdup2(title),
     .subtitle = strdup2(subtitle),
+    .image = image,
   };
   simply_menu_add_item(simply->menu, item);
 }
 
+static void handle_set_image(DictionaryIterator *iter, Simply *simply) {
+  Tuple *tuple;
+  uint32_t id = 0;
+  int16_t width = 0;
+  int16_t height = 0;
+  uint32_t *pixels = NULL;
+  if ((tuple = dict_find(iter, 1))) {
+    id = tuple->value->uint32;
+  }
+  if ((tuple = dict_find(iter, 2))) {
+    width = tuple->value->int16;
+  }
+  if ((tuple = dict_find(iter, 3))) {
+    height = tuple->value->int16;
+  }
+  if ((tuple = dict_find(iter, 4))) {
+    pixels = (uint32_t*) tuple->value->data;
+  }
+  simply_res_add_image(simply->res, id, width, height, pixels);
+}
+
 static void received_callback(DictionaryIterator *iter, void *context) {
   Tuple *tuple = dict_find(iter, 0);
   if (!tuple) {
@@ -245,6 +272,9 @@ static void received_callback(DictionaryIterator *iter, void *context) {
     case SimplyACmd_setMenuItem:
       handle_set_menu_item(iter, context);
       break;
+    case SimplyACmd_image:
+      handle_set_image(iter, context);
+      break;
   }
 }
 

diff --git a/src/simplyjs.c b/src/simplyjs.c
@@ -1,6 +1,7 @@
 #include "simplyjs.h"
 
 #include "simply_accel.h"
+#include "simply_res.h"
 #include "simply_splash.h"
 #include "simply_menu.h"
 #include "simply_ui.h"
@@ -11,6 +12,7 @@
 static Simply *init(void) {
   Simply *simply = malloc(sizeof(*simply));
   simply->accel = simply_accel_create();
+  simply->res = simply_res_create();
   simply->splash = simply_splash_create(simply);
   simply->menu = simply_menu_create();
   simply->ui = simply_ui_create(simply);
@@ -26,6 +28,7 @@ static void deinit(Simply *simply) {
   simply_msg_deinit();
   simply_ui_destroy(simply->ui);
   simply_menu_destroy(simply->menu);
+  simply_res_destroy(simply->res);
   simply_accel_destroy(simply->accel);
 }
 

diff --git a/src/simplyjs.h b/src/simplyjs.h
@@ -6,6 +6,7 @@ typedef struct Simply Simply;
 
 struct Simply {
   struct SimplyAccel *accel;
+  struct SimplyRes *res;
   struct SimplySplash *splash;
   struct SimplyMenu *menu;
   struct SimplyUi *ui;

diff --git a/wscript b/wscript
@@ -13,8 +13,9 @@ def build(ctx):
     ctx.load('pebble_sdk')
 
     ctx.pbl_program(source=ctx.path.ant_glob('src/**/*.c'),
-                    cflags=['-Wno-type-limits',
-                            '-Wno-address'],
+                    cflags=['-Wno-address',
+                            '-Wno-type-limits',
+                            '-Wno-missing-field-initializers'],
                     target='pebble-app.elf')
 
     js_target = ctx.concat_javascript(js=ctx.path.ant_glob('src/js/**/*.js'))