Merge pull request #7 from lydell/update-example

Make the example more complete

examples/Unicode/Unicode.ino

@@ -21,8 +21,13 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-HostOS.h>
 #include <Kaleidoscope/HostOS-select.h>
+#include "Kaleidoscope-Macros.h"
 #include <Kaleidoscope-Unicode.h>
 
+enum { MACRO_KEYBOARD_EMOJI };
+
+// *INDENT-OFF*
+
 const Key keymaps[][ROWS][COLS] PROGMEM = {
   [0] = KEYMAP_STACKED
   (
@@ -34,7 +39,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
     Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
     Key_skip,
 
-    Key_skip,  Key_6, Key_7, Key_8,     Key_9,      Key_0,         Key_skip,
+    M(MACRO_KEYBOARD_EMOJI), Key_6, Key_7, Key_8,     Key_9,      Key_0,         Key_skip,
     Key_Enter,               Key_Y, Key_U, Key_I,     Key_O,      Key_P,         Key_Equals,
                              Key_H, Key_J, Key_K,     Key_L,      Key_Semicolon, Key_Quote,
     Key_skip,                Key_N, Key_M, Key_Comma, Key_Period, Key_Slash,     Key_Minus,
@@ -43,12 +48,27 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
     Key_skip),
 };
 
+// *INDENT-ON*
+
+static void unicode(uint32_t character, uint8_t keyState) {
+  if (keyToggledOn(keyState)) {
+    Unicode.type(character);
+  }
+}
+
+const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
+  switch (macroIndex) {
+  case MACRO_KEYBOARD_EMOJI:
+    unicode(0x2328, keyState);
+    break;
+  }
+  return MACRO_NONE;
+}
+
 void setup() {
-  Kaleidoscope.use(&Unicode);
+  Kaleidoscope.use(&Macros, &Unicode);
 
   Kaleidoscope.setup();
-
-  Unicode.type(0x2328);
 }
 
 void loop() {