Merge pull request #16 from TakayukiHoshi1984/modify_key_event_profile

KeyEventの更新

Author: TakayukiHoshi1984

dConnectDevicePebbleApp/src/key_event_profile.c

@@ -118,6 +118,14 @@ static void in_received_put_key_event_handler(DictionaryIterator *received) {
         }
         event_flag_on_up = true;
     		break;
+	case KEY_EVENT_ATTRIBUTE_ON_KEY_CHANGE:
+		entry_log2( "ON_KEY_CHANGE", "put_handler" ) ;
+		    if (window == NULL) {
+            key_event_window_init();
+        }
+        event_flag_on_down = true;
+        event_flag_on_up = true;
+    		break;
     default:
         // not support
         pebble_set_error_code(ERROR_NOT_SUPPORT_ATTRIBUTE);
@@ -149,6 +157,14 @@ static void in_received_delete_key_event_handler(DictionaryIterator *received) {
             key_event_window_uninit();
         }
         break;
+    case KEY_EVENT_ATTRIBUTE_ON_KEY_CHANGE:
+        entry_log2( "ON_KEY_CHANGE", "del_handler" ) ;
+        event_flag_on_down = false;
+        event_flag_on_up = false;
+		    if (event_flag_on_up == false && event_flag_on_down == false && window != NULL) {
+            key_event_window_uninit();
+        }
+        break;
     default:
         // not support
         entry_log( "not support", "orientation" ) ;
@@ -379,14 +395,18 @@ static void in_key_event_handler(int action, int keyID) {
     // Setting parameter to message queue.
     mq_kv_set(KEY_ACTION, ACTION_EVENT);
     mq_kv_set(KEY_PROFILE, PROFILE_KEY_EVENT);
-	  mq_kv_set(KEY_PARAM_KEY_EVENT_KEY_TYPE, KeyType);
-	  mq_kv_set(KEY_PARAM_KEY_EVENT_ID, keyID);
+	mq_kv_set(KEY_PARAM_KEY_EVENT_KEY_TYPE, KeyType);
+	mq_kv_set(KEY_PARAM_KEY_EVENT_ID, keyID);
+	int state = KEY_PARAM_KEY_EVENT_KEY_STATE_UP;
     switch (action) {
     case KEY_EVENT_ACTION_DOWN:
+        state = KEY_PARAM_KEY_EVENT_KEY_STATE_DOWN;
         mq_kv_set(KEY_ATTRIBUTE, KEY_EVENT_ATTRIBUTE_ON_DOWN);
+        mq_kv_set(KEY_PARAM_KEY_EVENT_KEY_STATE, state);
         break;
     case KEY_EVENT_ACTION_UP:
         mq_kv_set(KEY_ATTRIBUTE, KEY_EVENT_ATTRIBUTE_ON_UP);
+        mq_kv_set(KEY_PARAM_KEY_EVENT_KEY_STATE, state);
         break;
     default:
         return;

dConnectDevicePebbleApp/src/menu_item.c

@@ -20,7 +20,7 @@
  */
 
 #define FIRST_MENU_TITLE  "start App"
-#define FIRST_MENU_TEXT   "ver 2015/03/26 16:30"
+#define FIRST_MENU_TEXT   "ver 2017/03/01 16:30"
 #define MENU_ITEM_MAX 20
 
 static int16_t how_many_item = 0;

dConnectDevicePebbleApp/src/pebble_device_plugin_defines.h

@@ -61,6 +61,7 @@
 
 #define KEY_PARAM_KEY_EVENT_ID 700
 #define KEY_PARAM_KEY_EVENT_KEY_TYPE 701
+#define KEY_PARAM_KEY_EVENT_KEY_STATE 702
 
 ///////////////////////////////////////////////////////////////////
 
@@ -130,6 +131,7 @@
 
 #define KEY_EVENT_ATTRIBUTE_ON_DOWN 1
 #define KEY_EVENT_ATTRIBUTE_ON_UP 2
+#define KEY_EVENT_ATTRIBUTE_ON_KEY_CHANGE 3
 
 #define KEY_EVENT_ACTION_DOWN 1
 #define KEY_EVENT_ACTION_UP 2
@@ -144,6 +146,8 @@
 #define KEY_EVENT_KEY_TYPE_DPAD_BUTTON 3
 #define KEY_EVENT_KEY_TYPE_USER 4
 
+#define KEY_PARAM_KEY_EVENT_KEY_STATE_UP 1
+#define KEY_PARAM_KEY_EVENT_KEY_STATE_DOWN 2
 ///////////////////////////////////////////////////////////////////
 
 #define RESULT_OK 1