Added macro to the header file and rearranged definitions.

src/Kaleidoscope/SpaceCadet.h

@@ -20,16 +20,33 @@
 
 #include <Kaleidoscope.h>
 
+#ifndef SPACECADET_MAP_END
+#define SPACECADET_MAP_END {Key_NoKey, Key_NoKey, 0}
+#endif
+
 namespace kaleidoscope {
-//Declarations for the modifier key mapping
+//Declaration for the method (implementing KaleidoscopePlugin)
-class ModifierKeyMap {
+class SpaceCadet : public KaleidoscopePlugin {
+ public:
+  //Empty constructor
+  SpaceCadet(void) {}
+
+  //Methods
+  void begin(void) final;
+
+  //Publically accessible variables
+  static uint16_t time_out;  //  The global timeout in milliseconds
+  static KeyBinding * map;  // The map of key bindings
+  
+  //Declarations for the modifier key mapping
+  class KeyBinding {
    public:
     //Empty constructor; set the vars separately
-  ModifierKeyMap(void);
+    KeyBinding(void) {}
     //Constructor with input and output
-  ModifierKeyMap(Key input_, Key output_);
+    KeyBinding(Key input_, Key output_);
     //Constructor with all three set
-  ModifierKeyMap(Key input_, Key output_, uint16_t timeout_);
+    KeyBinding(Key input_, Key output_, uint16_t timeout_);
     //The key that is pressed
     Key input;
     //the key that is sent
@@ -40,23 +57,8 @@ class ModifierKeyMap {
     bool flagged = false;
     //the start time for this key press
     uint32_t start_time = 0;
-};
+  };
-
-//Declaration for the method (implementing KaleidoscopePlugin)
-class SpaceCadet : public KaleidoscopePlugin {
- public:
-  //Empty constructor
-  SpaceCadet(void);
-
-  //Methods
-  void setMap(ModifierKeyMap * map, uint8_t map_size);
-  void begin(void) final;
-
-  static uint16_t time_out;
-
  private:
-  static uint8_t map_size_;
-  static ModifierKeyMap * map_;
   static Key eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state);
 };
 };